Переглянути джерело

fix: 电子围栏-取消或再次点击电子围栏icon时会收起电子围栏,此时要弹窗提示

louhangfei 1 рік тому
батько
коміт
646f02adc6

+ 9 - 2
src/modules/algo-params-setting-base/components/AlgorithmsSetting/AlgorithmsSetting.vue

@@ -47,7 +47,7 @@
   import useCameraDetailStore from '../../store/useCameraDetailStore';
   import usePresetListStore from '../../store/usePresetListStore';
   // import AddAlgoDialog from './AddAlgoDialog.vue';
-  import { createAlgoSubmitParams, algoDetailToJSON, cameraAlgoToJSON } from '@/modules/algo/algo-params-edit/utils';
+  import { createAlgoSubmitParams, cameraAlgoToJSON } from '@/modules/algo/algo-params-edit/utils';
 
   import { ALGO_ENABLED_STATUS } from '@/api/camera/camera-preview';
   import { ref, watchEffect } from 'vue';
@@ -128,7 +128,14 @@
 
   const toggleFenceTool = () => {
     const nextShowFenceTool = !fenceStore.showFenceTool;
-    fenceStore.showFenceTool = nextShowFenceTool;
+    if (!nextShowFenceTool) {
+      fenceStore.confirmExitFence().then(() => {
+        fenceStore.showFenceTool = false;
+        fenceStore.reset();
+      });
+    } else {
+      fenceStore.showFenceTool = true;
+    }
   };
 
   const confirmToggleAlgoOpen = (detail: CameraAlgoItem, algoStatus: boolean) => {

+ 2 - 1
src/modules/algo-params-setting-base/components/CameraViewSetting/CameraViewSetting.vue

@@ -133,7 +133,8 @@
 
   const handleCancelFenceEdit = () => {
     fenceStore.confirmExitFence().then(() => {
-      paramsSettingFn.reset();
+      fenceStore.reset();
+      fenceStore.showFenceTool = false;
     });
   };