From f7da5040d8894048d8c8116a8f372fcfc1236ec6 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 26 Dec 2024 12:44:45 +0800
Subject: [PATCH] 图层控制风险源更新
---
src/pages/map/components/scomponents/layersControl.vue | 123 +++++++++++++++++++++++-----------------
1 files changed, 70 insertions(+), 53 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index d90e07e..62e9d8c 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-24 17:17:34
+ * @LastEditTime: 2024-12-26 12:41:25
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -73,7 +73,7 @@
import { getList, getGouQu } from "@/api/space/space"
import { getList as getRiskList } from "@/api/riskSource/riskSource"
import { getPanoramaList } from "@/api/panorama/"
-import yqfw_01 from "@/assets/json/yqfw_01"
+import yqfw from "@/assets/json/yqfw"
// import gsgw from "@/assets/json/gsgw"
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
@@ -112,11 +112,11 @@
subType: '3Dtile',
urlData: [
{
- url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
+ url: '/zhyqTileset/mx/tile_01/tileset.json',
label: 'tile_01'
},
{
- url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
+ url: '/zhyqTileset/mx/tile_02/tileset.json',
label: 'tile_02'
},
],
@@ -369,6 +369,7 @@
},
{
+ parentId: '3',
id: '3-7',
label: '洼地',
type: 'layer',
@@ -385,6 +386,7 @@
},
{
+ parentId: '3',
id: '3-8',
label: '桥梁',
type: 'layer',
@@ -398,6 +400,18 @@
className: 'xfs-box',
showPanel: false,
layerName: 'ql'
+ },
+
+ {
+ parentId: '3',
+ id: '3-9',
+ label: '雨水管网',
+ type: 'layer',
+ subType: 'geojsonPipe',
+ layerName: 'ysgw',
+ source: ysgw,
+ color: DC.Color.CYAN.withAlpha(0.9),
+ height: 48,
},
]
},
@@ -487,46 +501,46 @@
}
},
- // {
- // parentId: '4',
- // id: '4-9',
- // label: '暂定',
- // type: 'layer',
- // subType: 'labelPoint',
- // method: getRiskList,
- // params: {
- // riskLevel: 9,
- // size: 1000
- // },
- // showParams: 'category',
- // className: 'fxy-zd',
- // backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
- // showPanel: false,
- // layerName: 'fxyZdLarger',
- // incident: (e) => {
- // const { attrParams } = e.overlay
- // // 删除
- // destroyPop()
- // addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
- // window.$viewer.addLayer(addPopLayers[attrParams.name])
- // let iconEl = `<div class="marsBlueGradientPnl">
- // <li>${attrParams.firmName || ''}</li>
- // <li>${attrParams.name || ''}</li>
- // <li>${attrParams.riskLevelName || ''}</li>
- // </div>`
- // let divIcon = new DC.DivIcon(
- // new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
- // `<div class="public-map-popup-three">
- // ${iconEl}
- // </div>`
- // )
- // let incident = () => {
- // destroyPop()
- // }
- // divIcon.on(DC.MouseEventType.CLICK, incident)
- // addPopLayers[attrParams.name].addOverlay(divIcon)
- // }
- // }
+ {
+ parentId: '4',
+ id: '4-9',
+ label: '其他',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getRiskList,
+ params: {
+ riskLevel: 9,
+ size: 1000
+ },
+ showParams: 'category',
+ className: 'fxy-zd',
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
+ showPanel: false,
+ layerName: 'fxyZdLarger',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ destroyPop()
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <li>${attrParams.firmName || ''}</li>
+ <li>${attrParams.name || ''}</li>
+ <li>${attrParams.riskLevelName || ''}</li>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+ `<div class="public-map-popup-three">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroyPop()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
+ }
+ }
]
},
@@ -536,7 +550,7 @@
type: 'layer',
subType: 'geojsonWall',
layerName: 'yqfw',
- source: yqfw_01
+ source: yqfw
},
{
@@ -662,10 +676,10 @@
if (!addTileLayers[item.layerName]) {
// addTileLayers[item.layerName] = []
// let tile = window.$viewer.delegate.scene.primitives.add(new window.$Cesium.Cesium3DTileset({
- // url: '/zhyq/mx/tile_01/tileset.json',
+ // url: '/zhyq-lc/mx/tile_01/tileset.json',
// }))
- // url: '/zhyq/mx/tile_01/tileset.json',
+ // url: '/zhyq-lc/mx/tile_01/tileset.json',
// }), 121323)
// item.urlData.forEach(i => {
@@ -759,9 +773,11 @@
addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
window.$viewer.addLayer(addTileLayers[item.layerName])
- item.source.features.forEach(i => {
+ console.log(item.source.geometries, 906666)
+
+ item.source.geometries.forEach(i => {
let wall = new DC.Wall(
- i.geometry.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
+ i.coordinates[0].map(d => [d[0], d[1], 125].join(',')).join(';')
)
wall.setStyle({
@@ -791,14 +807,14 @@
}
return positions
}
-
- item.source.features.forEach(i => {
+ console.log(item.source.geometries, 465465)
+ item.source.geometries.forEach(i => {
let polylineVolume = new DC.PolylineVolume(
- i.geometry.coordinates.map(d => [d[0], d[1], item.height].join(',')).join(';'),
+ i.coordinates.map(d => [d[0], d[1], item.height].join(',')).join(';'),
computeCircle(1.6)
)
- if (i.properties.RefName.indexOf('拟建') != -1) {
+ if ('properties' in i && i.properties?.RefName.indexOf('拟建') != -1) {
polylineVolume.setStyle({
material: DC.Color.fromBytes(255, 0, 0, 230)
})
@@ -969,6 +985,7 @@
EventBus.emit('restHandleDelChange', `3-6`)
EventBus.emit('restHandleDelChange', `3-7`)
EventBus.emit('restHandleDelChange', `3-8`)
+ EventBus.emit('restHandleDelChange', `3-9`)
EventBus.emit('restHandleDelChange', `4-1`)
EventBus.emit('restHandleDelChange', `4-2`)
--
Gitblit v1.9.3