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/recordManage/historyTracks/index.vue | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/applications/drone-command/src/views/recordManage/historyTracks/index.vue b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
index e7a13fe..ae58333 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/index.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
@@ -39,7 +39,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)">
@@ -47,11 +47,11 @@
<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="serialNo" 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="triggerType" show-overflow-tooltip width="160" label="触发原因" />
- <el-table-column show-overflow-tooltip width="140" label="停留时长">
+ <el-table-column prop="serialNo" 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="triggerType" show-overflow-tooltip label="触发原因" />
+ <el-table-column show-overflow-tooltip label="停留时长">
<template v-slot="{ row }">
{{ formatStayDuration(row.stayDuration) }}
</template>
@@ -95,7 +95,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 dateRange = ref([])
--
Gitblit v1.9.3