From edb0f849ff83afbb8468cb014c896c2345153a34 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 25 Nov 2024 15:32:32 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/views/pac/components/box/dataContent.vue | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index bab83b1..e61c21b 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -84,9 +84,7 @@
let data = res.data.data.records
data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
let iconEl = ''
-
let flag = typeList.find(l => l.type == i.type)
-
if (flag) {
if (flag.backgroundIcon) {
iconEl = `
@@ -128,10 +126,17 @@
}
})
- if (row.type == 2) {
- EventBus.emit('restHandleCheckChange', `3-3`)
+ if (row.type == 2 || row.type == 3) {
+ EventBus.emit('restHandleCheckChange', `3-3-2`)
+ EventBus.emit('restHandleCheckChange', `3-3-4`)
+ if (row.type == 3) {
+ EventBus.emit('restHandleCheckChange', `3-8`)
+ } else {
+ EventBus.emit('restHandleDelChange', `3-8`)
+ }
} else {
- EventBus.emit('restHandleDelChange', `3-3`)
+ EventBus.emit('restHandleDelChange', `3-3-2`)
+ EventBus.emit('restHandleDelChange', `3-3-4`)
}
}
@@ -153,7 +158,7 @@
curSelect.value = '1'
pointStore.updateSharedData(1)
tabClick(resData.data[0])
-
+ EventBus.emit('flyToyqfw', 'flyToyqfw')
})
onUnmounted(() => {
@@ -161,6 +166,9 @@
arr.forEach(i => {
addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
})
+
+ EventBus.emit('restHandleDelChange', `3-3-2`)
+ EventBus.emit('restHandleDelChange', `3-3-4`)
})
</script>
@@ -200,7 +208,8 @@
&.on {
position: relative;
- color: #75b1ff;
+ // color: #75b1ff;
+ box-shadow: inset 0 0 100px #2a8ef1;
}
}
}
--
Gitblit v1.9.3