Merge remote-tracking branch 'origin/master'

罗广辉

2026-01-15 04a859aa95b231c032c71d06518497a973c2f4e8

 applications/drone-command/src/views/recordManage/alarmRecords/index.vue

@@ -56,7 +56,7 @@
      </el-form>

      <div class="ztzf-table-toolbar">
         <el-button :icon="Download" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
         <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
      </div>

      <div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
@@ -64,18 +64,18 @@
            <el-table class="ztzf-data-cockpit-table" :data="list">
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="droneName" show-overflow-tooltip width="140" label="无人机名称" />
               <el-table-column prop="droneSerialNo" show-overflow-tooltip width="160" label="无人机序列号" />
               <el-table-column prop="alarmTime" show-overflow-tooltip width="160" label="告警时间" />
               <el-table-column prop="areaName" show-overflow-tooltip width="120" label="区域" />
               <el-table-column prop="triggerReason" show-overflow-tooltip width="160" label="触发原因" />
               <el-table-column prop="deviceName" show-overflow-tooltip width="160" label="侦测反制设备" />
               <el-table-column prop="droneType" show-overflow-tooltip width="120" label="设备类型">
               <el-table-column prop="droneSerialNo" show-overflow-tooltip label="无人机序列号" />
               <el-table-column prop="alarmTime" show-overflow-tooltip label="告警时间" />
               <el-table-column prop="areaName" show-overflow-tooltip label="区域" />
               <el-table-column prop="triggerReason" show-overflow-tooltip label="触发原因" />
               <el-table-column prop="deviceName" show-overflow-tooltip label="侦测反制设备" />
               <el-table-column prop="droneType" show-overflow-tooltip label="设备类型">
                  <template v-slot="{ row }">
                     {{ getDeviceTypeName(row.droneType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="deviceSn" show-overflow-tooltip width="140" label="设备编码" />
               <el-table-column show-overflow-tooltip width="120" label="设备状态">
               <el-table-column prop="deviceSn" show-overflow-tooltip label="设备编码" />
               <el-table-column show-overflow-tooltip label="设备状态">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.deviceStatus, dictObj.deviceStatus) }}
                  </template>
@@ -116,7 +116,7 @@
})
const searchParams = ref(initSearchParams()) // 查询参数
const total = ref(0) // 总条数
const loading = ref(false) // 列表加载中
const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const queryParamsRef = ref(null) // 查询表单实例
const dialogRef = ref(null) // 弹框实例