From 2f3e4b27184c91ca9e229d008ea9726852b153dc Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Mon, 31 Mar 2025 12:34:29 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/drone/command-center-dashboard
---
src/views/Home/useUavHome/useUavHome.js | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/views/Home/useAggregation.js b/src/views/Home/useUavHome/useUavHome.js
similarity index 96%
rename from src/views/Home/useAggregation.js
rename to src/views/Home/useUavHome/useUavHome.js
index b724256..4e08252 100644
--- a/src/views/Home/useAggregation.js
+++ b/src/views/Home/useUavHome/useUavHome.js
@@ -4,13 +4,13 @@
import jiangxishi from '@/assets/geojson/jiangxishi.json';
import jiangxi from '@/assets/geojson/jiangxi.json';
import zg from '@/assets/geojson/zg.json';
-import MapPopUpBox from '@/views/Home/MapPopUpBox.vue';
+import MapPopUpBox from '@/views/Home/useUavHome/MapPopUpBox.vue';
import { render } from 'vue';
/**
* 机巢聚合功能
*/
-export const useAggregation = () => {
+export const useUavHome = () => {
const scalingJudgment = [
{ name: '县', value: [0, 48651], gJson: null },
{ name: '市', value: [48651, 314863], gJson: jiangxishi },
@@ -157,7 +157,8 @@
const pickedObject = viewer.scene.pick(click.position);
if (Cesium.defined(pickedObject) && pickedObject.id) {
const entity = pickedObject.id;
- positionC3 = entity.position._value;
+ positionC3 = entity?.position?._value;
+ if (!positionC3) return;
viewer.scene.postRender.removeEventListener(labelBox);
viewer.scene.postRender.addEventListener(labelBox);
}
--
Gitblit v1.9.3