From da563dc595339d42e2135f63167906d6fa20e06c Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Fri, 23 Jan 2026 09:34:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue b/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
index a0d460a..9e5efd7 100644
--- a/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
+++ b/applications/drone-command/src/views/dataCockpit/components/HistoryWarning.vue
@@ -9,7 +9,7 @@
<div class="search-box">
<!-- 关键字 -->
<el-input v-model="query.keyword" class="command-input" placeholder="请输入数据名称" clearable
- @keyup.enter="onSearch">
+ @keyup.enter="onSearch" @clear="onSearch">
</el-input>
<!-- 日期范围 -->
@@ -38,6 +38,7 @@
</template>
<script setup>
+ import { dateRangeFormat } from '@ztzf/utils'
import { ref, computed, onMounted } from 'vue'
import HistoryTemplate from './templateComponents/HistoryTemplate.vue'
import { alarmLogApi } from '@/api/dataCockpit'
@@ -62,10 +63,11 @@
}
const fetchHistoryWarning = async () => {
+
const startAt = Date.now()
loading.value = true
try {
- const [startTime, endTime] = query.value.dateRange || []
+ const [startTime, endTime] = dateRangeFormat(query.value.dateRange) || []
const keyword = (query.value.keyword || '').trim()
const params = {
current: 1,
--
Gitblit v1.9.3