From 86b380cf4f5bc6d210c89c7c02d9ba27c80f9ccb Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 03 Dec 2024 13:00:29 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/rs/components/box/dataContent.vue | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/src/views/rs/components/box/dataContent.vue b/src/views/rs/components/box/dataContent.vue
index 37b89d4..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))
// 显示企业信息
@@ -133,7 +140,9 @@
addPupoLayers[row.firmName] = new DC.HtmlLayer(row.firmName)
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, row.ele || 64),
--
Gitblit v1.9.3