From 8c5302ffa364fe4346a5e2dfa7aeda89ec231a0a Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Thu, 21 Nov 2024 15:37:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/pages/layout/components/scomponents/layersControl.vue | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 9bbf702..60fce45 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/components/scomponents/layersControl.vue
@@ -166,7 +166,8 @@
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <img src="${attrParams.imageUrl}" width="160" height="160" />
+ <div>${attrParams.fullName}</div>
+ <img src="${attrParams.imageUrl}" />
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, 64),
@@ -205,6 +206,7 @@
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(
@@ -290,6 +292,7 @@
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(
@@ -330,6 +333,7 @@
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(
@@ -370,6 +374,7 @@
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(
@@ -410,6 +415,7 @@
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(
@@ -748,7 +754,6 @@
// 销毁
function destroy() {
- tileLayers && window.$viewer.removeLayer(tileLayers)
let arr = Object.keys(addPupoLayers)
arr.filter(i => i != 'hgyq').forEach(i => {
addPupoLayers[i] && window.$viewer.removeLayer(addPupoLayers[i])
--
Gitblit v1.9.3