渲染开关

src/views/cameras/overview/components/AddCameraByIP.vue

@@ -152,7 +152,7 @@
     principal: [{ required: false }],
     code: [{ required: true, message: '请输入设备ID号', trigger: 'blur' }],
     remark: [{ required: false }],
-    videoServiceType: [{ required: true, message: '请输入服务类型', trigger: 'blur' }],
+    videoServiceType: [{ required: false }],
     videoStandard: [{ required: true, message: '请输入视频编码标准', trigger: 'blur' }],
   };
 

src/views/cameras/overview/components/AddCameraByNVR.vue

@@ -121,46 +121,6 @@
             />
           </el-select>
         </el-form-item>
-        <!-- <el-form-item
-          v-for="item in cameraNVRAddForm"
-          :key="item.prop"
-          :label="item.label"
-          :prop="item.prop"
-        >
-          <el-input
-            v-if="item.type === 'input'"
-            v-model="cameraNVRData[item.prop]"
-            :placeholder="item.placeholder"
-            style="width: 200px"
-            :type="item.prop === 'password' ? 'password' : ''"
-            :show-password="item.prop === 'password'"
-            :disabled="item.prop === 'principal'"
-          />
-          <el-select
-            v-if="item.type === 'select'"
-            v-model="cameraNVRData[item.prop]"
-            :placeholder="item.placeholder"
-            style="width: 200px"
-          >
-            <el-option
-              v-for="protocal in item.option"
-              :key="protocal.value"
-              :label="protocal.label"
-              :value="protocal.value"
-            />
-          </el-select>
-          <el-tree-select
-            v-if="item.type === 'tree-select'"
-            v-model="cameraNVRData[item.prop]"
-            :data="scenesTree"
-            :render-after-expand="false"
-            :default-expand-all="true"
-            check-strictly
-            :placeholder="item.placeholder"
-            style="width: 200px"
-            @change="handleTreeSelect"
-          />
-        </el-form-item> -->
       </el-form>
     </div>
     <span class="pop-footer">
@@ -171,14 +131,9 @@
 </template>
 
 <script setup lang="ts">
-  import { computed, onBeforeMount, ref } from 'vue';
+  import { onBeforeMount, ref } from 'vue';
   import { CameraNVRItem } from '../type';
-  import {
-    cameraNVRAddForm,
-    protocalTypeSelect,
-    serviceTypeSelect,
-    standardTypeSelect,
-  } from '../constant';
+  import { protocalTypeSelect, serviceTypeSelect, standardTypeSelect } from '../constant';
   import useSceneInfos from '@/hooks/useSceneInfos';
   import { cloneDeep } from 'lodash-es';
 
@@ -205,7 +160,7 @@
     code: [{ required: true, message: '请输入设备ID号', trigger: 'blur' }],
     remark: [{ required: false }],
     nvrChannel: [{ required: true, message: '请输入NVR平台通道号', trigger: 'blur' }],
-    videoServiceType: [{ required: true, message: '请输入服务类型', trigger: 'blur' }],
+    videoServiceType: [{ required: false }],
     videoStandard: [{ required: true, message: '请输入视频编码标准', trigger: 'blur' }],
   };
 

src/views/cameras/overview/components/AddCameraBySRS.vue

@@ -110,6 +110,8 @@
     workspaceCode: [{ required: true, message: '请输入场景名称', trigger: 'blur' }],
     code: [{ required: true, message: '请输入设备ID号', trigger: 'blur' }],
     rtspurl: [{ required: true, message: '请输入流媒体地址', trigger: 'blur' }],
+    videoServiceType: [{ required: false }],
+    videoStandard: [{ required: true, message: '请输入视频编码标准', trigger: 'blur' }],
   };
 
   const handleCancel = () => {

src/views/cameras/preview/components/RenderSwitch/RenderSwitch.vue

@@ -1,5 +1,5 @@
 <template>
-  <div style="margin-left: 8px; display: flex">
+  <div style="margin-left: 8px; display: flex" v-if="!!cameraDetailStore.detail">
     <div style="margin-top: 5px; margin-right: 4px">渲染开关</div>
     <ElSelect v-model="selectedIds" @change="changeRender">
       <ElOption value="" label="无渲染">无渲染</ElOption>
@@ -18,7 +18,7 @@
   import { ref } from 'vue';
   import { renderCamera } from '@/api/camera/camera-preview';
   import { watch } from 'vue';
-  // import { watch } from 'fs';
+
   const cameraDetailStore = useCameraDetailStore();
   const cameraAlgoStore = useCameraAlgoStore();
 
@@ -41,16 +41,15 @@
     });
   };
 
-  watch(
-    () => cameraDetailStore.cameraId,
-    () => {
-      if (cameraDetailStore.detail?.render) {
-        selectedIds.value = Number(cameraDetailStore.detail?.render);
-      } else {
-        selectedIds.value = '';
-      }
-    },
-    { immediate: true },
-  );
+  const changeRenderWatch = () => {
+    if (cameraDetailStore.detail?.render) {
+      selectedIds.value = Number(cameraDetailStore.detail?.render);
+    } else {
+      selectedIds.value = '';
+    }
+  };
+
+  watch(() => cameraDetailStore.cameraId, changeRenderWatch, { immediate: true });
+  watch(() => cameraDetailStore.detail?.render, changeRenderWatch, { immediate: true });
 </script>
 <style scoped></style>