From 566317f859765cab003351602a35a90e93c557e8 Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Mon, 19 Jan 2026 14:41:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue | 18 +++++++++---------
1 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
index 9df9a8b..dec0071 100644
--- a/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/DeviceHistoryDialog.vue
@@ -1,26 +1,26 @@
<template>
- <el-dialog class="command-data-cockpit-dialog" append-to-body v-model="visibleModel" :title="dialogTitle"
+ <el-dialog class="command-dialog" append-to-body v-model="visibleModel" :title="dialogTitle"
: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-data-cockpit-search-input" v-model="searchParams.keyword" placeholder="名称/序列号"
+ <el-input class="command-search-input" v-model="searchParams.keyword" placeholder="名称/序列号"
clearable @clear="handleSearch" />
</el-form-item>
<el-form-item prop="dateRange">
- <el-date-picker class="command-data-cockpit-date-picker"
- popper-class="command-data-cockpit-tree-select-popper" v-model="searchParams.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-form-item>
<el-form-item label="区域" prop="area">
- <el-tree-select class="command-data-cockpit-select" popper-class="command-data-cockpit-tree-select-popper"
+ <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" />
</el-form-item>
<el-form-item label="无人机类型" prop="droneType">
- <el-select class="command-data-cockpit-select" popper-class="command-data-cockpit-select-popper"
+ <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" />
@@ -35,7 +35,7 @@
<div class="command-table-container" v-loading="loading" element-loading-background="rgba(5, 5, 15, 0.6)">
<div class="command-table-content">
- <el-table class="command-data-cockpit-table" :data="list">
+ <el-table class="command-table" :data="list">
<el-table-column type="index" width="60" label="序号" />
<el-table-column prop="droneName" label="无人机名称" min-width="120" />
<el-table-column prop="droneSerialNo" label="无人机序列号" min-width="140" />
@@ -62,7 +62,7 @@
</div>
<div class="command-table-pagination">
- <el-pagination popper-class="command-data-cockpit-select-popper"
+ <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>
@@ -96,7 +96,7 @@
})
const dialogTitle = computed(() => {
- return `反制设备名称 ${props.device?.name || ''}`.trim()
+ return `${props.device?.name || ''}`.trim()
})
const initSearchParams = () => ({
--
Gitblit v1.9.3