From f33fb1a61a00d3ec5d6868def0b146bb69be4dc5 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Mon, 25 Nov 2024 16:52:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/pages/layout/components/scomponents/layersControl.vue | 139 +++++++++++++++++++++++++++++++++++++++-------
1 files changed, 118 insertions(+), 21 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index c2bbe01..6c275cd 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-24 03:30:37
+ * @LastEditTime: 2024-11-25 16:37:03
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -59,7 +59,8 @@
})
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
-import { getList } from "@/api/space/space"
+import { getPage as getfirmPage } from '@/api/firmInfo/firmInfo'
+import { getList, getGouQu } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
import yqfw from "@/assets/json/yqfw"
@@ -70,6 +71,8 @@
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
@@ -100,10 +103,6 @@
type: 'layer',
subType: '3Dtile',
urlData: [
- // {
- // url: VITE_APP_BASE + 'mx/tileset.json',
- // label: 'tile_01'
- // },
{
url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
label: 'tile_01'
@@ -123,7 +122,7 @@
{
url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
label: 'tile_05'
- }
+ },
],
layerName: 'hgyq'
},
@@ -171,7 +170,7 @@
addPupoLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
window.$viewer.addLayer(addPupoLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
- <div>${attrParams.fullName}</div>
+ <div>${attrParams.fullName}</div>
<img src="${attrParams.imageUrl}" />
</div>`
let divIcon = new DC.DivIcon(
@@ -250,7 +249,7 @@
subType: 'geojsonPipe',
layerName: 'wsgw',
source: wsgw,
- color: DC.Color.BLACK,
+ color: DC.Color.DARKBLUE,
height: 68,
},
{
@@ -435,6 +434,34 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
addPupoLayers[attrParams.name].addOverlay(divIcon)
}
+ },
+ {
+ id: '3-8',
+ label: '沟渠',
+ type: 'layer',
+ subType: 'geojsonPolygon',
+ method: getGouQu,
+ params: {
+ type: 8,
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/gouqu.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'gouqu'
+ },
+ {
+ id: '3-9',
+ label: '废水处理站',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getfirmPage,
+ params: {
+ name: '吉水县绿源污水处理厂',
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wsclc.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'fsclz'
}
]
},
@@ -589,7 +616,13 @@
},
]
-console.log(data, 12112213213)
+// let modellayer = new DC.VectorLayer("modellayer").addTo(window.$viewer)
+// let model = new DC.Model("121.46748793889597,31.22345700031846,200", VITE_APP_BASE + 'gltf/dajiang.gltf')
+// model.setStyle({
+// scale: 10000
+// })
+// modellayer.addOverlay(model)
+// window.$viewer.flyToPosition("121.46748793889597,31.22345700031846,300,0,-90")
const defaultProps = {
children: 'children',
@@ -661,7 +694,7 @@
// })
addTileLayers[item.layerName] = item.urlData.map(m => {
- let tile = new DC.Tileset(m.url, {
+ let tile = new DC.Tileset(m.url, {
maximumMemoryUsage: 512,
maximumScreenSpaceError: 8,
skipLevels: 6,
@@ -671,9 +704,9 @@
baseScreenSpaceError: 1024
})
- tileLayers.addOverlay(tile)
+ tileLayers.addOverlay(tile)
- return tile
+ return tile
})
} else {
addTileLayers[item.layerName].forEach(m => m.show = true)
@@ -778,6 +811,36 @@
} else {
addTileLayers[item.layerName].show = true
}
+ } else if (item.subType == 'geojsonPolygon') {
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+ item.method(item.params).then(res => {
+ let data = res.data.data.records
+ data.forEach(i => {
+ let stl = ''
+ try {
+ let geom = JSON.parse(i.geom)
+ if (geom && geom.coordinates && geom.coordinates[0]) {
+ stl = geom.coordinates[0][0].map(d => d[0] + ',' + d[1]).join(';')
+ } else {
+ console.error('Invalid geom structure')
+ }
+ } catch (error) {
+ console.error('Failed to parse geom:', error)
+ }
+ let polygon = new DC.Polygon(stl)
+ polygon.setStyle({
+ width: 2,
+ material: DC.Color.BLUE,
+ clampToGround: true
+ })
+ addTileLayers[item.layerName].addOverlay(polygon)
+ })
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
}
} else {
if (addTileLayers[item.layerName]) {
@@ -788,6 +851,8 @@
} else if (item.subType == 'geojsonWall') {
addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonPipe') {
+ addTileLayers[item.layerName].show = false
+ } else if (item.subType == 'geojsonPolygon') {
addTileLayers[item.layerName].show = false
}
}
@@ -845,14 +910,14 @@
// 飞到园区范围
const flyToyqfw = () => {
window.$viewer.zoomToPosition(new DC.Position(
- 115.1021,
- 27.2360,
- 5000,
- 0,
- -45,
- 0
- ), () => {
- })
+ 115.1021,
+ 27.2360,
+ 5000,
+ 0,
+ -45,
+ 0
+ ), () => {
+ })
}
EventBus.on('restHandleCheckChange', restHandleCheckChange)
@@ -865,9 +930,41 @@
}, 2000)
})
+
+// 关闭所有选中的,除了倾斜，园区分布，空中全景
+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