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/pac/components/box/dataContent.vue | 11 ++---------
1 files changed, 2 insertions(+), 9 deletions(-)
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 5e07c9d..010d075 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -43,6 +43,7 @@
const curSelect = ref('1')
let addTileLayers = {}
const handleCheckChange = (row) => {
+ EventBus.emit('flyToyqfw', 'flyToyqfw')
resData.data.forEach(item => {
if (row.value === item.value) {
if (!addTileLayers[item.label]) {
@@ -104,7 +105,6 @@
data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
let iconEl = ''
let divclassName = ''
-
let flag = typeList.find(l => l.type == i.type)
if (flag) {
divclassName = flag.className
@@ -116,12 +116,6 @@
</div>
`
}
- } else {
- iconEl = `<div class="marsBlueGradientPnl">
- <div>${i[i.showParams] || i.name}</div>
- </div>`
- }
-
let divIcon = new DC.DivIcon(
new DC.Position(i.lng, i.lat, i.ele || 64),
`<div class="public-map-popup ${divclassName}">
@@ -132,10 +126,9 @@
let incident = () => { }
if (item.incident) incident = item.incident
-
divIcon.on(DC.MouseEventType.CLICK, incident)
-
addTileLayers[item.label].addOverlay(divIcon)
+ }
})
})
} else {
--
Gitblit v1.9.3