Merge remote-tracking branch 'origin/master'

chenyao

2026-01-17 40c2702c3da24d9d9fda6bd63894c3206779f812

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

@@ -1,9 +1,9 @@
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
         <el-form-item label="名称" prop="deviceName">
      <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
         <el-form-item label="设备名称" prop="deviceName">
            <el-input
               class="ztzf-data-cockpit-search-input"
               class="command-data-cockpit-search-input"
               v-model="searchParams.deviceName"
               placeholder="请输入"
               clearable
@@ -11,10 +11,10 @@
            />
         </el-form-item>

         <el-form-item label="类型" prop="deviceType">
         <el-form-item label="设备类型" prop="deviceType">
            <el-select
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               class="command-data-cockpit-select"
               popper-class="command-data-cockpit-select-popper"
               v-model="searchParams.deviceType"
               placeholder="请选择"
               clearable
@@ -35,13 +35,13 @@
         </el-form-item>
      </el-form>

      <div class="ztzf-table-toolbar">
      <div class="command-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="handleAdd">新增</el-button>
      </div>

      <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
         <div class="ztzf-table-content ztzf-table-content-bg">
            <el-table class="ztzf-data-cockpit-table" :data="list">
      <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
         <div class="command-table-content command-table-content-bg">
            <el-table class="command-data-cockpit-table" :data="list">
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
               <el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
@@ -55,7 +55,7 @@
                  </template>
               </el-table-column>
               <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
               <el-table-column show-overflow-tooltip label="覆盖范围">
               <el-table-column show-overflow-tooltip label="覆盖范围(m)">
                  <template v-slot="{ row }">
                     {{ formatRange(row) }}
                  </template>
@@ -75,9 +75,9 @@
            </el-table>
         </div>

         <div class="ztzf-table-pagination">
         <div class="command-table-pagination">
            <el-pagination
               popper-class="ztzf-data-cockpit-select-popper"
               popper-class="command-data-cockpit-select-popper"
               v-model:current-page="searchParams.current"
               v-model:page-size="searchParams.size"
               layout="total, prev, pager, next, sizes"
@@ -87,7 +87,7 @@
         </div>
      </div>

      <DetectionRangeDialog ref="dialogRef" @success="getList" />
      <DetectionRangeDialog ref="dialogRef" @success="getList" v-model="visible" v-if="visible" />
   </basic-container>
</template>
<script setup>
@@ -115,7 +115,7 @@
const dictObj = ref({
   deviceType: [], // 设备类型
})

const visible = ref(false)
provide('dictObj', dictObj)

// 获取列表
@@ -145,26 +145,35 @@

// 新增
function handleAdd() {
   dialogRef.value?.open({ mode: 'add' })
   visible.value = true
   nextTick(() => {
      dialogRef.value?.open({ mode: 'add' })
   })
}

// 查看
function handleView(row) {
   dialogRef.value?.open({ mode: 'view', row: { ...row } })
   visible.value = true
   nextTick(() => {
      dialogRef.value?.open({ mode: 'view', row: { ...row } })
   })
}

// 编辑
function handleEdit(row) {
   dialogRef.value?.open({ mode: 'edit', row: { ...row } })
   visible.value = true
   nextTick(() => {
      dialogRef.value?.open({ mode: 'edit', row: { ...row } })
   })
}

// 删除
async function handleDelete(row) {
   await ElMessageBox.confirm('确认删除该条数据吗？', '提示', {
      type: 'warning',
      customClass: 'ztzf-page-view-message-box',
      confirmButtonClass: 'ztzf-message-box-confirm',
      cancelButtonClass: 'ztzf-message-box-cancel',
      customClass: 'command-page-view-message-box',
      confirmButtonClass: 'command-message-box-confirm',
      cancelButtonClass: 'command-message-box-cancel',
   })
   await detectionRangeSubmitApi({ id: row.id, effectiveRangeKm: 0 })
   ElMessage.success('删除成功')
@@ -179,20 +188,8 @@
}

function formatDeployLocation(row) {
   if (!row) return '-'
   const location = row.deployLocation ?? row.address ?? row.location ?? row.deployAddress
   if (Array.isArray(location) && location.length) {
      return location.filter(value => value !== null && value !== undefined).join(',')
   }
   if (typeof location === 'string' && location.trim()) {
      return location
   }
   const longitude = row.deployLongitude ?? row.longitude
   const latitude = row.deployLatitude ?? row.latitude
   if (longitude != null || latitude != null) {
      return `${longitude ?? '-'},${latitude ?? '-'}`
   }
   return '-'
   if (!row.longitude || !row.latitude) return ''
   return `${row.longitude}, ${row.latitude}`
}

function formatRange(row) {