From 05f434c317a8dc54da598cd69a2ee97b8baa8e4f Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Mon, 09 Feb 2026 15:58:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/components/map-container/device-map-container.vue | 48 +++++++++++++++++++++++++++++++++---------------
1 files changed, 33 insertions(+), 15 deletions(-)
diff --git a/applications/drone-command/src/components/map-container/device-map-container.vue b/applications/drone-command/src/components/map-container/device-map-container.vue
index 0e37663..9287f48 100644
--- a/applications/drone-command/src/components/map-container/device-map-container.vue
+++ b/applications/drone-command/src/components/map-container/device-map-container.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
<div class="map-shell">
<CommonCesiumMap ref="mapRef" class="command-cesium map-container" :dom-id="props.containerId" :active="true"
:flat-mode="false" :terrain="true" :layer-mode="4" :contour="false" :boundary="false"
@@ -77,6 +77,7 @@
const DETAIL_HEIGHT = 10000
const POLYGON_HEIGHT_M = 0.2
const DRONE_TRACK_DURATION_S = 30 * 60
+const FIXED_DRONE_TRACK_IDS = ['6000000000602', '6000000000601']
const props = defineProps({
allDevices: {
@@ -465,7 +466,7 @@
},
{
longitude: 114.963974,
- latitude: 27.132677,
+ latitude: 27.132677,
height: 320
},
{
@@ -512,22 +513,22 @@
height: 400
},
{
- longitude: 114.925836,
+ longitude: 114.925836,
latitude: 27.096102,
height: 400
},
{
- longitude: 114.928384,
+ longitude: 114.928384,
latitude: 27.095866,
height: 400
},
{
- longitude: 114.929874,
+ longitude: 114.929874,
latitude: 27.096095,
height: 400
},
{
- longitude: 114.931048,
+ longitude: 114.931048,
latitude: 27.097666,
height: 400
},
@@ -628,11 +629,11 @@
const pos = isEntityPosition
? getBillboardPosition(track.billboard)
: Cesium.Cartesian3.lerp(
- track.positions[seg],
- track.positions[seg + 1],
- ratio,
- new Cesium.Cartesian3()
- )
+ track.positions[seg],
+ track.positions[seg + 1],
+ ratio,
+ new Cesium.Cartesian3()
+ )
if (!pos) return
if (!isEntityPosition) {
track.billboard.position = pos
@@ -718,7 +719,9 @@
droneTrackPolylineCollection.show = detailVisible.value
droneTrackRuntime = []
const baseTrackColor = Cesium.Color.fromCssColorString('red')
- ; (list || []).forEach((item, trackIndex) => {
+ ; (FIXED_DRONE_TRACK_IDS || []).forEach((trackId, trackIndex) => {
+ const item = (list || []).find(entry => String(entry?.id) === String(trackId))
+ if (!item) return
const position = getDevicePosition(item)
if (!position) return
const points = buildSimulatedTrackPoints({ ...position, height: item.flightHeightM, trackIndex })
@@ -742,7 +745,7 @@
width: 3,
material: trackMaterial,
})
- const droneId = `drone-alarm-${item?.alarmRecordId ?? item?.id ?? trackIndex}`
+ const droneId = `drone-alarm-${trackId}`
const startTime = viewer.clock.startTime
const stopTime = viewer.clock.stopTime
const positionProperty = new Cesium.SampledPositionProperty()
@@ -845,6 +848,7 @@
width: 40,
height: 56,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
})
billboard.id = entry.entityId
devicePickMap.set(entry.entityId, { data: entry.data, billboard })
@@ -973,7 +977,7 @@
if (!trimmed) return null
try {
return JSON.parse(trimmed)
- } catch (error) {}
+ } catch (error) { }
return null
}
@@ -1026,7 +1030,7 @@
.filter(radius => Number.isFinite(radius) && radius > 0)
radii.forEach((radius, levelIndex) => {
const positions = buildEllipsePositions(centerCartesian, radius, radius)
- const style = BUFFER_LEVEL_STYLES[levelIndex] || BUFFER_LEVEL_STYLES[BUFFER_LEVEL_STYLES.length - 1]
+ const style = BUFFER_LEVEL_STYLES[levelIndex] || BUFFER_LEVEL_STYLES[BUFFER_LEVEL_STYLES.length - 1]
if (positions.length >= 3) {
shapes.push({
positions,
@@ -1377,6 +1381,20 @@
viewer = null
publicCesium = null
})
+
+const getMap = () => {
+ return mapRef.value?.getMap()
+}
+
+// 暴露给父组件调用
+const flyTo = (options) => {
+ mapRef.value?.flyToPoint(options)
+}
+
+defineExpose({
+ getMap,
+ flyTo
+})
</script>
<style lang="scss" scoped>
--
Gitblit v1.9.3