From b2329d6973a268044164afd3ac6d3f663aa07fbc Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Sat, 04 Jan 2025 20:30:12 +0800
Subject: [PATCH] 应急空间和三级防控加载调整
---
src/pages/map/components/scomponents/layersControl.vue | 8 +-
src/views/pac/components/box/dataContent.vue | 68 ++++++++--------------
src/views/space/components/leftContainer.vue | 66 ++-------------------
3 files changed, 36 insertions(+), 106 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index eeb3786..b4627a8 100644
--- a/src/pages/map/components/scomponents/layersControl.vue
+++ b/src/pages/map/components/scomponents/layersControl.vue
@@ -2,7 +2,7 @@
* @Author: shuishen 1109946754@qq.com
* @Date: 2024-10-31 10:47:29
* @LastEditors: shuishen 1109946754@qq.com
- * @LastEditTime: 2025-01-04 20:19:00
+ * @LastEditTime: 2025-01-04 20:26:15
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -375,7 +375,7 @@
{
parentId: '3',
- id: '3-7',
+ id: '3-8',
label: '桥梁',
type: 'layer',
subType: 'labelPoint',
@@ -390,7 +390,7 @@
layerName: 'ql'
},
- /* {
+ {
parentId: '3',
id: '3-9',
label: '雨水管网',
@@ -400,7 +400,7 @@
source: ysgw,
color: DC.Color.CYAN.withAlpha(0.9),
height: 48,
- }, */
+ },
]
},
diff --git a/src/views/pac/components/box/dataContent.vue b/src/views/pac/components/box/dataContent.vue
index 010d075..0813940 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: 2025-01-04 20:29:10
* @FilePath: \bigScreen\src\views\pac\components\box\dataContent.vue
* @Description:
*
@@ -57,44 +57,34 @@
},
{
type: 2,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjc.png',
+ className: 'yjc-box',
+ },
+ {
+ type: 3,
backgroundIcon: VITE_APP_BASE + 'img/mapicon/ysf.png',
className: 'ysf-box',
},
{
- type: 5,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/sk.png',
+ type: 4,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/zb.png',
className: 'sk-box',
},
{
- type: 6,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/yjb.png',
- className: 'yjb-box',
+ type: 5,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/sd.png',
+ className: 'xfs-box',
},
{
- type: 7,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/xfs.png',
- className: 'xfs-box',
+ type: 6,
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/kt.png',
+ className: 'sk-box',
},
{
type: 8,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/ql.png',
className: 'xfs-box',
},
- {
- type: 9,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
- className: 'xfs-box',
- },
- {
- type: 10,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
- className: 'xfs-box',
- },
- {
- type: 11,
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
- className: 'xfs-box',
- }
]
getList({
@@ -116,19 +106,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 {
@@ -142,22 +132,14 @@
})
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`)
}
}
diff --git a/src/views/space/components/leftContainer.vue b/src/views/space/components/leftContainer.vue
index 3b7bdcb..40df9bb 100644
--- a/src/views/space/components/leftContainer.vue
+++ b/src/views/space/components/leftContainer.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-28 11:35:07
+ * @LastEditTime: 2025-01-04 20:25:11
* @FilePath: \bigScreen\src\views\space\components\leftContainer.vue
* @Description:
*
@@ -17,18 +17,6 @@
data: []
})
-const gawList = ref([
- {
- label: '污水管网',
- value: "3-3-2",
- select: true
- },
- {
- label: '雨水管网',
- value: "3-3-4",
- select: false
- },
-])
const curSelect = ref('')
// 获取下拉字典
@@ -37,7 +25,7 @@
code: code,
}
getDictionary(param).then((res) => {
- resData.data = res.data.data.filter(i => i.dictKey != 7 && i.dictKey != 9 && i.dictKey != 11).map(item => {
+ resData.data = res.data.data.map(item => {
return {
label: item.dictValue,
value: item.dictKey
@@ -51,41 +39,14 @@
const tabClick = (item) => {
EventBus.emit('destroyPop', 'destroyPop')
if (curSelect.value) {
- if (curSelect.value == '3') {
- EventBus.emit('restHandleDelChange', `3-3`)
- EventBus.emit('restHandleDelChange', `3-3-1`)
- EventBus.emit('restHandleDelChange', `3-3-2`)
- EventBus.emit('restHandleDelChange', `3-3-3`)
- EventBus.emit('restHandleDelChange', `3-3-4`)
- } else {
- gawList.value.forEach(element => {
- if (element.value == `3-3-2`) {
- element.select = true
- } else {
- element.select = false
- }
- });
- EventBus.emit('restHandleDelChange', `3-${curSelect.value}`)
- }
+ EventBus.emit('restHandleDelChange', `3-${curSelect.value}`)
}
curSelect.value = item.value
- if (item.value == '3') {
- EventBus.emit('restHandleCheckChange', `3-3-2`)
- } else {
- EventBus.emit('restHandleCheckChange', `3-${item.value}`)
- }
- EventBus.emit('spaceTabChange', item.value)
- EventBus.emit('flyToyqfw', 'flyToyqfw')
-}
-const tabClickGW = (item) => {
- if (item.select) {
- EventBus.emit('restHandleDelChange', item.value)
- item.select = false
- } else {
- EventBus.emit('restHandleCheckChange', item.value)
- item.select = true
- }
+ EventBus.emit('restHandleCheckChange', `3-${item.value}`)
+
+ EventBus.emit('spaceTabChange', item.value)
+ // EventBus.emit('flyToyqfw', 'flyToyqfw')
}
const showOn = computed(() => (item) => {
@@ -118,19 +79,6 @@
</div>
</div>
</div>
- <div v-if="curSelect == '3'">
- <div class="cur-container-title">
- <div class="tablist">
- <div class="cursor-p" :class="{ on: item.select }" v-for="item, index in gawList" :key="index"
- @click="tabClickGW(item)">
- <div class="label-box">
- {{ item.label }}
- </div>
- </div>
- </div>
- </div>
- </div>
-
</div>
</template>
--
Gitblit v1.9.3