From d2e2df7c4805cc9c5e4e915202f304e0e9a53758 Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Fri, 23 May 2025 09:49:31 +0800
Subject: [PATCH] 临川优化
---
src/pages/map/components/scomponents/layersControl.vue | 290 ++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 264 insertions(+), 26 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index 36397f2..be66e56 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: 2025-01-15 14:29:52
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -70,10 +70,12 @@
import panorama from './popup/panorama.vue'
import { getPage } from '@/api/indParkInfo'
import { getPage as getfirmPage } from '@/api/firmInfo/firmInfo'
-import { getList, getGouQu } from "@/api/space/space"
+import { getList, getGouQu, updateSpace } 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/shape"
+import track from "@/assets/json/track"
+
// import gsgw from "@/assets/json/gsgw"
// import rqgw from "@/assets/json/rqgw"
import wsgw from "@/assets/json/wsgw"
@@ -82,8 +84,13 @@
import EventBus from 'utils/bus'
import { usePointStore } from 'store/usepoint'
const pointStore = usePointStore()
+import { useMap } from 'store/map'
+const mapStore = useMap()
import { useRouter } from 'vue-router'
const router = useRouter()
+import {
+ ElMessage
+} from 'element-plus'
const { VITE_APP_BASE } = import.meta.env
// , '7',
@@ -112,12 +119,33 @@
subType: '3Dtile',
urlData: [
{
- url: VITE_APP_BASE + 'mx/tile_01/tileset.json',
+ url: '/3Dtile/lcmx/tile_01/tileset.json',
label: 'tile_01'
},
+
{
- url: VITE_APP_BASE + 'mx/tile_02/tileset.json',
- label: 'tile_02'
+ url: '/3Dtile/lcmx/tile_03/tileset.json',
+ label: 'tile_03'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_04/tileset.json',
+ label: 'tile_04'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_05/tileset.json',
+ label: 'tile_05'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_06/tileset.json',
+ label: 'tile_06'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_07/tileset.json',
+ label: 'tile_07'
+ },
+ {
+ url: '/3Dtile/lcmx/tile_08/tileset.json',
+ label: 'tile_08'
},
],
layerName: 'hgyq'
@@ -169,6 +197,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -211,6 +240,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -253,6 +283,7 @@
let iconEl = `<div class="marsBlueGradientPnl">
<div>企业名称：${attrParams.firmName}</div>
<div>作用：${attrParams.mainFuncName}</div>
+ <div>容量：${attrParams.capacity}(m³)</div>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -266,6 +297,22 @@
divIcon.on(DC.MouseEventType.CLICK, incident)
addPopLayers[attrParams.id].addOverlay(divIcon)
}
+ },
+
+ {
+ 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'
},
{
@@ -309,6 +356,95 @@
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>容量：${attrParams.capacity}(m³)</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: 48,
+ },
]
},
@@ -327,7 +463,7 @@
riskLevel: 1,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-ordinary',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-yb.png',
showPanel: false,
@@ -340,8 +476,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -367,7 +504,7 @@
riskLevel: 2,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-larger',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-jd.png',
showPanel: false,
@@ -380,8 +517,9 @@
window.$viewer.addLayer(addPopLayers[attrParams.name])
let iconEl = `<div class="marsBlueGradientPnl">
<li>企业名称：${attrParams.firmName || ''}</li>
+ <li>行业类别：${attrParams.category || ''}</li>
<li>风险等级：${attrParams.riskLevelName || ''}</li>
- <li>行业类别：${attrParams.name || ''}</li>
+ <li>风险物资：${attrParams.name || ''}</li>
</div>`
let divIcon = new DC.DivIcon(
new DC.Position(attrParams.lng, attrParams.lat, attrParams.ele || 64),
@@ -396,10 +534,11 @@
addPopLayers[attrParams.name].addOverlay(divIcon)
}
},
+
{
parentId: '4',
id: '4-9',
- label: '暂定',
+ label: '其他',
type: 'layer',
subType: 'labelPoint',
method: getRiskList,
@@ -407,7 +546,7 @@
riskLevel: 9,
size: 1000
},
- showParams: 'category',
+ showParams: 'firmName',
className: 'fxy-zd',
backgroundIcon: VITE_APP_BASE + 'img/mapicon/fxy-zd.png',
showPanel: false,
@@ -445,7 +584,7 @@
type: 'layer',
subType: 'geojsonWall',
layerName: 'yqfw',
- source: yqfw_01
+ source: yqfw
},
{
@@ -476,7 +615,19 @@
panoramaShow.value = true
}
},
+
{
+ id: '8',
+ label: '内外水系',
+ type: 'layer',
+ subType: 'geojsonPolyline',
+ layerName: 'track',
+ source: track,
+ color: DC.Color.BLUE.withAlpha(0.9),
+ height: 30,
+ },
+
+ /* {
id: '8',
label: '地面全景分布',
type: 'layer',
@@ -503,7 +654,7 @@
panoramaUrl.value = attrParams.url
panoramaShow.value = true
}
- },
+ }, */
]
// let modellayer = new DC.VectorLayer("modellayer").addTo(window.$viewer)
@@ -556,6 +707,8 @@
}
}
+let moveEntity = null
+
const handleCheckChange = (data) => {
let options = treeRef.value?.getCheckedNodes()
@@ -570,10 +723,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 => {
@@ -654,7 +807,14 @@
if (item.incident) incident = item.incident
- divIcon.on(DC.MouseEventType.CLICK, incident)
+ divIcon.on(DC.MouseEventType.CLICK, (e) => {
+ if (mapStore.editPoint) {
+ moveEntity = e
+ return
+ }
+
+ incident(e)
+ })
addTileLayers[item.layerName].addOverlay(divIcon)
})
@@ -699,14 +859,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)
})
@@ -769,7 +929,26 @@
} else {
addTileLayers[item.layerName].show = true
}
+ } else if (item.subType == 'geojsonPolyline') {
+ if (!addTileLayers[item.layerName]) {
+ addTileLayers[item.layerName] = new DC.VectorLayer(item.layerName)
+ window.$viewer.addLayer(addTileLayers[item.layerName])
+
+ item.source.features.forEach(i => {
+ let Polyline = new DC.Polyline(i.geometry.coordinates.map(d => [...d, item.height].join(',')).join(';'))
+
+ Polyline.setStyle({
+ width: 3,
+ material: DC.Color.BLUE,
+ clampToGround: true
+ })
+ addTileLayers[item.layerName].addOverlay(Polyline)
+ })
+ } else {
+ addTileLayers[item.layerName].show = true
+ }
}
+
} else {
if (addTileLayers[item.layerName]) {
if (item.subType == '3Dtile') {
@@ -858,6 +1037,64 @@
EventBus.on('flyToyqfw', flyToyqfw)
EventBus.on('destroyPop', destroyPop)
+let tooltip = window.$viewer.tooltip
+
+const viewerMouseMove = (e) => {
+ if (mapStore.editPoint) {
+ if (moveEntity != null) {
+
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
+ moveEntity.overlay.position = new DC.Position(e.wgs84Position.lng, e.wgs84Position.lat, e.wgs84Position.alt)
+ } else {
+ moveEntity.overlay.position = new DC.Position(e.wgs84SurfacePosition.lng, e.wgs84SurfacePosition.lat, e.wgs84SurfacePosition.alt)
+ }
+
+ tooltip.showAt({ x: e.windowPosition.x + 10, y: e.windowPosition.y }, '右键结束编辑')
+ } else {
+ tooltip.showAt({ x: e.windowPosition.x + 10, y: e.windowPosition.y }, '左键选中点位，开始编辑')
+ }
+ }
+}
+
+window.$viewer.on(DC.MouseEventType.MOUSE_MOVE, viewerMouseMove)
+
+const viewerRightClick = (e) => {
+ if (mapStore.editPoint && moveEntity != null) {
+ tooltip.enable = false
+ let lng, lat, ele
+
+ const { attrParams } = moveEntity.overlay
+ console.log(e, 2222)
+
+ if (e.wgs84Position && e.wgs84Position.alt > 0) {
+ lng = e.wgs84Position.lng
+ lat = e.wgs84Position.lat
+ ele = e.wgs84Position.alt
+ } else {
+ lng = e.wgs84SurfacePosition.lng
+ lat = e.wgs84SurfacePosition.lat
+ ele = e.wgs84SurfacePosition.alt
+ }
+
+ updateSpace({
+ id: attrParams.id,
+ lng,
+ lat,
+ ele: Math.ceil(ele)
+ }).then(res => {
+ moveEntity = null
+ mapStore.setEditPoint(false)
+
+ ElMessage({
+ message: '修改成功',
+ type: 'success',
+ })
+ })
+ }
+}
+
+window.$viewer.on(DC.MouseEventType.RIGHT_CLICK, viewerRightClick)
+
onMounted(() => {
handleCheckChange(data.filter(i => indexPoint.value.includes(i.id)))
})
@@ -871,16 +1108,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`)
@@ -948,6 +1183,9 @@
destroyPop()
addPopLayers = null
+ window.$viewer && window.$viewer.off(DC.MouseEventType.MOUSE_MOVE, viewerMouseMove)
+ window.$viewer && window.$viewer.off(DC.MouseEventType.RIGHT_CLICK, viewerRightClick)
+
EventBus.off('restHandleCheckChange', restHandleCheckChange)
EventBus.off('restHandleDelChange', restHandleDelChange)
EventBus.off('flyToyqfw', flyToyqfw)
--
Gitblit v1.9.3