From 0ff95f6a401e9469dbea93c633e362eb8805f427 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Dec 2024 14:38:38 +0800
Subject: [PATCH] 图层组件,销毁函数严谨处理

---
 src/pages/map/components/scomponents/layersControl.vue |   23 +++++++++++------------
 1 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index b91707d..7f3fe37 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/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-12-03 14:30:57
+ * @LastEditTime: 2024-12-03 14:38:35
  * @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
  * @Description:
  *
@@ -1032,10 +1032,8 @@
 // 关闭所有选中的,除了倾斜,园区分布,空中全景
 const closeAll = () => {
   EventBus.emit('restHandleDelChange', `2`)
-  EventBus.emit('restHandleDelChange', `3`)
   EventBus.emit('restHandleDelChange', `3-1`)
   EventBus.emit('restHandleDelChange', `3-2`)
-  EventBus.emit('restHandleDelChange', `3-3`)
   // EventBus.emit('restHandleDelChange', `3-3-1`)
   EventBus.emit('restHandleDelChange', `3-3-2`)
   // EventBus.emit('restHandleDelChange', `3-3-3`)
@@ -1046,7 +1044,6 @@
   EventBus.emit('restHandleDelChange', `3-7`)
   EventBus.emit('restHandleDelChange', `3-8`)
   // EventBus.emit('restHandleDelChange', `3-9`)
-  EventBus.emit('restHandleDelChange', `4`)
   EventBus.emit('restHandleDelChange', `4-1`)
   EventBus.emit('restHandleDelChange', `4-2`)
   EventBus.emit('restHandleDelChange', `4-9`)
@@ -1069,14 +1066,16 @@
 
 // 销毁
 function destroyPop () {
-  let arr = Object.keys(addPopLayers)
-  if (arr.length > 0) {
-    arr.forEach(i => {
-      addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
-      addPopLayers[i] = null
-      delete addPopLayers[i]
-    })
-    addPopLayers = {}
+  if (addPopLayers && addPopLayers != null) {
+    let arr = Object.keys(addPopLayers)
+    if (arr.length > 0) {
+      arr.forEach(i => {
+        addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
+        addPopLayers[i] = null
+        delete addPopLayers[i]
+      })
+      addPopLayers = {}
+    }
   }
 }
 

--
Gitblit v1.9.3