From ce37640c757ccb9fb0ea02d6c538c9a844265557 Mon Sep 17 00:00:00 2001
From: chenyao <1219716595@qq.com>
Date: Sat, 06 Dec 2025 17:27:32 +0800
Subject: [PATCH] Merge branch 'feature/v8.0/8.0.4' into prod
---
src/views/job/components/SearchBox.vue | 8 +++++---
src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue | 2 +-
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/views/job/components/SearchBox.vue b/src/views/job/components/SearchBox.vue
index 83bba63..d6fe8f3 100644
--- a/src/views/job/components/SearchBox.vue
+++ b/src/views/job/components/SearchBox.vue
@@ -318,7 +318,7 @@
let timeList = ['today', 'week', 'month', 'year'];
let timeListStr = ['今日', '本周', '本月', '本年'];
let timeListEnum = ['TODAY', 'CURRENT_WEEK', 'CURRENT_MONTH', 'CURRENT_YEAR'];
-let checked = ref('month');
+let checked = ref('');
// 根据 周期 获取时间段
function getDateRange(date_enum) {
@@ -464,13 +464,15 @@
const dateArray = [date, date];
dateRange.value = dateArray;
+ searchForm.date_enum = ''
const find = store.state.tags.bsTagList.find(i => i.path === '/job/jobstatistics')
find && (find.query = {})
} else {
+ checked.value = 'month'
getDateRange('month')
}
- // 查询一次
- handleSearch()
+ // 查询一次
+ // handleSearch()
});
</script>
<style lang="scss"></style>
diff --git a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
index 2cd9618..d7a5451 100644
--- a/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
+++ b/src/views/job/components/TaskIntermediateContent/TaskIntermediateContent.vue
@@ -273,7 +273,7 @@
})
onBeforeUnmount(() => {
- clearInterval(polling)
+ // clearInterval(polling)
})
onMounted(() => {
--
Gitblit v1.9.3