From 42e7814f816bedba1a0ef8e8f8fb3df1f495c9db Mon Sep 17 00:00:00 2001
From: 罗广辉 <guanghui.luo@foxmail.com>
Date: Fri, 05 Dec 2025 09:27:58 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into feature/v9.0/9.0.1
---
src/views/job/components/SearchBox.vue | 40 +++++++++++++++++++++++++++++++---------
1 files changed, 31 insertions(+), 9 deletions(-)
diff --git a/src/views/job/components/SearchBox.vue b/src/views/job/components/SearchBox.vue
index 6f6e0af..83bba63 100644
--- a/src/views/job/components/SearchBox.vue
+++ b/src/views/job/components/SearchBox.vue
@@ -320,27 +320,47 @@
let timeListEnum = ['TODAY', 'CURRENT_WEEK', 'CURRENT_MONTH', 'CURRENT_YEAR'];
let checked = ref('month');
+// 根据 周期 获取时间段
+function getDateRange(date_enum) {
+ // 设置对应的日期范围
+ switch (date_enum) {
+ case 'today':
+ dateRange.value = [dayjs().startOf('day').format(timeFormat), dayjs().endOf('day').format(timeFormat)]
+ break
+ case 'week':
+ dateRange.value = [dayjs().startOf('week').format(timeFormat), dayjs().format(timeFormat)]
+ break
+ case 'month':
+ dateRange.value = [dayjs().startOf('month').format(timeFormat), dayjs().format(timeFormat)]
+ break
+ case 'year':
+ dateRange.value = [dayjs().startOf('year').format(timeFormat), dayjs().format(timeFormat)]
+ break
+ }
+}
+
let timeClick = (item, index) => {
- if (checked.value === item){
+ if (checked.value === item) {
checked.value = null
searchForm.date_enum = undefined
- }else{
+ dateRange.value = []
+ } else {
checked.value = item
searchForm.date_enum = timeListEnum[index]
+ getDateRange(item)
}
- dateRange.value = []
handleSearch()
-};
+}
// 搜索
const handleSearch = () => {
if (!dateRange.value) {
dateRange.value = [];
}
- if (dateRange.value && dateRange.value.length) {
- // 有值时 清除 日 本周 本月 本年状态
- checked.value = '';
- searchForm.date_enum = '';
- }
+ // if (dateRange.value && dateRange.value.length) {
+ // // 有值时 清除 日 本周 本月 本年状态
+ // checked.value = '';
+ // searchForm.date_enum = '';
+ // }
// 提交至store
let params = {
...searchForm,
@@ -446,6 +466,8 @@
dateRange.value = dateArray;
const find = store.state.tags.bsTagList.find(i => i.path === '/job/jobstatistics')
find && (find.query = {})
+ } else {
+ getDateRange('month')
}
// 查询一次
handleSearch()
--
Gitblit v1.9.3