Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-26 beb95fb5fc166804056abafd70fc01ac27de7621

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

@@ -1,48 +1,84 @@
<template>
   <el-dialog
      v-model="visible"
      :title="dialogTitle"
      class="detection-range-dialog"
      class="command-page-map-view-dialog"
      :show-close="false"
      :close-on-click-modal="false"
      destroy-on-close
      @closed="handleClosed"
   >
      <div class="dialog-body">
         <div class="dialog-map">
            <DeviceMapContainer
               :online-devices="mapDevices"
               :show-layer-control="false"
               container-id="detection-range-map"
      <div class="dialog-container">
         <div class="left-container">
            <CommonCesiumMap
               ref="mapRef"
               class="leftMap command-cesium"
               :active="visible"
               :flat-mode="false"
               :terrain="true"
               :layer-mode="4"
               :boundary="false"
            />
            <div class="map-toolbar">
               <button class="map-btn" type="button" aria-label="编辑范围"></button>
               <button class="map-btn" type="button" aria-label="定位设备"></button>
            </div>
            <div class="map-mini-controls">
               <button class="map-mini-btn" type="button" aria-label="放大">+</button>
               <button class="map-mini-btn" type="button" aria-label="缩小">-</button>
            </div>
         </div>
         <div class="dialog-form">
            <div class="form-title">{{ formTitle }}</div>
            <el-form
               ref="formRef"
               :model="formData"
               :rules="rules"
               label-width="84px"
               :disabled="dialogReadonly"
            >

         <div class="right-container">
            <div class="header">
               <span>{{ formTitle }}</span>
				
               <el-icon class="close-btn" @click.stop="visible = false"><Close /></el-icon>
            </div>

            <div class="content" v-if="dialogReadonly">
               <el-row>
                  <el-col :span="24">
                     <div class="label">侦测设备</div>
                     <div class="val">{{ formData.deviceName || '-' }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备类型</div>
                     <div class="val">{{ getDictLabel(formData.deviceType, dictObj.deviceType) }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备位置</div>
                     <div class="val">{{ formData.deployLocation || '-' }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备编号</div>
                     <div class="val">{{ formData.deviceSn || '-' }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">设备型号</div>
                     <div class="val">{{ formData.deviceModel || '-' }}</div>
                  </el-col>
                  <el-col :span="24">
                     <div class="label">覆盖范围(m)</div>
                     <div class="val">{{ formatRange(formData.effectiveRangeKm) }}</div>
                  </el-col>
               </el-row>
            </div>

            <el-form v-else ref="formRef" class="dialog-form" :model="formData" :rules="rules" label-width="110px">
               <el-form-item label="侦测设备" prop="deviceId">
                  <el-select v-model="formData.deviceId" placeholder="请选择" clearable @change="handleDeviceChange">
                     <el-option
                        v-for="item in deviceOptions"
                        :key="item.value"
                        :label="item.label"
                        :value="item.value"
                     />
                  <el-select
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceId"
                     placeholder="请选择"
                     :disabled="dialogMode === 'edit'"
                     clearable
                     @change="handleDeviceChange"
                  >
                     <el-option v-for="item in deviceOptions" :key="item.value" :label="item.label" :value="item.value" />
                  </el-select>
               </el-form-item>
               <el-form-item label="设备类型" prop="deviceType">
                  <el-select v-model="formData.deviceType" placeholder="请选择" clearable>
                  <el-select
                     class="command-select"
                     popper-class="command-select-popper"
                     v-model="formData.deviceType"
                     disabled
                     placeholder="请选择"
                     clearable
                  >
                     <el-option
                        v-for="item in dictObj.deviceType"
                        :key="item.dictKey"
@@ -52,20 +88,38 @@
                  </el-select>
               </el-form-item>
               <el-form-item label="设备位置" prop="deployLocation">
                  <el-input v-model="formData.deployLocation" placeholder="请选择位置">
                  <el-input
                     class="command-input"
                     v-model="formData.deployLocation"
                     disabled
                     placeholder="请选择位置"
                  >
                     <template #suffix>
                        <span class="suffix-action">地图选点</span>
                     </template>
                  </el-input>
               </el-form-item>
               <el-form-item label="设备编号" prop="deviceCode">
                  <el-input v-model="formData.deviceCode" placeholder="请输入" clearable />
               <el-form-item label="设备编号" prop="deviceSn">
                  <el-input
                     class="command-input"
                     v-model="formData.deviceSn"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
               <el-form-item label="设备型号" prop="deviceModel">
                  <el-input v-model="formData.deviceModel" placeholder="请输入" clearable />
                  <el-input
                     class="command-input"
                     v-model="formData.deviceModel"
                     disabled
                     placeholder="请输入"
                     clearable
                  />
               </el-form-item>
               <el-form-item label="覆盖范围" prop="effectiveRangeKm">
               <el-form-item label="覆盖范围(m)" prop="effectiveRangeKm">
                  <el-input-number
                     class="command-input"
                     v-model="formData.effectiveRangeKm"
                     :min="0"
                     :precision="2"
@@ -74,38 +128,49 @@
                  />
               </el-form-item>
            </el-form>
            <div class="footer">
               <el-button v-if="dialogMode != 'view'" color="#2B2B4C" @click="handleCancel">{{ dialogReadonly ? '关闭' : '取消' }}</el-button>
               <el-button
                  color="#284FE3"
                  v-if="!dialogReadonly"
                  type="primary"
                  :loading="submitting"
                  :disabled="submitting"
                  @click="handleSubmit"
               >
                  保存
               </el-button>
            </div>
         </div>
      </div>
      <template v-if="!dialogReadonly" #footer>
         <el-button @click="handleCancel">取消</el-button>
         <el-button
            type="primary"
            :loading="submitting"
            :disabled="submitting"
            @click="handleSubmit"
         >
            保存
         </el-button>
      </template>
   </el-dialog>
</template>

<script setup>
import { computed, inject, ref } from 'vue'
import { getDictLabel } from '@ztzf/utils'

import { Close } from '@element-plus/icons-vue'

import { computed, inject, nextTick, ref, watch } from 'vue'
import { ElMessage } from 'element-plus'
import DeviceMapContainer from '@/components/map-container/device-map-container.vue'
import {
   detectionRangeDetailApi,
   detectionRangePageApi,
   detectionRangeSubmitApi,
} from '@/api/detectionCountermeasure/detectionRange'
import CommonCesiumMap from '@/components/map-container/common-cesium-map.vue'
import * as Cesium from 'cesium'
import { saveOperationLog } from '@ztzf/apis'
import { useRoute } from 'vue-router'

import equipment from '@/assets/images/dataCockpit/legend/equipment.png'

const initForm = () => ({
   deviceId: '', // 侦测设备ID
   deviceName: '', // 侦测设备
   deviceType: '', // 设备类型
   deployLocation: '', // 设备位置
   deviceCode: '', // 设备编号
   deviceSn: '', // 设备编号
   deviceModel: '', // 设备型号
   effectiveRangeKm: null, // 覆盖范围
})
@@ -114,20 +179,16 @@
const emit = defineEmits(['success'])
const formRef = ref(null) // 表单实例
const formData = ref(initForm()) // 表单数据
const visible = ref(false) // 弹框显隐
const visible = defineModel() // 弹框显隐
const dialogMode = ref('add') // 弹框模式
const submitting = ref(false) // 提交中
const mapDevices = ref([])
const deviceOptions = ref([])
const dialogReadonly = computed(() => dialogMode.value === 'view')
const dialogTitle = computed(() => {
   if (dialogMode.value === 'edit') {
      return '编辑'
   } else if (dialogMode.value === 'view') {
      return '查看'
   }
   return '新增'
})
const mapRef = ref(null)
const route = useRoute()
let viewer
let redPointEntity
let rangeCircleEntity
const formTitle = computed(() => {
   if (dialogMode.value === 'edit') {
      return '编辑侦测范围'
@@ -141,6 +202,7 @@
const rules = {
   deviceId: [{ required: true, message: '请选择侦测设备', trigger: ['blur', 'change'] }],
   deviceType: [{ required: true, message: '请选择设备类型', trigger: ['blur', 'change'] }],
   deployLocation: [{ required: true, message: '请选择设备位置', trigger: ['blur', 'change'] }],
   effectiveRangeKm: [{ required: true, message: '请输入覆盖范围', trigger: ['blur', 'change'] }],
}

@@ -152,14 +214,20 @@
   formData.value.deviceName = raw.deviceName ?? formData.value.deviceName
   formData.value.deviceType = raw.deviceType ?? formData.value.deviceType
   formData.value.deviceModel = raw.deviceModel ?? formData.value.deviceModel
   formData.value.deviceCode =
      raw.deviceCode ?? raw.deviceSn ?? raw.deviceNo ?? formData.value.deviceCode
   formData.value.deviceSn = raw.deviceSn ?? raw.deviceSn ?? raw.deviceNo ?? formData.value.deviceCode
   formData.value.deployLocation =
      raw.deployLocation ??
      raw.address ??
      raw.location ??
      raw.deployAddress ??
      formData.value.deployLocation
      raw.deployLocation ?? raw.address ?? raw.location ?? raw.deployAddress ?? formData.value.deployLocation
}

function getDeviceTypeLabel(value) {
   const list = dictObj?.deviceType ?? []
   const target = list.find(item => item.dictKey === value)
   return target?.dictValue ?? value ?? '-'
}

function formatRange(value) {
   if (value == null || value === '') return '-'
   return `${value}`
}

// 关闭弹框
@@ -173,13 +241,25 @@
   if (!isValid) return
   submitting.value = true
   try {
      const {longitude, latitude} = parseDeployLocation(formData.value.deployLocation)

      const payload = {
         ...formData.value,
         id: formData.value.id || formData.value.deviceId || undefined,
         effectiveRangeKmIsNotNull: formData.value.effectiveRangeKm ? 1 : 2,
         effectiveRangeKm: formData.value.effectiveRangeKm,
         longitude,
         latitude
      }
      delete payload.deviceId
      await detectionRangeSubmitApi(payload)

      const actionText = dialogMode.value === 'add' ? '新增' : '修改'
      saveOperationLog({
         requestUri: route.path,
         title: `${route.name || '侦测范围管理'}-${actionText}`,
         type: 1
      })

      ElMessage.success(dialogMode.value === 'add' ? '新增成功' : '更新成功')
      visible.value = false
      emit('success')
@@ -212,12 +292,113 @@
// 关闭后重置
function handleClosed() {
   formData.value = initForm()
   clearRangeCircle()
   viewer = null
   redPointEntity = null
   rangeCircleEntity = null
}

function setMapPoint(longitude, latitude) {
   if (!viewer || longitude == null || latitude == null) return
   if (!redPointEntity) {
      redPointEntity = viewer.entities.add({
         position: Cesium.Cartesian3.fromDegrees(longitude, latitude),
         billboard: {
            image: equipment, // 这里替换为你的图片路径或变量 deviceZcImg
            width: 40,
            height: 56,
            verticalOrigin: Cesium.VerticalOrigin.BOTTOM, // 设置图片底部对齐坐标点
         },
         label: {
            text: `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`,
            font: '16px',
            fillColor: Cesium.Color.WHITE,
            backgroundColor: Cesium.Color.BLACK.withAlpha(0.6),
            backgroundPadding: new Cesium.Cartesian2(5, 5),
            showBackground: true,
            style: Cesium.LabelStyle.FILL_AND_OUTLINE,
            horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
            verticalOrigin: Cesium.VerticalOrigin.CENTER,
            outlineWidth: 1,
            outlineColor: Cesium.Color.WHITE,
            pixelOffset: new Cesium.Cartesian2(0, -72),
            eyeOffset: new Cesium.Cartesian3(0, 0, -20),
         },
      })
   } else {
      redPointEntity.position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
      redPointEntity.label.text = `${longitude.toFixed(6)}, ${latitude.toFixed(6)}`
   }
   updateRangeCircle(longitude, latitude, formData.value.effectiveRangeKm)
}

function parseDeployLocation(value) {
   if (!value) return null
   const [longitude, latitude] = value.split(',').map(item => Number(item.trim()))
   if (Number.isNaN(longitude) || Number.isNaN(latitude)) return null
   return { longitude, latitude }
}

function clearRangeCircle() {
   if (viewer && rangeCircleEntity) {
      viewer.entities.remove(rangeCircleEntity)
   }
}

function updateRangeCircle(longitude, latitude, range) {
   if (!viewer || longitude == null || latitude == null) return
   const rangeMeters = Number(range)
   if (!Number.isFinite(rangeMeters) || rangeMeters <= 0) {
      clearRangeCircle()
      rangeCircleEntity = null
      return
   }
   const position = Cesium.Cartesian3.fromDegrees(longitude, latitude)
   if (!rangeCircleEntity) {
      rangeCircleEntity = viewer.entities.add({
         position,
         ellipse: {
            semiMajorAxis: rangeMeters,
            semiMinorAxis: rangeMeters,
            material: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
            outline: true,
            outlineColor: Cesium.Color.fromCssColorString('#6b9ca8').withAlpha(0.6),
            heightReference: Cesium.HeightReference.NONE,
         },
      })
      return
   }
   rangeCircleEntity.position = position
   rangeCircleEntity.ellipse.semiMajorAxis = rangeMeters
   rangeCircleEntity.ellipse.semiMinorAxis = rangeMeters
}

function initMap() {
   if (viewer) return
   const map = mapRef.value?.getMap()
   if (!map?.viewer) return
   viewer = map.viewer
   if (!dialogReadonly.value) {
      map.publicCesium?.addLeftClickEvent?.(null, handleMapClick)
   }
}

function handleMapClick(click) {
   const pos = click.position
   const cartesian3 = viewer.camera.pickEllipsoid(pos, viewer.scene.globe.ellipsoid)
   if (!cartesian3) return
   const carto = Cesium.Cartographic.fromCartesian(cartesian3)
   const longitude = Number(Cesium.Math.toDegrees(carto.longitude).toFixed(6))
   const latitude = Number(Cesium.Math.toDegrees(carto.latitude).toFixed(6))
   formData.value.deployLocation = `${longitude}, ${latitude}`
   setMapPoint(longitude, latitude)
}

// 打开弹框
async function open({ mode, row } = {}) {
   dialogMode.value = mode || 'add'
   visible.value = true
   await nextTick()
   initMap()
   if (dialogMode.value === 'add') {
      await loadDeviceOptions()
      formData.value = initForm()
@@ -228,6 +409,7 @@
      const detail = await loadDetail(row?.id)
      formData.value = detail ?? row
   }
   formData.value.deployLocation = `${formData.value.longitude}, ${formData.value.latitude}`
   formData.value.deviceId = formData.value.id ?? formData.value.deviceId
   await loadDeviceOptions()
   const currentName = formData.value.deviceName
@@ -235,114 +417,26 @@
   if (currentId && !deviceOptions.value.some(item => item.value === currentId)) {
      deviceOptions.value.unshift({ label: currentName || '-', value: currentId })
   }
   const location = formData.value.deployLocation
   if (location) {
      const parsed = parseDeployLocation(location)
      if (parsed) {
         setMapPoint(parsed.longitude, parsed.latitude)
         viewer.flyTo(redPointEntity, { duration: 0 })
      }
   }
}

defineExpose({ open })

watch(
   () => formData.value.effectiveRangeKm,
   value => {
      const parsed = parseDeployLocation(formData.value.deployLocation)
      if (!parsed) return
      updateRangeCircle(parsed.longitude, parsed.latitude, value)
   }
)
</script>

<style scoped lang="scss">
.detection-range-dialog {
   :deep(.el-dialog) {
      width: 1100px;
      background: #071833;
      border-radius: 8px;
   }

   :deep(.el-dialog__header) {
      border-bottom: 1px solid rgba(70, 110, 180, 0.35);
   }
}

.dialog-body {
   display: flex;
   gap: 16px;
   min-height: 560px;
}

.dialog-map {
   position: relative;
   flex: 1;
   min-height: 520px;
   border-radius: 8px;
   overflow: hidden;
   border: 1px solid rgba(70, 110, 180, 0.35);
   background: #031024;
}

.map-toolbar {
   position: absolute;
   top: 16px;
   right: 16px;
   display: flex;
   flex-direction: column;
   gap: 8px;
   z-index: 2;
}

.map-btn {
   width: 34px;
   height: 34px;
   border-radius: 6px;
   border: 1px solid rgba(80, 120, 180, 0.6);
   background: rgba(7, 18, 44, 0.9);
   cursor: pointer;
}

.map-mini-controls {
   position: absolute;
   left: 16px;
   bottom: 16px;
   display: flex;
   flex-direction: column;
   gap: 6px;
   z-index: 2;
}

.map-mini-btn {
   width: 28px;
   height: 28px;
   border-radius: 4px;
   border: 1px solid rgba(80, 120, 180, 0.6);
   background: rgba(7, 18, 44, 0.9);
   color: #cfe3ff;
   cursor: pointer;
}

.dialog-form {
   width: 300px;
   padding: 12px 12px 0;
   border-radius: 8px;
   background: linear-gradient(180deg, rgba(10, 28, 58, 0.95), rgba(6, 16, 34, 0.95));
   border: 1px solid rgba(70, 110, 180, 0.35);
   color: #d7e7ff;
}

.form-title {
   font-size: 14px;
   font-weight: 600;
   margin-bottom: 12px;
   letter-spacing: 1px;
}

:deep(.el-form-item__label) {
   color: rgba(210, 230, 255, 0.85);
}

:deep(.el-input__wrapper),
:deep(.el-select__wrapper),
:deep(.el-input-number .el-input__wrapper) {
   background: rgba(7, 20, 44, 0.85);
   border: 1px solid rgba(80, 120, 190, 0.45);
   box-shadow: none;
}

:deep(.el-input__inner) {
   color: #d5e6ff;
}

.suffix-action {
   font-size: 12px;
   color: #7fb6ff;
   cursor: pointer;
}
</style>
<style scoped lang="scss"></style>