From ebc79da8a1c5a72fb9ec66da407692c0cde01eba Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Thu, 26 Dec 2024 12:26:44 +0800
Subject: [PATCH] 新干加载企业范围及企业详情初始化调整
---
src/pages/map/components/scomponents/layersControl.vue | 226 +++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 166 insertions(+), 60 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 36397f2..898e25f 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:04:32
+ * @LastEditTime: 2024-12-25 15:32:04
* @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'
},
],
@@ -269,6 +269,22 @@
},
{
+ id: '3-4',
+ label: '闸坝',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 4,
+ size: 1000
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/zb.png',
+ className: 'sk-box',
+ showPanel: false,
+ layerName: 'zb'
+ },
+
+ {
parentId: '3',
id: '3-5',
label: '水库',
@@ -308,6 +324,94 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
addPopLayers[attrParams.name].addOverlay(divIcon)
}
+ },
+
+ {
+ parentId: '3',
+ id: '3-6',
+ label: '坑塘',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 6,
+ size: 1000
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/kt.png',
+ className: 'sk-box',
+ showPanel: false,
+ layerName: 'kt',
+ incident: (e) => {
+ const { attrParams } = e.overlay
+ // 删除
+ destroyPop()
+ if (!attrParams.firmName) {
+ return
+ }
+ addPopLayers[attrParams.name] = new DC.HtmlLayer(attrParams.name)
+ window.$viewer.addLayer(addPopLayers[attrParams.name])
+ let iconEl = `<div class="marsBlueGradientPnl">
+ <div>企业名称：${attrParams.firmName}</div>
+ <div>作用：${attrParams.mainFuncName}</div>
+ </div>`
+ let divIcon = new DC.DivIcon(
+ new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
+ `<div class="public-map-popup-two">
+ ${iconEl}
+ </div>`
+ )
+ let incident = () => {
+ destroyPop()
+ }
+ divIcon.on(DC.MouseEventType.CLICK, incident)
+ addPopLayers[attrParams.name].addOverlay(divIcon)
+ }
+ },
+
+ {
+ parentId: '3',
+ id: '3-7',
+ label: '洼地',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 7,
+ size: 1000
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/wd.png',
+ className: 'xfs-box',
+ showPanel: false,
+ layerName: 'wd'
+ },
+
+ {
+ parentId: '3',
+ id: '3-8',
+ label: '桥梁',
+ type: 'layer',
+ subType: 'labelPoint',
+ method: getList,
+ params: {
+ type: 8,
+ size: 1000
+ },
+ backgroundIcon: VITE_APP_BASE + 'img/mapicon/ql.png',
+ 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: 60,
},
]
},
@@ -396,46 +500,47 @@
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)
- }
- }
+
+ // {
+ // 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)
+ // }
+ // }
]
},
@@ -445,7 +550,7 @@
type: 'layer',
subType: 'geojsonWall',
layerName: 'yqfw',
- source: yqfw_01
+ source: yqfw
},
{
@@ -476,7 +581,8 @@
panoramaShow.value = true
}
},
- {
+
+ /* {
id: '8',
label: '地面全景分布',
type: 'layer',
@@ -503,7 +609,7 @@
panoramaUrl.value = attrParams.url
panoramaShow.value = true
}
- },
+ }, */
]
// let modellayer = new DC.VectorLayer("modellayer").addTo(window.$viewer)
@@ -570,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 => {
@@ -667,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({
@@ -699,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)
})
@@ -871,16 +979,14 @@
EventBus.emit('restHandleDelChange', `2`)
EventBus.emit('restHandleDelChange', `3-1`)
EventBus.emit('restHandleDelChange', `3-2`)
- // 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-3`)
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', `3-9`)
+
EventBus.emit('restHandleDelChange', `4-1`)
EventBus.emit('restHandleDelChange', `4-2`)
EventBus.emit('restHandleDelChange', `4-9`)
--
Gitblit v1.9.3