From 974394f7a0496fa8e37dd326b6f9313e14caa708 Mon Sep 17 00:00:00 2001
From: 张含笑 <zhx18749296735@163.com>
Date: Thu, 26 Jun 2025 17:35:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/all_setting_styles' into all_setting_styles
---
src/views/dataCenter/components/searchData.vue | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index d0fe2f8..b2ec5a7 100644
--- a/src/views/dataCenter/components/searchData.vue
+++ b/src/views/dataCenter/components/searchData.vue
@@ -37,6 +37,7 @@
popper-class="custom-date-picker"
v-model="dateRange"
type="daterange"
+ :clearable="false"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期"
@@ -200,7 +201,7 @@
searchForm.startTime = start.format(timeFormat);
searchForm.endTime = end.format(timeFormat);
}
- handleSearch();
+ //handleSearch();
};
// 部门下得机巢
const requestDockInfo = () => {
@@ -254,12 +255,18 @@
};
// 清空
const handleReset = () => {
- dateRange.value = [];
- Object.keys(searchForm).forEach(key => {
- searchForm[key] = '';
- });
+ dateRange.value = timeRange;
+searchForm.jobName = ''
+searchForm.name = ''
+searchForm.areaCode = userAreaCode.value
+searchForm.endTime = endTime.format(timeFormat)
+searchForm.startTime = startTime.format(timeFormat)
+searchForm.deviceSn = ''
+searchForm.resultType = ''
+searchForm.photoType = ''
handleNodeClick({ id: userAreaCode.value });
handleSearch();
+
};
// 下载
const downloadFun =()=>{
--
Gitblit v1.9.3