From cf982e09916174dc90d5f6d51c8d9e8e1c2abebe Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 02 Feb 2026 11:34:39 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue | 39 ++++++++-------------------------------
1 files changed, 8 insertions(+), 31 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
index 77923f6..a7dc186 100644
--- a/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
+++ b/applications/drone-command/src/views/areaManage/sceneConfig/FormDiaLog.vue
@@ -160,7 +160,10 @@
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import { fwAreaDivideDetailApi, fwAreaDivideListApi } from '../partition/partitionApi'
-import { buildEllipsePositions, formatBufferRadius } from '@/utils/cesium/shapeTools'
+import {
+ addBufferRadiusLabelEntity,
+ buildEllipsePositions,
+} from '@/utils/cesium/shapeTools'
import { cartesian3Convert } from '@/utils/cesium/mapUtil'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'
@@ -312,35 +315,6 @@
return AREA_TYPE_STYLE_MAP?.[String(areaType)] || DEFAULT_AREA_STYLE
}
-function getBufferRadiusPoint(centerCartesian, radius) {
- const frame = Cesium.Transforms.eastNorthUpToFixedFrame(centerCartesian)
- const local = new Cesium.Cartesian3(radius, 0, 0)
- return Cesium.Matrix4.multiplyByPoint(frame, local, new Cesium.Cartesian3())
-}
-
-function addBufferRadiusLabel(dataSource, centerCartesian, radius) {
- dataSource.entities.add({
- name: 'scene-area-display',
- customData: { drawType: 'buffer', label: 'radius' },
- position: getBufferRadiusPoint(centerCartesian, radius),
- label: {
- text: formatBufferRadius(radius),
- font: '14px Source Han Sans CN',
- fillColor: Cesium.Color.WHITE,
- outlineColor: Cesium.Color.fromBytes(24, 48, 92, 255),
- outlineWidth: 2,
- style: Cesium.LabelStyle.FILL_AND_OUTLINE,
- showBackground: true,
- backgroundColor: Cesium.Color.fromBytes(8, 12, 22, 180),
- heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
- verticalOrigin: Cesium.VerticalOrigin.BOTTOM,
- horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
- pixelOffset: new Cesium.Cartesian2(0, -12),
- disableDepthTestDistance: Number.POSITIVE_INFINITY,
- },
- })
-}
-
function resolveControlPoints(meta, drawType) {
if (!meta) return []
if (Array.isArray(meta.controlPoints) && meta.controlPoints.length) {
@@ -441,7 +415,10 @@
material: style.outline,
},
})
- addBufferRadiusLabel(dataSource, centerCartesian, radius)
+ addBufferRadiusLabelEntity(dataSource, centerCartesian, radius, {
+ name: 'scene-area-display',
+ customData: { drawType: 'buffer', label: 'radius' },
+ })
})
return
}
--
Gitblit v1.9.3