From da721d6d734532a70020a3cdf0de2eaf36ba3ac3 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Wed, 21 Jan 2026 12:25:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 29 +++++++++++++++--------------
1 files changed, 15 insertions(+), 14 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
index b1eead9..cfbb742 100644
--- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -3,25 +3,26 @@
:close-on-click-modal="false" :destroy-on-close="true">
<el-form ref="queryParamsRef" :model="searchParams" class="command-dialog-history-search">
<el-form-item label="关键字" prop="keyword">
- <el-input class="command-input" v-model="searchParams.keyword" placeholder="名称/序列号"
- clearable @clear="handleSearch" />
+ <el-input class="command-input" v-model="searchParams.keyword" placeholder="名称/序列号" clearable
+ @clear="handleSearch" />
</el-form-item>
<el-form-item prop="dateRange">
- <el-date-picker class="command-date-picker"
- popper-class="command-date-picker-popper" v-model="searchParams.dateRange"
- type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"
- value-format="YYYY/MM/DD" @change="handleSearch" />
+ <el-date-picker class="command-date-picker" popper-class="command-date-picker-popper"
+ v-model="searchParams.dateRange" type="daterange" range-separator="至" start-placeholder="开始日期"
+ end-placeholder="结束日期" value-format="YYYY/MM/DD" @change="handleSearch" />
</el-form-item>
<el-form-item label="区域" prop="area">
<el-tree-select class="command-select" popper-class="command-tree-select-popper"
- v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择" @change="handleSearch" />
+ v-model="searchParams.area" :data="areaTree" :props="areaTreeProps" node-key="value" check-strictly
+ filterable :filter-node-method="filterAreaNode" clearable placeholder="请选择"
+ @change="handleSearch" />
</el-form-item>
<el-form-item label="无人机类型" prop="droneType">
- <el-select class="command-select" popper-class="command-select-popper"
- v-model="searchParams.droneType" placeholder="请选择" clearable @change="handleSearch">
+ <el-select class="command-select" popper-class="command-select-popper" v-model="searchParams.droneType"
+ placeholder="请选择" clearable @change="handleSearch">
<el-option v-for="item in dictObj.droneType" :key="item.dictKey" :label="item.dictValue"
:value="item.dictKey" />
</el-select>
@@ -44,8 +45,8 @@
{{ getDroneTypeText(row.droneType) }}
</template>
</el-table-column>
- <el-table-column prop="areaName" label="区域" min-width="90" />
- <el-table-column prop="deviceName" label="数据来源" min-width="110" />
+ <el-table-column prop="areaName" show-overflow-tooltip label="区域" min-width="90" />
+ <el-table-column prop="deviceName" show-overflow-tooltip label="数据来源" min-width="110" />
<el-table-column label="信号频段" min-width="100">
<template #default="{ row }">
{{ formatFrequency(row.signalFreqMhz) }}
@@ -62,9 +63,9 @@
</div>
<div class="command-table-pagination">
- <el-pagination popper-class="command-select-popper"
- v-model:current-page="searchParams.current" v-model:page-size="searchParams.size"
- layout="total, prev, pager, next, sizes" :total="total" @change="getList" />
+ <el-pagination popper-class="command-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>
</el-dialog>
--
Gitblit v1.9.3