Merge remote-tracking branch 'origin/master'

罗广辉

2026-02-02 cf982e09916174dc90d5f6d51c8d9e8e1c2abebe

 applications/drone-command/src/views/areaManage/sceneManage/FormDiaLog.vue

@@ -152,7 +152,10 @@
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'
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 { AREA_TYPE_STYLE_MAP, BUFFER_LEVEL_STYLES, DEFAULT_AREA_STYLE } from '@ztzf/constants'
import { MapTooltip } from '@ztzf/utils'
@@ -315,35 +318,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-manage-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 parseGeomJson(geomJson) {
   if (!geomJson) return null
   if (typeof geomJson === 'object') return geomJson
@@ -493,7 +467,10 @@
                     material: style.outline,
                  },
               })
               addBufferRadiusLabel(dataSource, centerCartesian, radius)
               addBufferRadiusLabelEntity(dataSource, centerCartesian, radius, {
                  name: 'scene-manage-area-display',
                  customData: { drawType: 'buffer', label: 'radius' },
               })
            })
            return
         }