From 7bea740fa55e4acf95b79e0a522e3da2df869175 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 02 Dec 2024 21:24:34 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/map/components/scomponents/layersControl.vue | 112 +++++++++++++++++++++++++++++++++++++------------------
1 files changed, 75 insertions(+), 37 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index e455183..4e6c14c 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 19:46:13
+ * @LastEditTime: 2024-12-02 21:12:23
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -79,6 +79,8 @@
import EventBus from 'utils/bus'
import { usePointStore } from 'store/usepoint'
const pointStore = usePointStore()
+import { useRouter } from 'vue-router';
+const router = useRouter();
const { VITE_APP_BASE } = import.meta.env
// , '7',
@@ -236,16 +238,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 +245,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 +255,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 +480,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) => {
@@ -515,7 +517,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) => {
@@ -683,7 +685,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,
@@ -692,13 +694,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)
@@ -792,7 +793,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({
@@ -921,6 +922,42 @@
// watch(sharedData, (newValue) => {
// });
+// 关闭所有选中的,除了倾斜，园区分布，空中全景
+const closeAll = () => {
+ EventBus.emit('restHandleDelChange', `2`)
+ EventBus.emit('restHandleDelChange', `3`)
+ EventBus.emit('restHandleDelChange', `3-1`)
+ EventBus.emit('restHandleDelChange', `3-2`)
+ 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`)
+ EventBus.emit('restHandleDelChange', `3-4`)
+ EventBus.emit('restHandleDelChange', `3-5`)
+ EventBus.emit('restHandleDelChange', `3-6`)
+ EventBus.emit('restHandleDelChange', `3-7`)
+ EventBus.emit('restHandleDelChange', `3-8`)
+ EventBus.emit('restHandleDelChange', `3-9`)
+ EventBus.emit('restHandleDelChange', `4`)
+ EventBus.emit('restHandleDelChange', `4-1`)
+ EventBus.emit('restHandleDelChange', `4-2`)
+ EventBus.emit('restHandleDelChange', `8`)
+ destroy()
+}
+
+// const sharedData = computed(() => pointStore.sharedData);
+// watch(sharedData, (newValue) => {
+// });
+// 监听当前路由路径的变化
+watch(() => router.currentRoute.value.path,
+ (newPath, oldPath) => {
+ console.log(`Current path changed from ${oldPath} to ${newPath}`);
+ closeAll()
+ },
+ { immediate: true }
+)
+
// 销毁
function destroy () {
let arr = Object.keys(addPupoLayers)
@@ -933,15 +970,10 @@
}
onUnmounted(() => {
- if (tileLayers) {
- tileLayers.clear()
- window.$viewer && window.$viewer.removeLayer(tileLayers)
- tileLayers = null
- }
-
let arr = Object.keys(addTileLayers)
arr.forEach(i => {
if (i == 'hgyq') {
+ tileLayers.removeOverlay(addTileLayers[i])
addTileLayers[i] = null
delete addTileLayers[i]
} else {
@@ -951,6 +983,12 @@
}
})
addTileLayers = null
+
+ if (tileLayers) {
+ tileLayers.remove()
+ window.$viewer && window.$viewer.removeLayer(tileLayers)
+ tileLayers = null
+ }
// 弹窗销毁
destroy()
addPupoLayers = null
--
Gitblit v1.9.3