Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-15 04a859aa95b231c032c71d06518497a973c2f4e8

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

@@ -1,9 +1,10 @@
<template>
<template>
   <basic-container>
      <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
         <el-form-item label="设备名称" prop="deviceId">
            <el-select
               class="ztzf-data-cockpit-search-input"
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               v-model="searchParams.deviceId"
               placeholder="请选择"
               clearable
@@ -13,9 +14,11 @@
               <el-option v-for="item in deviceList" :key="item.id" :label="item.deviceName" :value="item.id" />
            </el-select>
         </el-form-item>

         <el-form-item label="设备类型" prop="deviceType">
            <el-select
               class="ztzf-data-cockpit-search-input"
               class="ztzf-data-cockpit-select"
               popper-class="ztzf-data-cockpit-select-popper"
               v-model="searchParams.deviceType"
               placeholder="请选择"
               clearable
@@ -30,6 +33,7 @@
               />
            </el-select>
         </el-form-item>

         <el-form-item label="设备编号" prop="deviceSn">
            <el-input
               class="ztzf-data-cockpit-search-input"
@@ -48,7 +52,7 @@

      <div class="ztzf-table-toolbar">
         <el-button :icon="Plus" color="#284FE3" type="primary" @click="openForm('add')">新增</el-button>
         <el-button type="danger" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
         <el-button :icon="Delete" color="#1A2652" :disabled="!selectedIds.length" @click="handleDelete()">删除</el-button>
      </div>

      <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
@@ -59,17 +63,17 @@
               <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>-->
                     <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 width="200" label="调度位置">
               <el-table-column show-overflow-tooltip label="调度位置">
                  <template v-slot="{ row }">{{ row.longitude }}, {{ row.latitude }}</template>
               </el-table-column>
               <el-table-column prop="dispatchUser" show-overflow-tooltip width="100" label="调度人员" />
               <el-table-column show-overflow-tooltip width="180" label="调度日期">
               <el-table-column show-overflow-tooltip label="调度日期">
                  <template v-slot="{ row }">
                     {{ formatDispatchDate(row) }}
                  </template>
@@ -110,7 +114,7 @@
</template>

<script setup>
import { Search, RefreshRight, Plus } from '@element-plus/icons-vue'
import { Search, RefreshRight, Plus, Delete } from '@element-plus/icons-vue'
import { nextTick, onMounted, ref, provide } from 'vue'
import { ElMessage, ElMessageBox } from 'element-plus'
import { fwTaskSchedulePageApi, fwTaskScheduleRemoveApi } from './taskScheduleApi'
@@ -130,7 +134,7 @@
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
const loading = ref(false) // 列表加载中
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const selectedIds = ref([]) // 勾选的ID列表
const queryParamsRef = ref(null) // 查询表单实例