From 1dee40ea46601f2ee5d10aa0190625ebf03bdc4e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 02 Dec 2024 17:02:19 +0800
Subject: [PATCH] 1

---
 src/pages/layout/components/scomponents/layersControl.vue |   53 +++++++++--------------------------------------------
 1 files changed, 9 insertions(+), 44 deletions(-)

diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index d428091..e908bf6 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
  * @Author: shuishen 1109946754@qq.com
  * @Date: 2024-10-31 10:47:29
  * @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-27 16:22:09
+ * @LastEditTime: 2024-11-28 19:23:46
  * @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
  * @Description:
  *
@@ -77,7 +77,7 @@
 
 const { VITE_APP_BASE } = import.meta.env
 // , '7', 
-let indexPoint = ref(['1', '5', '7'])
+let indexPoint = ref(['1', '5'])
 
 const treeRef = ref(null)
 
@@ -394,46 +394,6 @@
         }
       },
 
-      {
-        id: '3-7',
-        label: '消防沙',
-        type: 'layer',
-        subType: 'labelPoint',
-        method: getList,
-        params: {
-          type: 7,
-          size: 1000
-        },
-        backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
-        className: 'xfs-box',
-        showPanel: false,
-        layerName: 'xfs',
-        incident: (e) => {
-          const { attrParams } = e.overlay
-          // 删除
-          destroy()
-          if (!attrParams.imageUrl) {
-            return
-          }
-          addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
-          window.$viewer.addLayer(addPupoLayers[attrParams.name])
-          let iconEl = `<div class="marsBlueGradientPnl">
-                  <div>${attrParams.fullName}</div>
-                  <img src="${attrParams.imageUrl}" width="160" height="160" />
-                </div>`
-          let divIcon = new DC.DivIcon(
-            new DC.Position(attrParams.lng, attrParams.lat, 64),
-            `<div class="public-map-popup-two">
-                    ${iconEl}
-                  </div>`
-          )
-          let incident = () => {
-            destroy()
-          }
-          divIcon.on(DC.MouseEventType.CLICK, incident)
-          addPupoLayers[attrParams.name].addOverlay(divIcon)
-        }
-      },
       {
         id: '3-8',
         label: '沟渠',
@@ -883,7 +843,7 @@
         } else {
           addTileLayers[item.layerName].clear()
           window.$viewer && window.$viewer.removeLayer(addTileLayers[item.layerName])
-
+          addTileLayers[item.layerName] = null
           delete addTileLayers[item.layerName]
         }
       }
@@ -968,8 +928,9 @@
   let arr = Object.keys(addPupoLayers)
   arr.filter(i => i != 'hgyq').forEach(i => {
     addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
+    addPupoLayers[i] = null
+    delete addPupoLayers[i]
   })
-  addPupoLayers = {}
 }
 
 onUnmounted(() => {
@@ -982,9 +943,13 @@
   let arr = Object.keys(addTileLayers)
   arr.filter(i => i != 'hgyq').forEach(i => {
     addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
+    addTileLayers[i] = null
+    delete addTileLayers[i]
   })
+  addTileLayers = null
   // 弹窗销毁
   destroy()
+  addPupoLayers = null
 
   EventBus.off('restHandleCheckChange', restHandleCheckChange)
   EventBus.off('restHandleDelChange', restHandleDelChange)

--
Gitblit v1.9.3