From b07d485502803e3c573ee9c3e3c86cab9bf8966d Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Wed, 14 Jan 2026 18:01:17 +0800
Subject: [PATCH] Merge branch 'master' of http://139.196.74.78:10010/r/jagzwxm/ja_web

---
 applications/drone-command/src/views/recordManage/historyTracks/index.vue |  137 ++++++++++++++++++++++++---------------------
 1 files changed, 73 insertions(+), 64 deletions(-)

diff --git a/applications/drone-command/src/views/recordManage/historyTracks/index.vue b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
index b30cf4b..e7a13fe 100644
--- a/applications/drone-command/src/views/recordManage/historyTracks/index.vue
+++ b/applications/drone-command/src/views/recordManage/historyTracks/index.vue
@@ -1,70 +1,79 @@
-<template>
+<template>
 	<basic-container>
-		<el-form ref="queryParamsRef" :model="searchParams">
-			<el-row :gutter="16">
-				<el-col :span="4">
-					<el-form-item label="无人机名称" prop="droneName">
-						<el-input v-model="searchParams.droneName" placeholder="请输入" clearable @clear="getList" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="区域" prop="areaName">
-						<el-input v-model="searchParams.areaName" placeholder="请输入" clearable @clear="getList" />
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item label="告警时间">
-						<el-date-picker
-							popper-class="ztzf-date-picker-popper"
-							class="ztzf-date-picker"
-							v-model="dateRange"
-							type="daterange"
-							range-separator="至"
-							start-placeholder="开始日期"
-							end-placeholder="结束日期"
-							value-format="YYYY-MM-DD HH:mm:ss"
-							@change="handleSearch"
-						/>
-					</el-form-item>
-				</el-col>
-				<el-col :span="4">
-					<el-form-item>
-						<el-button @click="resetForm">重置</el-button>
-						<el-button type="primary" @click="handleSearch">查询</el-button>
-					</el-form-item>
-				</el-col>
-			</el-row>
+		<el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+			<el-form-item label="无人机名称" prop="droneName">
+				<el-input
+					class="ztzf-data-cockpit-search-input"
+					v-model="searchParams.droneName"
+					placeholder="请输入"
+					clearable
+					@clear="handleSearch"
+				/>
+			</el-form-item>
+			<el-form-item label="区域" prop="areaName">
+				<el-input
+					class="ztzf-data-cockpit-search-input"
+					v-model="searchParams.areaName"
+					placeholder="请输入"
+					clearable
+					@clear="handleSearch"
+				/>
+			</el-form-item>
+			<el-form-item label="告警时间">
+				<el-date-picker
+					popper-class="ztzf-data-cockpit-date-picker-popper"
+					class="ztzf-data-cockpit-date-picker"
+					v-model="dateRange"
+					type="daterange"
+					range-separator="至"
+					start-placeholder="开始日期"
+					end-placeholder="结束日期"
+					value-format="YYYY-MM-DD HH:mm:ss"
+					@change="handleSearch"
+				/>
+			</el-form-item>
+			<el-form-item class="history-search-actions">
+				<el-button :icon="RefreshRight" @click="resetForm"></el-button>
+				<el-button class="search-btn" :icon="Search" @click="handleSearch"></el-button>
+			</el-form-item>
 		</el-form>
-		<div>
-			<el-button type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
+
+		<div class="ztzf-table-toolbar">
+			<el-button :icon="Download" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
 		</div>
 
-		<el-table v-loading="loading" :data="list">
-			<el-table-column type="index" width="60" label="序号" />
-			<el-table-column prop="droneName" label="无人机名称" />
-			<el-table-column prop="serialNo" label="序列号" />
-			<el-table-column prop="alarmTime" label="告警时间" />
-			<el-table-column prop="areaName" label="区域" />
-			<el-table-column prop="triggerType" label="触发原因" />
-			<el-table-column label="停留时长">
-				<template v-slot="{ row }">
-					{{ formatStayDuration(row.stayDuration) }}
-				</template>
-			</el-table-column>
-			<el-table-column label="操作">
-				<template v-slot="{ row }">
-					<el-link @click="handleView(row)" type="primary">历史轨迹</el-link>
-				</template>
-			</el-table-column>
-		</el-table>
+		<div class="ztzf-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+			<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="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="停留时长">
+						<template v-slot="{ row }">
+							{{ formatStayDuration(row.stayDuration) }}
+						</template>
+					</el-table-column>
+					<el-table-column label="操作" class-name="operation-btns">
+						<template v-slot="{ row }">
+							<el-link @click="handleView(row)">历史轨迹</el-link>
+						</template>
+					</el-table-column>
+				</el-table>
+			</div>
 
-		<div>
-			<el-pagination
-				v-model:current-page="searchParams.current"
-				v-model:page-size="searchParams.size"
-				:total="total"
-				@change="getList"
-			/>
+			<div class="ztzf-table-pagination">
+				<el-pagination
+					popper-class="ztzf-data-cockpit-select-popper"
+					v-model:current-page="searchParams.current"
+					v-model:page-size="searchParams.size"
+					layout="total, prev, pager, next, sizes"
+					:total="total"
+					@change="getList"
+				/>
+			</div>
 		</div>
 
 		<TrajectoryDiaLog ref="dialogRef" />
@@ -72,10 +81,10 @@
 </template>
 
 <script setup>
+import { Search, RefreshRight, Download } from '@element-plus/icons-vue'
 import { onMounted, ref } from 'vue'
 import { exportFwDroneFlightRecordApi, fwDroneFlightRecordPageApi } from './fwDroneFlightRecord'
 import { blobDownload, dateRangeFormat } from '@ztzf/utils'
-import FormDiaLog from '@/views/basicManage/deviceStock/FormDiaLog.vue'
 import TrajectoryDiaLog from '@/views/recordManage/historyTracks/TrajectoryDiaLog.vue'
 
 const initSearchParams = () => ({
@@ -123,7 +132,7 @@
 
 function formatStayDuration(value) {
 	if (!value) return '-'
-	if (typeof value === 'string') return value
+	if (typeof value == 'string') return value
 	const hour = String(value.hour ?? 0).padStart(2, '0')
 	const minute = String(value.minute ?? 0).padStart(2, '0')
 	const second = String(value.second ?? 0).padStart(2, '0')

--
Gitblit v1.9.3