From 930bb5973273864f63bf45d2502f11f97a3d5f9e Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 02 Dec 2024 21:24:32 +0800
Subject: [PATCH] 企业详情、应急物资表格样式调整
---
src/pages/map/components/scomponents/layersControl.vue | 95 ++++++++++++++++++++++++-----------------------
1 files changed, 49 insertions(+), 46 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 8838866..d570f6f 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: 2024-12-02 18:53:41
+ * @LastEditTime: 2024-12-02 21:12:23
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -236,16 +236,6 @@
children: [
// 给水管网、污水管网、燃气管网、雨水管网
{
- id: '3-3-1',
- label: '给水管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'gsgw',
- source: gsgw,
- color: DC.Color.BLUE.withAlpha(0.9),
- height: 65,
- },
- {
id: '3-3-2',
label: '污水管网',
type: 'layer',
@@ -253,17 +243,7 @@
layerName: 'wsgw',
source: wsgw,
color: DC.Color.DARKBLUE.withAlpha(0.9),
- height: 68,
- },
- {
- id: '3-3-3',
- label: '燃气管网',
- type: 'layer',
- subType: 'geojsonPipe',
- layerName: 'rqgw',
- source: rqgw,
- color: DC.Color.RED.withAlpha(0.9),
- height: 71,
+ height: 60.2,
},
{
id: '3-3-4',
@@ -273,7 +253,27 @@
layerName: 'ysgw',
source: ysgw,
color: DC.Color.CYAN.withAlpha(0.9),
- height: 75,
+ height: 60,
+ },
+ {
+ id: '3-3-1',
+ label: '给水管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'gsgw',
+ source: gsgw,
+ color: DC.Color.BLUE.withAlpha(0.9),
+ height: 60.4,
+ },
+ {
+ id: '3-3-3',
+ label: '燃气管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'rqgw',
+ source: rqgw,
+ color: DC.Color.RED.withAlpha(0.9),
+ height: 60.6,
},
]
},
@@ -478,7 +478,7 @@
},
showParams: 'category',
className: 'fxy-ordinary',
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-yb.png',
showPanel: false,
layerName: 'fxyOrdinary',
incident: (e) => {
@@ -488,8 +488,7 @@
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <li>${attrParams.firmName || ''}</li>
- <li>${attrParams.riskLevelName || ''}</li>
+ <li>${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -516,7 +515,7 @@
},
showParams: 'category',
className: 'fxy-larger',
- backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
showPanel: false,
layerName: 'fxyLarger',
incident: (e) => {
@@ -525,9 +524,8 @@
destroy()
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
- let iconEl = `<div class="marsBlueGradientPnl">
- <li>${attrParams.firmName || ''}</li>
- <li>${attrParams.riskLevelName || ''}</li>
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <li>${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -685,7 +683,7 @@
// })
addTileLayers[item.layerName] = []
item.urlData.forEach((m, ind) => {
- let tile = new DC.Tileset(m.url, {
+ addTileLayers[item.layerName][ind] = new DC.Tileset(m.url, {
maximumMemoryUsage: 1024,
maximumScreenSpaceError: 8,
skipLevels: 5,
@@ -694,13 +692,12 @@
progressiveResolutionHeightFraction: 0.5,
baseScreenSpaceError: 1024
})
- tile.setSplitDirection(1)
+ addTileLayers[item.layerName][ind].setSplitDirection(1)
// tile.setHeight(-420)
// tile.setSplitDirection(-1)
- window.$viewer.sceneSplit.addTileset(tile)
- tileLayers.addOverlay(tile)
+ window.$viewer.sceneSplit.addTileset(addTileLayers[item.layerName][ind])
+ tileLayers.addOverlay(addTileLayers[item.layerName][ind])
window.$viewer.sceneSplit.enable = false
- addTileLayers[item.layerName][ind] = tile
})
} else {
addTileLayers[item.layerName].forEach(m => m.show = true)
@@ -794,7 +791,7 @@
item.source.features.forEach(i => {
let polylineVolume = new DC.PolylineVolume(
i.geometry.coordinates.map(d => [d[0], d[1], item.height].join(',')).join(';'),
- computeCircle(2)
+ computeCircle(1.6)
)
polylineVolume.setStyle({
@@ -915,7 +912,7 @@
onMounted(() => {
setTimeout(() => {
- handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ // handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
}, 3000)
})
@@ -935,19 +932,25 @@
}
onUnmounted(() => {
+ let arr = Object.keys(addTileLayers)
+ arr.forEach(i => {
+ if (i == 'hgyq') {
+ tileLayers.removeOverlay(addTileLayers[i])
+ addTileLayers[i] = null
+ delete addTileLayers[i]
+ } else {
+ addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
+ addTileLayers[i] = null
+ delete addTileLayers[i]
+ }
+ })
+ addTileLayers = null
+
if (tileLayers) {
- tileLayers.clear()
+ tileLayers.remove()
window.$viewer && window.$viewer.removeLayer(tileLayers)
tileLayers = null
}
-
- let arr = Object.keys(addTileLayers)
- arr.filter(i => i != 'hgyq').forEach(i => {
- addTileLayers[i] && window.$viewer && window.$viewer.removeLayer(addTileLayers[i])
- addTileLayers[i] = null
- delete addTileLayers[i]
- })
- addTileLayers = null
// 弹窗销毁
destroy()
addPupoLayers = null
--
Gitblit v1.9.3