From 988c8af35cdc8e824b6a47a0f519652b6ad7ea65 Mon Sep 17 00:00:00 2001
From: shuishen <1109946754@qq.com>
Date: Mon, 30 Dec 2024 13:44:06 +0800
Subject: [PATCH] 高度异常处理
---
src/pages/map/components/scomponents/layersControl.vue | 172 +++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 124 insertions(+), 48 deletions(-)
diff --git a/src/pages/map/components/scomponents/layersControl.vue b/src/pages/map/components/scomponents/layersControl.vue
index ca20d1b..2130891 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-25 10:59:51
+ * @LastEditTime: 2024-12-30 13:42:52
* @FilePath: \bigScreen\src\pages\map\components\scomponents\layersControl.vue
* @Description:
*
@@ -70,7 +70,7 @@
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 from "@/assets/json/yqfw"
@@ -82,8 +82,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,11 +117,11 @@
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',
+ url: '/3Dtile/lcmx/tile_02/tileset.json',
label: 'tile_02'
},
],
@@ -411,7 +416,7 @@
layerName: 'ysgw',
source: ysgw,
color: DC.Color.CYAN.withAlpha(0.9),
- height: 60,
+ height: 48,
},
]
},
@@ -501,46 +506,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)
+ }
+ }
]
},
@@ -662,6 +667,8 @@
}
}
+let moveEntity = null
+
const handleCheckChange = (data) => {
let options = treeRef.value?.getCheckedNodes()
@@ -676,10 +683,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 => {
@@ -760,7 +767,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)
})
@@ -966,6 +980,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)))
})
@@ -985,6 +1057,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`)
@@ -1053,6 +1126,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