Explorar o código

fix: 修复RTSP方式编辑相机时nvr不生效问题

bxy hai 1 ano
pai
achega
6a13196a9b

+ 8 - 18
src/views/cameras/overview/components/CameraAddPopover.vue

@@ -14,27 +14,13 @@
             {{ item.label }}
           </div>
         </div>
-        <el-icon :size="16" class="mr-5" @click="updateValue(false)" style="cursor: pointer"
-          ><Close
-        /></el-icon>
+        <el-icon :size="16" class="mr-5" @click="updateValue(false)" style="cursor: pointer"><Close /></el-icon>
       </div>
     </template>
     <div class="pop-content">
-      <IPAddCamera
-        v-if="addType === 'ip'"
-        @cancel-execute="updateValue(false)"
-        @confirm-execute="onAddCamera"
-      />
-      <NVRAddCamera
-        v-if="addType === 'nvr'"
-        @cancel-execute="updateValue(false)"
-        @confirm-execute="onAddNVRCamera"
-      />
-      <SRSAddCamera
-        v-if="addType === 'srs'"
-        @cancel-execute="updateValue(false)"
-        @confirm-execute="onAddSRSCamera"
-      />
+      <IPAddCamera v-if="addType === 'ip'" @cancel-execute="updateValue(false)" @confirm-execute="onAddCamera" />
+      <NVRAddCamera v-if="addType === 'nvr'" @cancel-execute="updateValue(false)" @confirm-execute="onAddNVRCamera" />
+      <SRSAddCamera v-if="addType === 'srs'" @cancel-execute="updateValue(false)" @confirm-execute="onAddSRSCamera" />
       <RangeAddCamera v-if="addType === 'ipRange'" @cancel-execute="updateValue(false)" />
     </div>
   </el-card>
@@ -44,6 +30,7 @@
   import { ref } from 'vue';
   import { cameraAddType } from '@/types/camera/constant';
   import { Close } from '@element-plus/icons-vue';
+  import { ElMessage } from 'element-plus';
   import IPAddCamera from './AddCameraByIP.vue';
   import SRSAddCamera from './AddCameraBySRS.vue';
   import RangeAddCamera from './AddCameraByRange.vue';
@@ -66,18 +53,21 @@
 
   const onAddCamera = (data) => {
     addCamera(data).then(() => {
+      ElMessage.success('添加成功');
       updateValue(false);
     });
   };
 
   const onAddNVRCamera = (data) => {
     addNVRCamera(data).then(() => {
+      ElMessage.success('添加成功');
       updateValue(false);
     });
   };
 
   const onAddSRSCamera = (data) => {
     addSRSCamera(data).then(() => {
+      ElMessage.success('添加成功');
       updateValue(false);
     });
   };

+ 1 - 0
src/views/cameras/overview/components/CameraEditSRSPopover.vue

@@ -49,6 +49,7 @@
       videoStandard: data.videoStandard,
       remark: data.remark,
       sourceType: data.sourceType,
+      nvrId: data.nvrId,
     };
     editCamera(temp)
       .then((res) => {

+ 7 - 13
src/views/cameras/overview/stores/useCameraOverview.ts

@@ -62,9 +62,7 @@ export const useCameraOverview = defineStore('camera-overview', () => {
       paramDetails.value.cameraType = queryCameraType.value;
     }
     if (queryWorkSpace.value) {
-      paramDetails.value.workspaceId = Number(
-        getWorkspaceIdFromTreeNode(String(queryWorkSpace.value)),
-      );
+      paramDetails.value.workspaceId = Number(getWorkspaceIdFromTreeNode(String(queryWorkSpace.value)));
     }
     if (querySourceType.value) {
       console.log('queryCameraType.value', querySourceType.value);
@@ -93,8 +91,6 @@ export const useCameraOverview = defineStore('camera-overview', () => {
   });
 
   const addCamera = (data: CameraAddItem) => {
-    console.log('添加相机,相机信息————————', data);
-
     return addCameraItem(data).then(() => {
       getCameraItems();
     });
@@ -120,14 +116,12 @@ export const useCameraOverview = defineStore('camera-overview', () => {
   };
 
   const getState = () => {
-    getCameraStateByCodes({ cameraCodeList: cameraItems.value.map((camera) => camera.code) }).then(
-      (res) => {
-        res.forEach((item) => {
-          const targetObj = cameraItems.value.find((camera) => camera.code === item.cameraCode);
-          if (targetObj) targetObj.networkingState = Number(item.networkingState);
-        });
-      },
-    );
+    getCameraStateByCodes({ cameraCodeList: cameraItems.value.map((camera) => camera.code) }).then((res) => {
+      res.forEach((item) => {
+        const targetObj = cameraItems.value.find((camera) => camera.code === item.cameraCode);
+        if (targetObj) targetObj.networkingState = Number(item.networkingState);
+      });
+    });
   };
 
   const openInterval = () => {