Merge remote-tracking branch 'origin/master'

张含笑

2026-01-15 e65bc708df863ee0c59b39039f7db93c3ed4bd5b

 applications/drone-command/src/views/basicManage/deviceScrap/index.vue

@@ -31,21 +31,21 @@
            <el-table class="ztzf-data-cockpit-table" :data="list" @selection-change="handleSelectionChange">
               <el-table-column type="selection" width="46" />
               <el-table-column type="index" show-overflow-tooltip width="64" label="序号" />
               <el-table-column prop="deviceName" show-overflow-tooltip width="130" label="设备名称" />
               <el-table-column prop="deviceType" show-overflow-tooltip width="130" label="设备类型">
               <el-table-column prop="deviceName" show-overflow-tooltip label="设备名称" />
               <el-table-column prop="deviceType" show-overflow-tooltip label="设备类型">
                  <template v-slot="{ row }">
                     {{ getDictLabel(row.deviceType, dictObj.deviceType) }}
                  </template>
               </el-table-column>
               <el-table-column prop="deviceModel" show-overflow-tooltip width="98" label="型号" />
               <el-table-column prop="manufacturer" show-overflow-tooltip width="130" label="生产厂商" />
               <el-table-column prop="createTime" show-overflow-tooltip width="96" label="入库时间" />
               <el-table-column prop="source" show-overflow-tooltip width="112" label="来源" />
               <el-table-column prop="charger" show-overflow-tooltip width="100" label="负责人" />
               <el-table-column prop="scrapTime" show-overflow-tooltip width="96" label="报废时间" />
               <el-table-column prop="scrapReason" show-overflow-tooltip width="136" label="报废原因" />
               <el-table-column prop="disposeWay" show-overflow-tooltip width="116" label="处置方式" />
               <el-table-column prop="maintainReminder" show-overflow-tooltip width="116" label="维护提醒" />
               <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
               <el-table-column prop="manufacturer" show-overflow-tooltip label="生产厂商" />
               <el-table-column prop="createTime" show-overflow-tooltip label="入库时间" />
               <el-table-column prop="source" show-overflow-tooltip label="来源" />
               <el-table-column prop="charger" show-overflow-tooltip label="负责人" />
               <el-table-column prop="scrapTime" show-overflow-tooltip label="报废时间" />
               <el-table-column prop="scrapReason" show-overflow-tooltip label="报废原因" />
               <el-table-column prop="disposeWay" show-overflow-tooltip label="处置方式" />
               <el-table-column prop="maintainReminder" show-overflow-tooltip label="维护提醒" />
               <el-table-column label="操作" class-name="operation-btns">
                  <template v-slot="{ row }">
                     <el-link @click="handleView(row)">查看</el-link>
@@ -84,7 +84,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) // 查询表单实例