From 769f362f3d91ca4336c6cd74a78aa02e2c9ceb33 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:08:59 +0800
Subject: [PATCH] 应急空间调整

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

diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index b559671..ab32dbb 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -172,10 +172,11 @@
           if (!attrParams.firmName) {
             return
           }
-          addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
-          window.$viewer.addLayer(addPopLayers[attrParams.name])
+          addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+          window.$viewer.addLayer(addPopLayers[attrParams.id])
           let iconEl = `<div class="marsBlueGradientPnl">
             <div>${attrParams.firmName}</div>
+            <div>${attrParams.mainFuncName}</div>
                 </div>`
           let divIcon = new DC.DivIcon(
             new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -187,7 +188,7 @@
             destroyPop()
           }
           divIcon.on(DC.MouseEventType.CLICK, incident)
-          addPopLayers[attrParams.name].addOverlay(divIcon)
+          addPopLayers[attrParams.id].addOverlay(divIcon)
         }
       },
       {
@@ -211,10 +212,11 @@
           if (!attrParams.firmName) {
             return
           }
-          addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
-          window.$viewer.addLayer(addPopLayers[attrParams.name])
+          addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+          window.$viewer.addLayer(addPopLayers[attrParams.id])
           let iconEl = `<div class="marsBlueGradientPnl">
-                  <div>${attrParams.firmName}</div> 
+            <div>${attrParams.firmName}</div>
+            <div>${attrParams.mainFuncName}</div>
                 </div>`
           let divIcon = new DC.DivIcon(
             new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -226,7 +228,7 @@
             destroyPop()
           }
           divIcon.on(DC.MouseEventType.CLICK, incident)
-          addPopLayers[attrParams.name].addOverlay(divIcon)
+          addPopLayers[attrParams.id].addOverlay(divIcon)
         }
       },
 
@@ -386,7 +388,8 @@
           addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
           window.$viewer.addLayer(addPopLayers[attrParams.name])
           let iconEl = `<div class="marsBlueGradientPnl">
-                  <div>${attrParams.firmName}</div>
+            <div>${attrParams.firmName}</div>
+            <div>${attrParams.mainFuncName}</div>
                 </div>`
           let divIcon = new DC.DivIcon(
             new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -962,12 +965,14 @@
 // 销毁
 function destroyPop () {
   let arr = Object.keys(addPopLayers)
-  arr.filter(i => i != 'hgyq').forEach(i => {
+  if(arr.length > 0){
+    arr.forEach(i => {
     addPopLayers[i] && window.$viewer && window.$viewer.removeLayer(addPopLayers[i])
     addPopLayers[i] = null
     delete addPopLayers[i]
   })
   addPopLayers = {}
+  }
 }
 
 onUnmounted(() => {

--
Gitblit v1.9.3