From cc1aacf766bc902001f460fdfce20a9ec2ea097d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 09 Apr 2025 17:56:11 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/useMapAggregation/useMapAggregation.js | 162 +++++++++++++++++++++++++++---------------------------
1 files changed, 81 insertions(+), 81 deletions(-)
diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index 432d330..53ccd4a 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -49,35 +49,25 @@
// 确定缩放比例
- const determineScaling = (currentState) => {
+ const determineScaling = () => {
// console.log('确定缩放比例');
- return () => {
- if (!viewer) return
- let height = viewer.camera.positionCartographic.height
- // 根据高度展示对应的 gJson
- for (let [index, item] of scalingJudgment.entries()) {
- if (!item.show) return
- if (height > item.value[0] && height <= item.value[1]) {
- if (active === item.name) return
- active = item.name
- removeEntities()
- removeLabel()
- renderOutline(item)
- if (!item.gJson && !item.splashedList?.length) return
- item.gJson ? aggregation(item, currentState.flyTo) : splashed(item)
-
- currentState.flyTo && currentState.stopFlyTo && (currentState.flyTo = false)
- break
- }
+ if (!viewer) return
+ let height = viewer.camera.positionCartographic.height
+ // 根据高度展示对应的 gJson
+ for (let [index, item] of scalingJudgment.entries()) {
+ if (!item.show) return
+ if (height > item.value[0] && height <= item.value[1]) {
+ if (active === item.name) return
+ active = item.name
+ removeEntities()
+ removeLabel()
+ renderOutline(item)
+ if (!item.gJson && !item.splashedList?.length) return
+ item.gJson ? aggregation(item) : splashed(item)
+ break
}
}
}
-
- let currentState = {
- flyTo: true,
- stopFlyTo: false
- }
- const handlerDetermineScaling = () => determineScaling(currentState)()
// 转换为目录结构, 返回数组,
function convertToHierarchy (code) {
@@ -208,18 +198,31 @@
const outlineGJson = await getOutLine(jsonPathPre, hierarchy)
scalingJudgment.forEach(item => item.show && (item.outline = outlineGJson))
const [longitude, latitude] = outlineGJson.features[0].properties.centroid
- flyTo({ longitude, latitude }, 0, scalingJudgment[(hierarchy.length - 3) * (-1)].height)
+ const height = scalingJudgment[(hierarchy.length - 3) * (-1)].height
+ setCenterPosition({ longitude, latitude, height })
+ flyTo({ longitude, latitude }, 0, height)
}
+
+ const userAreaPosition = computed(() => store.state.home.userAreaPosition)
+
+ const setCenterPosition = (position) => {
+ store.commit('setCurrentAreaPosition', position)
+ if (!userAreaPosition.value.longitude) {
+ store.commit('setUserAreaPosition', position)
+ }
+ }
+
+
+ let needFly = true
watch(
selectedAreaCode,
async (newValue, oldValue) => {
+ needFly = true
if (!viewer) return
- currentState.flyTo = true
-
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
initMapData(newValue).then(() => {
- viewer.scene.postRender.addEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.addEventListener(determineScaling)
})
},
{ deep: true }
@@ -232,7 +235,6 @@
id: `aggregation-splashed-${index}`,
position: Cesium.Cartesian3.fromDegrees(item.longitude, item.latitude),
label: {
- // 随机整数
text: item.nickname,
font: '12pt Source Han Sans CN',
fillColor: Cesium.Color.WHITE,
@@ -260,15 +262,12 @@
const renderOutline = item => {
item.outline &&
Cesium.GeoJsonDataSource.load(item.outline).then(dataSource => {
- viewer.dataSources.add(dataSource)
const entities = dataSource.entities.values
- entities.forEach(entity => {
- // 隐藏多边形填充
- entity.polygon.material = Cesium.Color.TRANSPARENT
- entity.polygon.outline = false // 关闭原生轮廓
+ entities.forEach((entity, index) => {
// 创建独立折线作为轮廓
const positions = entity.polygon.hierarchy.getValue().positions
viewer.entities.add({
+ id: `aggregation-outline-${index}`,
polyline: {
positions: positions,
width: 5, // 直接设置宽度
@@ -276,7 +275,6 @@
glowPower: 0.5,
color: Cesium.Color.AQUA,
}),
- clampToGround: true, // 贴地显示
},
})
})
@@ -284,7 +282,7 @@
}
// 聚合机巢
- const aggregation = (item, flyTo) => {
+ const aggregation = (item) => {
if (!item.gJson) return
const featuresList = item.gJson.features.map(item1 => {
// const {lng,lat} = getCenterPoint(item1.geometry.coordinates[0][0])
@@ -298,7 +296,7 @@
// 遍历特征并添加实体
featuresList.forEach((feature, index) => {
if (!feature.position) return
- const position = Cesium.Cartesian3.fromDegrees(feature.position[0], feature.position[1])
+ const position = Cesium.Cartesian3.fromDegrees(feature.position[0], feature.position[1], 12000)
viewer.entities.add({
position: position,
id: `aggregation-name-${index}`,
@@ -345,10 +343,12 @@
return arrColor[++index % arrColor.length]
}
- // 加载新的 GeoJSON 数据
+ // 加载边界
Cesium.GeoJsonDataSource.load(item.gJson).then(dataSource => {
+ console.log(dataSource, item.gJson)
+
viewer.dataSources.add(dataSource)
- item.dataSource = dataSource // 保存数据源以便后续删除
+ item.BJDataSource = dataSource // 保存数据源以便后续删除
// 获取数据源中的实体
const entities = dataSource.entities.values
@@ -359,20 +359,17 @@
alphaPower: 1.3
})
- entity.polygon.extrudedHeight = (entity.propertyNames.length || 1) * 500
+ entity.polygon.extrudedHeight = (entity.properties.childrenNum._value || 1) * 500
entity.polygon.material = material
entity.polygon.outline = false // 显示边框
})
- flyTo && viewer.flyTo(dataSource, {
- offset: new Cesium.HeadingPitchRange(
- 0, // heading: 0 (朝向不变)
- Cesium.Math.toRadians(-60), // pitch: -90° (垂直向下)
- 0 // range: 0 (默认距离)
- ),
+ needFly && viewer.flyTo(dataSource, {
+ offset: new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-60), 0),
duration: 0.5,
})
+ needFly = false
})
}
@@ -406,29 +403,33 @@
// 左键单机事件
const singleMachineEvent = async click => {
const pickedObject = viewer.scene.pick(click.position)
- if (Cesium.defined(pickedObject) && pickedObject.id) {
- const entity = pickedObject.id
- currentEntity = entity
- positionC3 = entity?.position?._value
- if (!positionC3) return
- removeLabel()
- const customData = entity.properties.customData._value.data
- console.log('customData', customData)
- switch (customData.type) {
- case 'deviceAggregation':
- viewer.scene.postRender.addEventListener(labelBoxRender)
- break
- case 'device':
- store.commit('setSingleUavHome', { id: '123' })
- break
- case 'eventAggregation':
- break
- case 'event':
- viewer.scene.postRender.addEventListener(labelBoxRender)
- break
- default:
- break
- }
+ if (!(Cesium.defined(pickedObject) && pickedObject.id)) return
+ const entity = pickedObject.id
+ currentEntity = entity
+ const entityPosition = entity?.position?._value
+ if (!entityPosition) return
+ if (entityPosition) {
+ positionC3 = entityPosition
+ }
+ removeLabel()
+ const customData = entity?.properties?.customData?._value?.data
+ if (!customData) return
+ console.log('customData', customData)
+ switch (customData.type) {
+ case 'deviceAggregation':
+ viewer.scene.postRender.addEventListener(labelBoxRender)
+ break
+ // todo 待对接
+ case 'device':
+ store.commit('setSingleUavHome', { id: '123' })
+ break
+ case 'eventAggregation':
+ break
+ case 'event':
+ viewer.scene.postRender.addEventListener(labelBoxRender)
+ break
+ default:
+ break
}
}
@@ -441,8 +442,12 @@
// 移除 点 和 gjson 实体
const removeEntities = () => {
- viewer.dataSources?.removeAll(true)
- // viewer.entities?.removeAll();
+ // dataSources移除
+ scalingJudgment.forEach(item => {
+ item.BJDataSource && viewer.dataSources.remove(item.BJDataSource)
+ item.BJDataSource = null
+ })
+ // entities移除
const entitiesIDs = viewer.entities.values.map(i => i.id)
entitiesIDs.forEach(item => {
item.includes('aggregation-') && viewer.entities.removeById(item)
@@ -456,13 +461,11 @@
// 移除所有监听事件，变量置空
const removeAll = () => {
- currentState.flyTo = false
-
if (!viewer) return
removeEntities()
removeLabel()
// viewer.camera.moveEnd.removeEventListener(determineScaling);
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
handler?.removeInputAction(Cesium.ScreenSpaceEventType.LEFT_CLICK)
handler?.destroy()
viewer = null
@@ -472,13 +475,10 @@
currentEntity = null
}
const init = () => {
- currentState.flyTo = true
- currentState.stopFlyTo = true
-
viewer = window.$viewer
- viewer.scene.postRender.removeEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.removeEventListener(determineScaling)
initMapData(selectedAreaCode.value || userAreaCode.value).then(() => {
- viewer.scene.postRender.addEventListener(handlerDetermineScaling)
+ viewer.scene.postRender.addEventListener(determineScaling)
})
handler = new Cesium.ScreenSpaceEventHandler(viewer.scene.canvas)
handler.setInputAction(singleMachineEvent, Cesium.ScreenSpaceEventType.LEFT_CLICK)
--
Gitblit v1.9.3