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/areaManage/areaStatistics/index.vue | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/applications/drone-command/src/views/areaManage/areaStatistics/index.vue b/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
index bc667e2..0632e94 100644
--- a/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
+++ b/applications/drone-command/src/views/areaManage/areaStatistics/index.vue
@@ -32,23 +32,23 @@
<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="areaName" show-overflow-tooltip width="150" label="区域名称" />
- <el-table-column prop="areaType" show-overflow-tooltip width="130" label="区域类型">
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域名称" />
+ <el-table-column prop="areaType" show-overflow-tooltip label="区域类型">
<template v-slot="{ row }">
{{ getDictLabel(row.areaType, dictObj.areaType) }}
</template>
</el-table-column>
- <el-table-column prop="sceneName" show-overflow-tooltip width="150" label="关联场景" />
- <el-table-column prop="sceneType" show-overflow-tooltip width="130" label="场景类型">
+ <el-table-column prop="sceneName" show-overflow-tooltip label="关联场景" />
+ <el-table-column prop="sceneType" show-overflow-tooltip label="场景类型">
<template v-slot="{ row }">
{{ getDictLabel(row.sceneType, dictObj.sceneType) }}
</template>
</el-table-column>
- <el-table-column prop="deviceCount" show-overflow-tooltip width="110" label="设备数量" />
- <el-table-column prop="alarmCount" show-overflow-tooltip width="110" label="告警次数" />
- <el-table-column prop="counterCount" show-overflow-tooltip width="120" label="侦测反制次数" />
- <el-table-column prop="counterSuccessCount" show-overflow-tooltip width="130" label="反制成功次数" />
- <el-table-column prop="controlEffect" show-overflow-tooltip width="110" label="管控效果" />
+ <el-table-column prop="deviceCount" show-overflow-tooltip label="设备数量" />
+ <el-table-column prop="alarmCount" show-overflow-tooltip label="告警次数" />
+ <el-table-column prop="counterCount" show-overflow-tooltip label="侦测反制次数" />
+ <el-table-column prop="counterSuccessCount" show-overflow-tooltip label="反制成功次数" />
+ <el-table-column prop="controlEffect" show-overflow-tooltip label="管控效果" />
<el-table-column label="操作" class-name="operation-btns">
<template v-slot="{ row }">
<el-link @click="openForm(row)">查看</el-link>
@@ -87,7 +87,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) // 弹框实例
--
Gitblit v1.9.3