From 04a859aa95b231c032c71d06518497a973c2f4e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Thu, 15 Jan 2026 17:41:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue | 23 ++++++++++++++---------
1 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
index 23bf370..f6bbaab 100644
--- a/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
+++ b/applications/drone-command/src/views/detectionCountermeasure/detectionRange/index.vue
@@ -1,4 +1,4 @@
-<template>
+<template>
<basic-container>
<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
<el-form-item label="名称" prop="deviceName">
@@ -43,24 +43,24 @@
<div class="ztzf-table-content ztzf-table-content-bg">
<el-table class="ztzf-data-cockpit-table" :data="list">
<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="deviceType" show-overflow-tooltip width="120" 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 show-overflow-tooltip width="160" label="部署位置">
+ <el-table-column show-overflow-tooltip label="部署位置">
<template v-slot="{ row }">
{{ formatDeployLocation(row) }}
</template>
</el-table-column>
- <el-table-column prop="deviceModel" show-overflow-tooltip width="110" label="型号" />
- <el-table-column show-overflow-tooltip width="120" label="覆盖范围">
+ <el-table-column prop="deviceModel" show-overflow-tooltip label="型号" />
+ <el-table-column show-overflow-tooltip label="覆盖范围">
<template v-slot="{ row }">
{{ formatRange(row) }}
</template>
</el-table-column>
- <el-table-column show-overflow-tooltip width="150" label="设备编码">
+ <el-table-column show-overflow-tooltip label="设备编码">
<template v-slot="{ row }">
{{ formatDeviceCode(row) }}
</template>
@@ -107,7 +107,7 @@
size: 10, // 每页大小
})
const searchParams = ref(initSearchParams()) // 查询参数
-const loading = ref(false) // 列表加载中
+const loading = ref(true) // 列表加载中
const list = ref([]) // 列表数据
const total = ref(0) // 总数
const queryParamsRef = ref(null) // 查询表单实例
@@ -160,7 +160,12 @@
// 删除
async function handleDelete(row) {
- await ElMessageBox.confirm('确认删除该条数据吗？', '提示', { type: 'warning' })
+ await ElMessageBox.confirm('确认删除该条数据吗？', '提示', {
+ type: 'warning',
+ customClass: 'ztzf-page-view-message-box',
+ confirmButtonClass: 'ztzf-message-box-confirm',
+ cancelButtonClass: 'ztzf-message-box-cancel',
+ })
await detectionRangeSubmitApi({ id: row.id, effectiveRangeKm: 0 })
ElMessage.success('删除成功')
getList()
--
Gitblit v1.9.3