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 | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/dataCenter/components/searchData.vue b/src/views/dataCenter/components/searchData.vue
index 4972c2e..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="结束日期"
@@ -88,7 +89,7 @@
</div>
<div class="search-first">
<el-form-item label="文件名称:">
- <el-input v-model="searchForm.nickName" placeholder="请输入" clearable />
+ <el-input v-model="searchForm.name" placeholder="请输入" clearable />
</el-form-item>
<div class="search-btn">
<el-button type="primary" icon="el-icon-search" @click="handleSearch">搜索</el-button>
@@ -163,7 +164,7 @@
const timeFormat = 'YYYY-MM-DD HH:mm:ss';
const searchForm = reactive({
jobName: '', //任务名称
- nickName: '', //文件名称
+ name: '', //文件名称
areaCode: userAreaCode.value, // 区域code
endTime: endTime.format(timeFormat), // 结束时间
startTime: startTime.format(timeFormat), // 开始时间
@@ -200,7 +201,7 @@
searchForm.startTime = start.format(timeFormat);
searchForm.endTime = end.format(timeFormat);
}
- handleSearch();
+ //handleSearch();
};
// 部门下得机巢
const requestDockInfo = () => {
@@ -249,18 +250,23 @@
? dayjs(dateRange?.value[1]).endOf('day').format(timeFormat)
: null,
};
- console.log('searchForm', params);
// 调用父组件方法
emit('search', params);
};
// 清空
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