Explorar el Código

删除相机后提示框重复出现bug fix

zhudie hace 2 años
padre
commit
e9679359e4

+ 4 - 3
.env.development

@@ -16,15 +16,16 @@ VITE_DROP_CONSOLE = true
 # VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144:8800/api"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144:8800/api"]]
 #VITE_PROXY=[["/skyeye-admin-api","http://58.144.197.158:19980/skyeye-admin-api"],["/eye_api","http://58.144.197.158:19980/eye_api"],["/push_stream_host","http://58.144.197.158:19980/push_stream_host"],["/skyeye-login","http://58.144.197.158:19980/skyeye-login"]]
 #VITE_PROXY=[["/skyeye-admin-api","http://58.144.197.158:19980/skyeye-admin-api"],["/eye_api","http://58.144.197.158:19980/eye_api"],["/push_stream_host","http://58.144.197.158:19980/push_stream_host"],["/skyeye-login","http://58.144.197.158:19980/skyeye-login"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://36.133.176.76:19980/skyeye-admin-api"],["/eye_api","http://36.133.176.76:19980/eye_api"],["/push_stream_host","http://36.133.176.76:19980/push_stream_host"],["/skyeye-login","http://36.133.176.76:19980/skyeye-login"]]
 # VITE_PROXY=[["/skyeye-admin-api","http://36.133.176.76:19980/skyeye-admin-api"],["/eye_api","http://36.133.176.76:19980/eye_api"],["/push_stream_host","http://36.133.176.76:19980/push_stream_host"],["/skyeye-login","http://36.133.176.76:19980/skyeye-login"]]
-# VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144/skyeye-admin-api"],["/eye_api","http://172.16.23.144/eye_api"],["/push_stream_host","http://172.16.23.144/push_stream_host"],["/skyeye-login","http://172.16.23.144/skyeye-login"]]
-VITE_PROXY=[["/skyeye-admin-api","http://192.168.32.47/skyeye-admin-api"],["/eye_api","http://192.168.32.47/eye_api"],["/push_stream_host","http:/192.168.32.47/push_stream_host"],["/skyeye-login","http://192.168.32.47/skyeye-login"]]
+VITE_PROXY=[["/skyeye-admin-api","http://172.16.23.144/skyeye-admin-api"],["/eye_api","http://172.16.23.144/eye_api"],["/push_stream_host","http://172.16.23.144/push_stream_host"],["/skyeye-login","http://172.16.23.144/skyeye-login"]]
+# VITE_PROXY=[["/skyeye-admin-api","http://192.168.32.47/skyeye-admin-api"],["/eye_api","http://192.168.32.47/eye_api"],["/push_stream_host","http:/192.168.32.47/push_stream_host"],["/skyeye-login","http://192.168.32.47/skyeye-login"]]
 # API 接口地址
 # API 接口地址
 VITE_GLOB_API_URL = 
 VITE_GLOB_API_URL = 
 # 图片上传地址
 # 图片上传地址
 VITE_GLOB_UPLOAD_URL=  
 VITE_GLOB_UPLOAD_URL=  
 
 
 # 图片前缀地址
 # 图片前缀地址
-VITE_GLOB_IMG_URL = //36.133.176.76:19980/skyeye_static/
+#VITE_GLOB_IMG_URL = //36.133.176.76:19980/skyeye_static/
+VITE_GLOB_IMG_URL = //172.16.23.144/skyeye_static/
 
 
 
 
 # 接口前缀
 # 接口前缀

+ 9 - 1
src/views/map-config/mini-map/MapBase/KonvaMap.vue

@@ -46,6 +46,7 @@
   import { cloneDeep } from 'lodash-es';
   import { cloneDeep } from 'lodash-es';
   import useMiniMap from '../use-mini-map';
   import useMiniMap from '../use-mini-map';
   import { storeToRefs } from 'pinia';
   import { storeToRefs } from 'pinia';
+  import { updateMinMapViewLayoutApi } from '@/api/scene/scene';
 
 
   const globSetting = useGlobSetting();
   const globSetting = useGlobSetting();
 
 
@@ -361,7 +362,7 @@
   };
   };
 
 
   /** 导入布局json */
   /** 导入布局json */
-  const createMap = (layout) => {
+  const createMap = (layout, selectId) => {
     addBg(layout.bgImgUrl).then((_res) => {
     addBg(layout.bgImgUrl).then((_res) => {
       const unExitList = [] as any[];
       const unExitList = [] as any[];
       stageConfig.value = layout.stageConfig;
       stageConfig.value = layout.stageConfig;
@@ -381,7 +382,14 @@
         });
         });
       if (unExitList.length > 0) {
       if (unExitList.length > 0) {
         ElMessage.warning('部分相机不存在,已为您删除!');
         ElMessage.warning('部分相机不存在,已为您删除!');
+
+        const layoutNew = cloneDeep(layout);
+        updateMinMapViewLayoutApi({
+          layout: JSON.stringify({ ...layoutNew, isUploadBg: true }),
+          targetId: String(selectId),
+        });
       }
       }
+
       cameras.value = layout.cameraList;
       cameras.value = layout.cameraList;
     });
     });
   };
   };

+ 1 - 1
src/views/map-config/mini-map/MiniMapConfig.vue

@@ -219,7 +219,7 @@
         isMap.value = res.isUploadBg;
         isMap.value = res.isUploadBg;
         if (res.isUploadBg) {
         if (res.isUploadBg) {
           isUploadBg.value = true;
           isUploadBg.value = true;
-          konvaMap.value.createMap(res);
+          konvaMap.value.createMap(res, selectedShopDetail.value?.id);
         } else {
         } else {
           hasBg.value = false;
           hasBg.value = false;
           isUploadBg.value = res.isUploadBg;
           isUploadBg.value = res.isUploadBg;