From 80790ccc8b8ee6ac8db201f0f6c2d136fefd5a69 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 12 Apr 2025 08:52:59 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/useMapAggregation/useMapAggregation.js | 62 +++++++++++++++---------------
1 files changed, 31 insertions(+), 31 deletions(-)
diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index fe993cf..0153d50 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -293,7 +293,7 @@
entity.polygon.outline = false // 显示边框
}
- let curEntity = viewer.entities.add({
+ viewer.entities.add({
id: `aggregation-outline-${index}`,
polyline: {
positions: positions,
@@ -305,11 +305,6 @@
},
polygon
- })
-
- item.name == '县' && viewer.flyTo(curEntity, {
- offset: new Cesium.HeadingPitchRange(0, Cesium.Math.toRadians(-60), 0),
- duration: 0.5,
})
})
})
@@ -330,7 +325,7 @@
// 遍历特征并添加实体
featuresList.forEach((feature, index) => {
if (!feature.position) return
- const position = Cesium.Cartesian3.fromDegrees(feature.position[0], feature.position[1], 12000)
+ const position = Cesium.Cartesian3.fromDegrees(feature.position[0], feature.position[1], 0)
viewer.entities.add({
position: position,
id: `aggregation-name-${index}`,
@@ -427,36 +422,41 @@
}
}
+ /**
+ * 根据条件获取项
+ * @param {Array} arr 数据源
+ * @param {Function} condition 条件
+ * @returns
+ */
+ const findTypeItem = (arr, condition) => {
+ return arr.find(item => condition(item))
+ }
+
// 左键单机事件
const singleMachineEvent = async click => {
- const pickedObject = viewer.scene.pick(click.position)
- if (!(Cesium.defined(pickedObject) && pickedObject.id)) return
- const entity = pickedObject.id
- currentEntity = entity
- const entityPosition = entity?.position?._value
+ let clickTargets = viewer.scene.drillPick(click.position).map(item => item.id)
+ if (!clickTargets.length) return
+
+ let deviceAggregationFind = findTypeItem(clickTargets, (item) => item?.properties?.customData?._value?.data?.type == 'deviceAggregation')
+ let deviceFind = findTypeItem(clickTargets, (item) => item?.properties?.customData?._value?.data?.type == 'device')
+ let eventFind = findTypeItem(clickTargets, (item) => item?.properties?.customData?._value?.data?.type == 'event')
+
+ const curEntity = deviceAggregationFind || deviceFind || eventFind
+
+ if (!curEntity) return
+
+ currentEntity = curEntity
+ const entityPosition = curEntity?.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
+
+ if (deviceAggregationFind || eventFind) {
+ viewer.scene.postRender.addEventListener(labelBoxRender)
+ }
+ if (deviceFind) {
+ store.commit('setSingleUavHome', { id: '123' })
}
}
--
Gitblit v1.9.3