From 59c42afa6e082c0d71b5e937fd3fc0ee5d07f55d Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Tue, 26 Nov 2024 16:47:58 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/layersControl.vue | 86 ++++++++++++++++++++----------------------
1 files changed, 41 insertions(+), 45 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 50b9712..d810541 100644
--- a/src/pages/layout/components/scomponents/layersControl.vue
+++ b/src/pages/layout/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-11-26 01:15:28
+ * @LastEditTime: 2024-11-26 01:46:15
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -71,8 +71,6 @@
import { onUnmounted } from 'vue'
import EventBus from 'utils/bus'
import { usePointStore } from 'store/usepoint'
-import { useRouter } from 'vue-router';
-const router = useRouter();
const pointStore = usePointStore()
const { VITE_APP_BASE } = import.meta.env
@@ -103,23 +101,23 @@
subType: '3Dtile',
urlData: [
{
- url: '/mx/tile_01/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
label: 'tile_01'
},
{
- url: '/mx/tile_02/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
label: 'tile_02'
},
{
- url: '/mx/tile_03/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
label: 'tile_03'
},
{
- url: '/mx/tile_04/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
label: 'tile_04'
},
{
- url: '/mx/tile_05/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
label: 'tile_05'
},
],
@@ -461,6 +459,34 @@
className: 'xfs-box',
showPanel: false,
layerName: 'fsclz'
+ },
+ {
+ id: '3-10',
+ label: '排水口',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 10,
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/psk.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'psk'
+ },
+ {
+ id: '3-11',
+ label: '污水池',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 11,
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsc.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'wsc'
}
]
},
@@ -694,15 +720,17 @@
addTileLayers[item.layerName] = []
item.urlData.forEach((m, ind) => {
let tile = new DC.Tileset(m.url, {
- // maximumMemoryUsage: 256,
- maximumScreenSpaceError: 16,
+ maximumMemoryUsage: 1024,
+ maximumScreenSpaceError: 8,
skipLevels: 5,
skipLevelOfDetail: true,
skipScreenSpaceErrorFactor: 128,
- // progressiveResolutionHeightFraction: 0.5,
- // baseScreenSpaceError: 1024
+ progressiveResolutionHeightFraction: 0.5,
+ baseScreenSpaceError: 1024
})
-
+ // tile.setSplitDirection(1)
+ // viewer.sceneSplit.enable = true
+ // viewer.sceneSplit.addTileset(tileset)
tileLayers.addOverlay(tile)
addTileLayers[item.layerName][ind] = tile
})
@@ -925,41 +953,9 @@
}, 3000)
})
-
-// 关闭所有选中的,除了倾斜，园区分布，空中全景
-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`)
-}
-
// 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() {
--
Gitblit v1.9.3