From 9eb8bb59b802ceef1f52d334c8e577f2bf02c90e Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Wed, 21 Jan 2026 15:12:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue b/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
index 01d5958..a0d460a 100644
--- a/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
@@ -8,14 +8,14 @@
<!-- 搜索区（设计稿红框） -->
<div class="search-box">
<!-- 关键字 -->
- <el-input v-model="query.keyword" class="ztzf-data-cockpit-search-input" placeholder="请输入数据名称" clearable
+ <el-input v-model="query.keyword" class="command-input" placeholder="请输入数据名称" clearable
@keyup.enter="onSearch">
</el-input>
<!-- 日期范围 -->
<el-date-picker v-model="query.dateRange"
- class="ztzf-data-cockpit-date-picker"
- popper-class="ztzf-data-cockpit-date-picker-popper"
+ class="command-date-picker"
+ popper-class="command-date-picker-popper"
type="daterange"
range-separator="~"
start-placeholder="创建开始日期" end-placeholder="结束日期" format="YYYY年MM月DD日" value-format="YYYY-MM-DD"
@@ -44,7 +44,7 @@
import EmptyState from './EmptyState.vue'
const historyWarningData = ref([])
-const loading = ref(false)
+const loading = ref(true)
const minLoadingMs = 400
// 查询条件：keyword + dateRange(YYYY-MM-DD数组)
@@ -103,13 +103,14 @@
flex-direction: column;
width: 100%;
height: 100%;
+ overflow: hidden;
.search-box {
display: flex;
flex-direction: column;
gap: 10px;
- ::v-deep(.ztzf-data-cockpit-date-picker) {
+ ::v-deep(.command-date-picker) {
width: 100% !important;
}
}
@@ -117,6 +118,7 @@
.list-content {
height: 0;
flex: 1;
+ overflow-y: auto;
}
}
--
Gitblit v1.9.3