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 | 41 ++++++++++++++++++++++-------------------
1 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 5b42394..ab32dbb 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -169,13 +169,14 @@
const { attrParams } = e.overlay
// 删除
destroyPop()
- // if (!attrParams.imageUrl) {
- // return
- // }
- addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- window.$viewer.addLayer(addPopLayers[attrParams.name])
+ if (!attrParams.firmName) {
+ return
+ }
+ addPopLayers[attrParams.id] = new DC.HtmlLayer(attrParams.id)
+ window.$viewer.addLayer(addPopLayers[attrParams.id])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</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),
@@ -187,7 +188,7 @@
destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPopLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
}
},
{
@@ -208,14 +209,14 @@
const { attrParams } = e.overlay
// 删除
destroyPop()
- if (!attrParams.imageUrl) {
+ 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.fullName}</div>
- <img src="${attrParams.imageUrl}" width="160" height="160" />
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -227,7 +228,7 @@
destroyPop()
}
divIcon.on(DC.MouseEventType.CLICK, incident)
- addPopLayers[attrParams.name].addOverlay(divIcon)
+ addPopLayers[attrParams.id].addOverlay(divIcon)
}
},
@@ -346,7 +347,7 @@
addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
+ <div>${attrParams.firmName}</div>
<img src="${attrParams.imageUrl}" width="160" height="160" />
</div>`
let divIcon = new DC.DivIcon(
@@ -381,14 +382,14 @@
const { attrParams } = e.overlay
// 删除
destroyPop()
- if (!attrParams.imageUrl) {
+ if (!attrParams.firmName) {
return
}
addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
- <img src="${attrParams.imageUrl}" width="160" height="160" />
+ <div>${attrParams.firmName}</div>
+ <div>${attrParams.mainFuncName}</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -941,7 +942,7 @@
EventBus.emit('restHandleDelChange', `3-6`)
EventBus.emit('restHandleDelChange', `3-7`)
EventBus.emit('restHandleDelChange', `3-8`)
- EventBus.emit('restHandleDelChange', `3-9`)
+ // EventBus.emit('restHandleDelChange', `3-9`)
EventBus.emit('restHandleDelChange', `4`)
EventBus.emit('restHandleDelChange', `4-1`)
EventBus.emit('restHandleDelChange', `4-2`)
@@ -964,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