Merge remote-tracking branch 'origin/master'

张含笑

2026-01-19 f925f12d5263c94644bddf6fd2ac3d23b77791cf

 applications/drone-command/src/views/detectionCountermeasure/detectionRange/DetectionRangeDialog.vue

@@ -55,8 +55,8 @@
            <el-form v-else ref="formRef" class="dialog-form" :model="formData" :rules="rules" label-width="110px">
               <el-form-item label="侦测设备" prop="deviceId">
                  <el-select
                     class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceId"
                     placeholder="请选择"
                     clearable
@@ -67,8 +67,8 @@
               </el-form-item>
               <el-form-item label="设备类型" prop="deviceType">
                  <el-select
                     class="command-data-cockpit-select"
                     popper-class="command-data-cockpit-select-popper"
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceType"
                     placeholder="请选择"
                     clearable
@@ -83,7 +83,7 @@
               </el-form-item>
               <el-form-item label="设备位置" prop="deployLocation">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.deployLocation"
                     disabled
                     placeholder="请选择位置"
@@ -95,7 +95,7 @@
               </el-form-item>
               <el-form-item label="设备编号" prop="deviceSn">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.deviceSn"
                     placeholder="请输入"
                     clearable
@@ -103,7 +103,7 @@
               </el-form-item>
               <el-form-item label="设备型号" prop="deviceModel">
                  <el-input
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.deviceModel"
                     placeholder="请输入"
                     clearable
@@ -111,7 +111,7 @@
               </el-form-item>
               <el-form-item label="覆盖范围(m)" prop="effectiveRangeKm">
                  <el-input-number
                     class="command-data-cockpit-search-input"
                     class="command-search-input"
                     v-model="formData.effectiveRangeKm"
                     :min="0"
                     :precision="2"
@@ -148,7 +148,8 @@
} from '@/api/detectionCountermeasure/detectionRange'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import deviceZcImg from '@/assets/images/dataCockpit/device-zc.svg'

import commandPost from '@/assets/images/dataCockpit/legend/command-post.png'

const initForm = () => ({
   deviceId: '', // 侦测设备ID
@@ -276,9 +277,9 @@
      redPointEntity = viewer.entities.add({
         position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
         billboard: {
            image: deviceZcImg, // 这里替换为你的图片路径或变量 deviceZcImg
            width: 30, // 可选：设置图片宽度
            height: 42, // 可选：设置图片高度
            image: commandPost, // 这里替换为你的图片路径或变量 deviceZcImg
            width: 40,
            height: 56,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
         },
         label: {
@@ -293,7 +294,7 @@
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            outlineWidth: 1,
            outlineColor: Cesium.Color.WHITE,
            pixelOffset: new Cesium.Cartesian2(0, -60),
            pixelOffset: new Cesium.Cartesian2(0, -72),
            eyeOffset: new Cesium.Cartesian3(0, 0, -20),
         },
      })
@@ -335,7 +336,7 @@
            material: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
            outline: true,
            outlineColor: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
            heightReference: Cesium.HeightReference.CLAMP_TO_GROUND,
            heightReference: Cesium.HeightReference.NONE,
         },
      })
      return