From 1dceb117970cfc19f4f41d9687267033571604d3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 09 Feb 2026 16:45:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/components/map-container/device-map-container.vue | 11 ++++++-----
applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue | 15 ++++++++++++++-
2 files changed, 20 insertions(+), 6 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 9287f48..cb4e5a2 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"
@@ -303,10 +303,10 @@
if (deviceRingOutlinePrimitives.length) {
deviceRingOutlinePrimitives.forEach(primitive => cockpitPrimitiveLayer.add(primitive))
}
+ if (commandPostBillboardCollection) cockpitPrimitiveLayer.add(commandPostBillboardCollection)
+ if (deviceBillboardCollection) cockpitPrimitiveLayer.add(deviceBillboardCollection)
if (droneTrackPolylineCollection) cockpitPrimitiveLayer.add(droneTrackPolylineCollection)
if (droneTrackBillboardCollection) cockpitPrimitiveLayer.add(droneTrackBillboardCollection)
- if (deviceBillboardCollection) cockpitPrimitiveLayer.add(deviceBillboardCollection)
- if (commandPostBillboardCollection) cockpitPrimitiveLayer.add(commandPostBillboardCollection)
}
const clearDeviceEntities = () => {
@@ -1238,6 +1238,7 @@
width: 40,
height: 56,
verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
+ disableDepthTestDistance: Number.POSITIVE_INFINITY,
})
})
}
@@ -1330,7 +1331,7 @@
setDroneVisibility(!showCluster)
}
-const handleMapReady = ({ viewer: mapViewer, publicCesium: mapPublic }) => {
+const handleMapReady = async ({ viewer: mapViewer, publicCesium: mapPublic }) => {
if (mapReadyHandled) return
mapReadyHandled = true
viewer = mapViewer
@@ -1340,10 +1341,10 @@
const height = viewer?.camera?.positionCartographic?.height
const stage = getStageByHeight(height)
updateStageDisplay(stage)
+ await loadCommandPosts()
renderDeviceEntities(props.allDevices)
loadPartitions()
loadAggregation()
- loadCommandPosts()
renderSimulatedDroneTrack(props.alarmDrones)
initDeviceClickHandler()
}
diff --git a/applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue b/applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue
index 3b0fff4..6973c54 100644
--- a/applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/SceneDeployment.vue
@@ -59,6 +59,8 @@
</div>
<div class="row">
<span class="label">有效时间</span>
+ </div>
+ <div class="row">
<span class="value">{{ formatTimeRange(item.effectiveDateStart, item.effectiveDateEnd) }}</span>
</div>
</div>
@@ -290,7 +292,6 @@
margin-top: 10px;
display: flex;
flex-direction: column;
- gap: 10px;
font-family: Source Han Sans CN, Source Han Sans CN;
font-weight: 400;
@@ -301,15 +302,27 @@
text-transform: none;
.row {
+ margin-top: 10px;
+
line-height: 22px;
.label {
margin-right: 10px;
color: #D4D5D7;
}
+
+ &:first-child {
+ margin-top: 0;
+ }
+
+ &:last-child {
+ margin-top: 0;
+ }
}
.rows {
+ margin-top: 10px;
+
display: flex;
.col {
--
Gitblit v1.9.3