From 39d91d2b2042e86a45c8b56b53f35d4a8b53b365 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 03 Dec 2024 13:09:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/views/rs/components/box/dataContent.vue | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index 9163758..3f96d6e 100644
--- a/src/views/rs/components/box/dataContent.vue
+++ b/src/views/rs/components/box/dataContent.vue
@@ -89,6 +89,7 @@
onMounted(() => {
curTableHeight.value = TableContent.value.offsetHeight
EventBus.emit('flyToyqfw', 'flyToyqfw')
+ EventBus.emit('destroyPop', 'destroyPop')
})
// 分页改变
@@ -109,6 +110,11 @@
})
.then((res) => {
const data = res.data.data
+ data.records.forEach(item => {
+ if(!item.riskLevelName){
+ item.riskLevelName = '暂定'
+ }
+ })
tableData.value = data.records
pages.total = data.total
loading.value = false
@@ -125,6 +131,7 @@
let addPupoLayers = {}
// 行点击
function rowClick (row, column, event) {
+ EventBus.emit('destroyPop', 'destroyPop')
if (row.lng && row.lat) {
window.$viewer.flyToPosition(new DC.Position(row.lng, row.lat, 600, 0, -90, 0))
// 显示企业信息
@@ -134,10 +141,11 @@
window.$viewer.addLayer(addPupoLayers[row.firmName])
let iconEl = `<div class="marsBlueGradientPnl">
<li>${row.firmName || ''}</li>
+ <li>${row.name || ''}</li>
<li>${row.riskLevelName || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
- new DC.Position(row.lng, row.lat, 64),
+ new DC.Position(row.lng, row.lat, row.ele || 64),
`<div class="public-map-popup-three">
${iconEl}
</div>`
@@ -210,6 +218,7 @@
EventBus.off('rsTabChange', spaceTabChange)
if (curSelect.value) EventBus.emit('restHandleDelChange', `4`)
destroyPupoLayers()
+ addPupoLayers = null
})
// 销毁
@@ -217,6 +226,8 @@
let arr = Object.keys(addPupoLayers)
arr.forEach(i => {
addPupoLayers[i] && window.$viewer && window.$viewer.removeLayer(addPupoLayers[i])
+ addPupoLayers[i] = null
+ delete addPupoLayers[i]
})
addPupoLayers = {}
}
--
Gitblit v1.9.3