Merge remote-tracking branch 'origin/master'

张含笑

2026-01-16 7d9e8c8f3287a900df09161def9ca16e6a2dc2a7

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

@@ -15,18 +15,18 @@
            </el-select>
         </el-form-item>

         <el-form-item label="设备类型" prop="deviceType">
         <el-form-item label="设备状态" prop="deviceStatus">
            <el-select
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               v-model="searchParams.deviceType"
               v-model="searchParams.deviceStatus"
               placeholder="请选择"
               clearable
               @clear="handleSearch"
               @change="handleSearch"
            >
               <el-option
                  v-for="item in dictObj.deviceType"
                  v-for="item in dictObj.deviceStatus"
                  :key="item.dictKey"
                  :label="item.dictValue"
                  :value="item.dictKey"
@@ -62,11 +62,11 @@
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="deviceName" show-overflow-tooltip width="140" label="设备名称" />
               <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
               <!--               <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
                     <template v-slot="{ row }">
                        {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
                     </template>
                  </el-table-column>-->
               <el-table-column prop="deviceStatus" show-overflow-tooltip width="100" label="设备状态">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
                  </template>
               </el-table-column>
               <el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
               <el-table-column prop="defenseZoneName" show-overflow-tooltip width="120" label="场景" />
               <el-table-column show-overflow-tooltip label="调度位置">
@@ -127,7 +127,7 @@
// 初始化查询参数
const initSearchParams = () => ({
   deviceId: '', // 设备名称
   deviceType: '', // 设备类型
   deviceStatus: '', // 设备状态
   deviceSn: '', // 设备编号
   current: 1, // 当前页
   size: 10, // 每页大小