From edb0f849ff83afbb8468cb014c896c2345153a34 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 25 Nov 2024 15:32:32 +0800
Subject: [PATCH] Merge branch 'main' of http://139.196.74.78:10010/r/zhyq/bigScreen
---
src/pages/layout/components/scomponents/layersControl.vue | 286 +++++++++++++++++++++++++++++++++++++++++++++------------
1 files changed, 226 insertions(+), 60 deletions(-)
diff --git a/src/pages/layout/components/scomponents/layersControl.vue b/src/pages/layout/components/scomponents/layersControl.vue
index 94e25e7..9bd460f 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-22 15:37:11
+ * @LastEditTime: 2024-11-25 15:32:31
* @FilePath: \bigScreen\src\pages\layout\components\scomponents\layersControl.vue
* @Description:
*
@@ -59,7 +59,7 @@
})
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
-import { getList } from "@/api/space/space"
+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"
@@ -78,8 +78,6 @@
const treeRef = ref(null)
const Cesium = DC.getLib('Cesium')
-
-console.log(Cesium, 45646465)
const treeProps = {
indent: 16,
@@ -102,26 +100,51 @@
type: 'layer',
subType: '3Dtile',
urlData: [
+ // {
+ // url: VITE_APP_BASE + 'mx/tileset.json',
+ // label: 'tile_01'
+ // },
{
- url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_01/tileset.json',
label: 'tile_01'
},
{
- url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_02/tileset.json',
label: 'tile_02'
},
{
- url: VITE_APP_BASE + 'mx/tile_03/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_03/tileset.json',
label: 'tile_03'
},
{
- url: VITE_APP_BASE + 'mx/tile_04/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_04/tileset.json',
label: 'tile_04'
},
{
- url: VITE_APP_BASE + 'mx/tile_05/tileset.json',
+ url: VITE_APP_BASE + 'newMx/mx/tile_05/tileset.json',
label: 'tile_05'
},
+
+ // {
+ // url: 'http://localhost:9003/model/ZOebpNa0/tileset.json',
+ // label: 'tile_01'
+ // },
+ // {
+ // url: 'http://localhost:9003/model/QKYdBZ0b/tileset.json',
+ // label: 'tile_02'
+ // },
+ // {
+ // url: 'http://localhost:9003/model/QrimOmf3/tileset.json',
+ // label: 'tile_03'
+ // },
+ // {
+ // url: 'http://localhost:9003/model/S7E9aUgj/tileset.json',
+ // label: 'tile_04'
+ // },
+ // {
+ // url: 'http://localhost:9003/model/WYUq33vu/tileset.json',
+ // label: 'tile_05'
+ // },
],
layerName: 'hgyq'
},
@@ -169,7 +192,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(
@@ -248,7 +271,7 @@
subType: 'geojsonPipe',
layerName: 'wsgw',
source: wsgw,
- color: DC.Color.BLACK,
+ color: DC.Color.DARKBLUE,
height: 68,
},
{
@@ -433,6 +456,20 @@
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/xfs.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'gouqu'
}
]
},
@@ -456,6 +493,28 @@
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
showPanel: false,
layerName: 'fxyOrdinary',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ 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>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, 64),
+ `<div class="public-map-popup-three">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroy()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPupoLayers[attrParams.name].addOverlay(divIcon)
+ }
},
{
id: '4-2',
@@ -472,6 +531,28 @@
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy.png',
showPanel: false,
layerName: 'fxyLarger',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ 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>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, 64),
+ `<div class="public-map-popup-three">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroy()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPupoLayers[attrParams.name].addOverlay(divIcon)
+ }
}
]
},
@@ -487,12 +568,41 @@
{
id: '7',
- label: '地图全景点位分布',
+ label: '空中全景分布',
type: 'layer',
subType: 'labelPoint',
method: getPanoramaList,
params: {
- size: 1000
+ size: 1000,
+ remark: '1'
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
+ showPanel: false,
+ layerName: 'kzqjdwfb',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ panoramaTitle.value = attrParams.name
+ if (
+ attrParams.url.indexOf("http://vr.jxpskj.com:180") != -1
+ ) {
+ attrParams.url = attrParams.url.replace(
+ "http://vr.jxpskj.com:180",
+ "/panorama"
+ )
+ }
+ panoramaUrl.value = attrParams.url
+ panoramaShow.value = true
+ }
+ },
+ {
+ id: '8',
+ label: '地面全景分布',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getPanoramaList,
+ params: {
+ size: 1000,
+ remark: '2'
},
backgroundIcon: VITE_APP_BASE + 'img/mapicon/qj.png',
showPanel: false,
@@ -513,6 +623,8 @@
}
},
]
+
+console.log(data, 12112213213)
const defaultProps = {
children: 'children',
@@ -543,20 +655,22 @@
if (checkType(nodes) == 'arr') {
nodes.forEach(item => {
- if (item.type == 'layer') {
- collectedNodes.value.push(item)
- }
+ if (item) {
+ if (item.type == 'layer') {
+ collectedNodes.value.push(item)
+ }
- if (item.children && item.children.length > 0) {
- collectNodesWithFlag(item.children)
+ if (item.children && item.children.length > 0) {
+ collectNodesWithFlag(item.children)
+ }
}
})
}
}
-window.addTileLayers = {}
-window.tileLayers = new DC.TilesetLayer('tileLayers')
-window.$viewer.addLayer(window.tileLayers)
+let addTileLayers = {}
+let tileLayers = new DC.TilesetLayer('tileLayers')
+window.$viewer.addLayer(tileLayers)
const handleCheckChange = (data) => {
let options = treeRef.value?.getCheckedNodes()
@@ -568,8 +682,8 @@
// const Cesium = DC
if (item.subType == '3Dtile') {
- if (!window.addTileLayers[item.layerName]) {
- // window.addTileLayers[item.layerName] = []
+ if (!addTileLayers[item.layerName]) {
+ // addTileLayers[item.layerName] = []
// let tile = window.$viewer.delegate.scene.primitives.add(new Cesium.Cesium3DTileset({
// url: '/zhyq/mx/tile_01/tileset.json',
// }))
@@ -581,27 +695,28 @@
// })
-
-
- window.addTileLayers[item.layerName] = item.urlData.map(i => {
- let tile = new DC.Tileset(i.url, {
- maximumMemoryUsage: 1024 * 1024 * 1024,
- maximumScreenSpaceError: 48,
- skipLevels: 5,
+ addTileLayers[item.layerName] = item.urlData.map(m => {
+ let tile = new DC.Tileset(m.url, {
+ maximumMemoryUsage: 512,
+ maximumScreenSpaceError: 8,
+ skipLevels: 6,
skipLevelOfDetail: true,
- skipScreenSpaceErrorFactor: 128
+ skipScreenSpaceErrorFactor: 256,
+ progressiveResolutionHeightFraction: 0.5,
+ baseScreenSpaceError: 1024
})
- window.tileLayers.addOverlay(tile)
+ tileLayers.addOverlay(tile)
+
return tile
})
} else {
- window.addTileLayers[item.layerName].forEach(i => i.show = true)
+ addTileLayers[item.layerName].forEach(m => m.show = true)
}
} else if (item.subType == 'labelPoint') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.HtmlLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.HtmlLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
item.method(item.params).then(res => {
let data = res.data.data.records
@@ -640,16 +755,16 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
- window.addTileLayers[item.layerName].addOverlay(divIcon)
+ addTileLayers[item.layerName].addOverlay(divIcon)
})
})
} else {
- window.addTileLayers[item.layerName].show = true
+ addTileLayers[item.layerName].show = true
}
} else if (item.subType == 'geojsonWall') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
item.source.features.forEach(i => {
let wall = new DC.Wall(
@@ -662,17 +777,15 @@
speed: 8
})
})
- window.addTileLayers[item.layerName].addOverlay(wall)
+ addTileLayers[item.layerName].addOverlay(wall)
})
} else {
- window.addTileLayers[item.layerName].show = true
+ addTileLayers[item.layerName].show = true
}
- window.$viewer.flyTo(addTileLayers[item.layerName])
- console.log(addTileLayers[item.layerName], "22222222222222222222222222222222")
} else if (item.subType == 'geojsonPipe') {
- if (!window.addTileLayers[item.layerName]) {
- window.addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
- window.$viewer.addLayer(window.addTileLayers[item.layerName])
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
function computeCircle (radius) {
var positions = []
@@ -695,22 +808,54 @@
polylineVolume.setStyle({
material: item.color
})
- window.addTileLayers[item.layerName].addOverlay(polylineVolume)
+ addTileLayers[item.layerName].addOverlay(polylineVolume)
})
} else {
- window.addTileLayers[item.layerName].show = true
+ 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 (window.addTileLayers[item.layerName]) {
+ if (addTileLayers[item.layerName]) {
if (item.subType == '3Dtile') {
- window.addTileLayers[item.layerName].forEach(i => i.show = false)
+ addTileLayers[item.layerName].forEach(m => m.show = false)
} else if (item.subType == 'labelPoint') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonWall') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
} else if (item.subType == 'geojsonPipe') {
- window.addTileLayers[item.layerName].show = false
+ addTileLayers[item.layerName].show = false
+ } else if (item.subType == 'geojsonPolygon') {
+ addTileLayers[item.layerName].show = false
}
}
}
@@ -764,11 +909,27 @@
handleCheckChange([findObjectById(data, key)])
}
+// 飞到园区范围
+const flyToyqfw = () => {
+ window.$viewer.zoomToPosition(new DC.Position(
+ 115.1021,
+ 27.2360,
+ 5000,
+ 0,
+ -45,
+ 0
+ ), () => {
+ })
+}
+
EventBus.on('restHandleCheckChange', restHandleCheckChange)
EventBus.on('restHandleDelChange', restHandleDelChange)
+EventBus.on('flyToyqfw', flyToyqfw)
onMounted(() => {
- handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ setTimeout(() => {
+ handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
+ }, 2000)
})
// const sharedData = computed(() => pointStore.sharedData);
@@ -785,17 +946,22 @@
}
onUnmounted(() => {
- window.tileLayers && window.$viewer.removeLayer(window.tileLayers)
- delete window.tileLayers
- let arr = Object.keys(window.addTileLayers)
+ if (tileLayers) {
+ tileLayers.clear()
+ window.$viewer.removeLayer(tileLayers)
+ tileLayers = null
+ }
+
+ let arr = Object.keys(addTileLayers)
arr.filter(i => i != 'hgyq').forEach(i => {
- addTileLwindow.addTileLayersayers[i] && window.$viewer.removeLayer(window.addTileLayers[i])
+ addTileLayers[i] && window.$viewer.removeLayer(addTileLayers[i])
})
// 弹窗销毁
destroy()
EventBus.off('restHandleCheckChange', restHandleCheckChange)
EventBus.off('restHandleDelChange', restHandleDelChange)
+ EventBus.off('flyToyqfw', flyToyqfw)
})
</script>
--
Gitblit v1.9.3