From 40c2702c3da24d9d9fda6bd63894c3206779f812 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 17 Jan 2026 16:46:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/recordManage/alarmRecords/index.vue | 41 +++++++++++++++++++++++++----------------
1 files changed, 25 insertions(+), 16 deletions(-)
diff --git a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
index 5939a81..ade7f77 100644
--- a/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
+++ b/applications/drone-command/src/views/recordManage/alarmRecords/index.vue
@@ -1,9 +1,9 @@
<template>
<basic-container>
- <el-form ref="queryParamsRef" :model="searchParams" class="ztzf-page-history-search">
+ <el-form ref="queryParamsRef" :model="searchParams" class="command-page-history-search">
<el-form-item label="无人机名称" prop="droneName">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="searchParams.droneName"
placeholder="请输入"
clearable
@@ -12,7 +12,7 @@
</el-form-item>
<el-form-item label="区域" prop="areaName">
<el-input
- class="ztzf-data-cockpit-search-input"
+ class="command-data-cockpit-search-input"
v-model="searchParams.areaName"
placeholder="请输入"
clearable
@@ -21,8 +21,8 @@
</el-form-item>
<el-form-item label="设备类型" prop="droneType">
<el-select
- class="ztzf-data-cockpit-select"
- popper-class="ztzf-data-cockpit-select-popper"
+ class="command-data-cockpit-select"
+ popper-class="command-data-cockpit-select-popper"
v-model="searchParams.droneType"
placeholder="请选择"
clearable
@@ -36,10 +36,10 @@
/>
</el-select>
</el-form-item>
- <el-form-item label="时间">
+ <el-form-item label="告警时间">
<el-date-picker
- popper-class="ztzf-data-cockpit-date-picker-popper"
- class="ztzf-data-cockpit-date-picker"
+ popper-class="command-data-cockpit-date-picker-popper"
+ class="command-data-cockpit-date-picker"
v-model="dateRange"
type="daterange"
range-separator="至"
@@ -55,13 +55,16 @@
</el-form-item>
</el-form>
- <div class="ztzf-table-toolbar">
- <el-button :icon="Download" color="#1A2652" type="primary" @click="exportFile" :loading="exportLoading">导出</el-button>
+ <div class="command-table-toolbar">
+ <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)">
- <div class="ztzf-table-content ztzf-table-content-bg">
- <el-table class="ztzf-data-cockpit-table" :data="list">
+ <div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
+ <div class="command-table-content command-table-content-bg">
+ <el-table class="command-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="droneName" show-overflow-tooltip width="140" label="无人机名称" />
<el-table-column prop="droneSerialNo" show-overflow-tooltip label="无人机序列号" />
@@ -83,9 +86,9 @@
</el-table>
</div>
- <div class="ztzf-table-pagination">
+ <div class="command-table-pagination">
<el-pagination
- popper-class="ztzf-data-cockpit-select-popper"
+ popper-class="command-data-cockpit-select-popper"
v-model:current-page="searchParams.current"
v-model:page-size="searchParams.size"
layout="total, prev, pager, next, sizes"
@@ -148,6 +151,12 @@
}
}
+const selectedIds = ref([]) // 勾选的ID列表
+// 勾选值设置
+function handleSelectionChange(rows) {
+ selectedIds.value = rows.map(item => item.id)
+}
+
// 查询
function handleSearch() {
searchParams.value.current = 1
@@ -164,7 +173,7 @@
function exportFile() {
exportLoading.value = true
- exportFwDroneAlarmRecordApi()
+ exportFwDroneAlarmRecordApi({ ids: selectedIds.value.join(',') })
.then(res => {
blobDownload(res)
})
--
Gitblit v1.9.3