From bb9b31d8abc6578fa451cc545658115d0da4ff50 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Sat, 12 Apr 2025 13:36:09 +0800
Subject: [PATCH] feat: 更换返回按钮
---
src/views/Home/useMapAggregation/useMapAggregation.js | 35 ++++++++++++++++-------------------
1 files changed, 16 insertions(+), 19 deletions(-)
diff --git a/src/views/Home/useMapAggregation/useMapAggregation.js b/src/views/Home/useMapAggregation/useMapAggregation.js
index 90ab017..8678176 100644
--- a/src/views/Home/useMapAggregation/useMapAggregation.js
+++ b/src/views/Home/useMapAggregation/useMapAggregation.js
@@ -48,7 +48,6 @@
let viewer = null
let active = null
let handler = null
- let positionC3 = null
let currentEntity = null
const store = useStore()
@@ -410,11 +409,12 @@
// 弹框位置刷新
const labelBoxRender = () => {
+ if (!currentEntity) return
let dom = document.querySelector('#mapPopUpBox')
if (!dom) {
dom = getLabelDom(currentEntity.properties.customData._value.data)
}
- const screenPosition = viewer.scene.cartesianToCanvasCoordinates(positionC3)
+ const screenPosition = viewer.scene.cartesianToCanvasCoordinates(currentEntity?.position?._value)
if (screenPosition) {
dom.style.left = `${screenPosition.x}px`
dom.style.top = `${screenPosition.y}px`
@@ -422,6 +422,12 @@
}
}
+ /**
+ * 根据条件获取项
+ * @param {Array} arr 数据源
+ * @param {Function} condition 条件
+ * @returns
+ */
const findTypeItem = (arr, condition) => {
return arr.find(item => condition(item))
}
@@ -431,27 +437,19 @@
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
- }
-
+ 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')
+ currentEntity = deviceAggregationFind || deviceFind || eventFind
+ if (!currentEntity) return
+ if (!currentEntity?.position?._value) return
+ // 一定要移除
+ removeLabel()
if (deviceAggregationFind || eventFind) {
viewer.scene.postRender.addEventListener(labelBoxRender)
}
if (deviceFind) {
store.commit('setSingleUavHome', { id: '123' })
- viewer.scene.postRender.addEventListener(labelBoxRender)
}
}
@@ -493,7 +491,6 @@
viewer = null
active = null
handler = null
- positionC3 = null
currentEntity = null
}
const init = () => {
--
Gitblit v1.9.3