From 14230ac0316d1e403c54b5a73430bad8ebad00e7 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 16 Dec 2024 19:16:51 +0800
Subject: [PATCH] 新干项目相关调整
---
src/views/pac/components/box/dataContent.vue | 61 ++++++++++--------------------
1 files changed, 20 insertions(+), 41 deletions(-)
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 010d075..6dfb76b 100644
--- a/src/views/pac/components/box/dataContent.vue
+++ b/src/views/pac/components/box/dataContent.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2023-03-10 15:27:59
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2024-11-27 14:49:05
+ * @LastEditTime: 2024-12-16 18:08:11
* @FilePath: \bigScreen\src\views\pac\components\box\dataContent.vue
* @Description:
*
@@ -72,22 +72,22 @@
},
{
type: 7,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
- className: 'xfs-box',
- },
- {
- type: 8,
backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
className: 'xfs-box',
},
{
- type: 9,
+ type: 8,
backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
className: 'xfs-box',
},
{
- type: 10,
+ type: 9,
backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
+ className: 'xfs-box',
+ },
+ {
+ type: 10,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
className: 'xfs-box',
},
{
@@ -101,7 +101,8 @@
size: 1000,
preLevel: item.type,
}).then(res => {
- let data = res.data.data.records
+ let data = res.data.data.records.filter(i => item.type == i.preLevel)
+
data.filter(i => i.lng && i.lng != '' && i.lat && i.lat != '').forEach(i => {
let iconEl = ''
let divclassName = ''
@@ -116,19 +117,19 @@
</div>
`
}
- let divIcon = new DC.DivIcon(
- new DC.Position(i.lng, i.lat, i.ele || 64),
- `<div class="public-map-popup ${divclassName}">
+ let divIcon = new DC.DivIcon(
+ new DC.Position(i.lng, i.lat, i.ele || 64),
+ `<div class="public-map-popup ${divclassName}">
${iconEl}
</div>`
- )
- divIcon.attrParams = i
- let incident = () => { }
+ )
+ divIcon.attrParams = i
+ let incident = () => { }
- if (item.incident) incident = item.incident
- divIcon.on(DC.MouseEventType.CLICK, incident)
- addTileLayers[item.label].addOverlay(divIcon)
- }
+ if (item.incident) incident = item.incident
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addTileLayers[item.label].addOverlay(divIcon)
+ }
})
})
} else {
@@ -140,26 +141,6 @@
}
}
})
-
- if (row.type == 2) {
- EventBus.emit('restHandleCheckChange', `3-3-2`)
- EventBus.emit('restHandleCheckChange', `3-3-4`)
- EventBus.emit('restHandleCheckChange', `3-9`)
- } else {
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- EventBus.emit('restHandleDelChange', `3-9`)
- }
-
- if (row.type == 3) {
- EventBus.emit('restHandleCheckChange', `3-3-2`)
- EventBus.emit('restHandleCheckChange', `3-3-4`)
- EventBus.emit('restHandleCheckChange', `3-8`)
- } else {
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- EventBus.emit('restHandleDelChange', `3-8`)
- }
}
const tabClick = (item) => {
@@ -191,8 +172,6 @@
delete addTileLayers[i]
})
addTileLayers = null
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
})
</script>
--
Gitblit v1.9.3