Merge branch 'mapFix' into 'master'

fix: layout delete pushstreamIp arg

See merge request tian-group/skyeye-admin-fe!41

src/views/map-config/mini-map/MapBase/KonvaMap.vue

@@ -199,14 +199,13 @@
   };
 
   //添加相机
-  const addCamera = (id: string, streamIp: string) => {
+  const addCamera = (id: string) => {
     const existingCamera = cameras.value.find((camera) => camera.id === id);
     if (existingCamera) return;
     const config = {
       width: 52,
       height: 37,
       image: camImg,
-      pushstreamIp: streamIp,
       name: 'image',
       id: id,
     };
@@ -289,7 +288,7 @@
     const stage = transformer.value.getNode().getStage();
     const groups = stage.find('.group');
     const tempList = cloneDeep(cameras.value);
-    console.log('cameras.value', cameras.value);
+    // console.log('cameras.value', cameras.value);
 
     const camerasLists = tempList.map((item, index) => {
       item.groupConfig.x = groups[index].attrs.x;

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

@@ -79,7 +79,7 @@
               isAdded: isAddedCamera(item.code),
               isActive: item.code === caremaActiveId,
             }"
-            @click="handleAddCamera(item.code, item.pushstreamIp)"
+            @click="handleAddCamera(item.code)"
           >
             <span class="camera-id">{{ item.name }}</span>
             <el-popover
@@ -235,14 +235,14 @@
     return shopCameraList.value.filter((x) => x.code?.includes(k) || x.workSpaceName?.includes(k));
   });
 
-  const handleAddCamera = (cameraId: string, streamIp: string) => {
+  const handleAddCamera = (cameraId: string) => {
     if (!hasBg.value) {
       ElMessage.warning({
         message: '请先添加背景图片',
       });
       return;
     }
-    konvaMap.value.addCamera(cameraId, streamIp);
+    konvaMap.value.addCamera(cameraId);
   };
 
   const handleSave = () => {

src/views/system-config/scene-manage/SceneManage.vue

@@ -307,7 +307,7 @@
       if (row.labelList && Array.isArray(row.labelList)) {
         selectItems.value = row.labelList.map((item, index) => ({
           tag: item.id,
-          template: row.moduleList[index].id,
+          template: row.moduleList[index]?.id,
         }));
       }
       detail.value = {