Merge remote-tracking branch 'origin/master'

chenyao

2026-01-30 fb39a7bb69cc55d2e1ce61d47e0677aa40540f95

 applications/drone-command/src/views/areaManage/partition/index.vue

@@ -5,10 +5,9 @@
            <el-input class="command-input" v-model="searchParams.areaName" placeholder="请输入"
               clearable @clear="handleSearch" />
         </el-form-item>

         <el-form-item label="区域类型" prop="areaType">
         <el-form-item label="区域类型" prop="areaTypeKeys">
            <el-select class="command-select" popper-class="command-select-popper"
               v-model="searchParams.areaType" placeholder="请选择" clearable @change="handleSearch">
               v-model="searchParams.areaTypeKeys" placeholder="请选择" clearable @change="handleSearch">
               <el-option v-for="item in dictObj.areaType" :key="item.dictKey" :label="item.dictValue"
                  :value="item.dictKey" />
            </el-select>
@@ -31,30 +30,24 @@
               <el-table-column type="selection" width="46" />
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="areaName" show-overflow-tooltip width="150" label="区域名称" />
               <el-table-column show-overflow-tooltip width="160" label="区域位置">
               <el-table-column prop="areaTypeKeys" show-overflow-tooltip width="196" label="区域类型">
                  <template v-slot="{ row }">
                     {{ formatLocation(row) }}
                     {{ getDictLabel(row.areaTypeKeys, dictObj.areaType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="areaSize" show-overflow-tooltip width="130" label="区域面积(k㎡)" />
               <el-table-column prop="areaType" show-overflow-tooltip width="120" label="区域类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.areaType, dictObj.areaType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="triggerCondition" show-overflow-tooltip width="130" label="触发条件">
               <el-table-column prop="triggerCondition" show-overflow-tooltip label="触发条件">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.triggerCondition, dictObj.triggeringCondition) }}
                  </template>
               </el-table-column>
               <el-table-column prop="responseMechanism" show-overflow-tooltip width="130" label="响应机制" />
               <el-table-column prop="controlLevel" show-overflow-tooltip width="120" label="管控级别">
               <el-table-column prop="responseMechanism" show-overflow-tooltip label="响应机制" />
               <el-table-column prop="controlLevel" show-overflow-tooltip label="管控级别">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.controlLevel, dictObj.controlLevel) }}
                  </template>
               </el-table-column>
               <el-table-column prop="policeStationName" show-overflow-tooltip label="关联派出所" />
               <el-table-column show-overflow-tooltip label="可飞行时间段">
               <el-table-column show-overflow-tooltip width="300" label="可飞行时间段">
                  <template v-slot="{ row }">
                     {{ formatFlyDate(row) }}
                  </template>
@@ -93,7 +86,7 @@

const initSearchParams = () => ({
   areaName: '', // 区域名称
   areaType: '', // 区域类型
   areaTypeKeys: '', // 区域类型
   current: 1, // 当前页
   size: 10, // 每页大小
})
@@ -157,11 +150,6 @@
// 勾选值设置
function handleSelectionChange (rows) {
   selectedIds.value = rows.map(item => item.id)
}

function formatLocation (row) {
   if (row?.longitude == null || row?.latitude == null) return ''
   return `${row.longitude}, ${row.latitude}`
}

function formatFlyDate (row) {