diff --git a/src/components/common/datetime-range.vue b/src/components/common/datetime-range.vue
new file mode 100644
index 0000000..706c2a9
--- /dev/null
+++ b/src/components/common/datetime-range.vue
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts
index 8530c8b..da4fd54 100644
--- a/src/locales/langs/en-us.ts
+++ b/src/locales/langs/en-us.ts
@@ -185,7 +185,10 @@ const local: App.I18n.Schema = {
}
},
updateDt: 'Updated Time',
- createDt: 'Created Time'
+ createDt: 'Created Time',
+ currentMonth: 'Current Month',
+ lastMonth: 'Last Month',
+ lastTwoMonth: 'Last 2 Month'
},
request: {
logout: 'Logout user after request failed',
diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts
index 58e9b78..f3bc9fc 100644
--- a/src/locales/langs/zh-cn.ts
+++ b/src/locales/langs/zh-cn.ts
@@ -185,7 +185,10 @@ const local: App.I18n.Schema = {
}
},
updateDt: '更新时间',
- createDt: '创建时间'
+ createDt: '创建时间',
+ currentMonth: '当月',
+ lastMonth: '最近一月',
+ lastTwoMonth: '最近两月'
},
request: {
logout: '请求失败后登出用户',
diff --git a/src/typings/app.d.ts b/src/typings/app.d.ts
index 045cd82..999a07f 100644
--- a/src/typings/app.d.ts
+++ b/src/typings/app.d.ts
@@ -436,6 +436,9 @@ declare namespace App {
};
updateDt: string;
createDt: string;
+ currentMonth: string;
+ lastMonth: string;
+ lastTwoMonth: string;
};
request: {
logout: string;
diff --git a/src/views/home/modules/task-tab.vue b/src/views/home/modules/task-tab.vue
index 0f8d5cf..60f6759 100644
--- a/src/views/home/modules/task-tab.vue
+++ b/src/views/home/modules/task-tab.vue
@@ -4,6 +4,7 @@ import type { DataTableColumns } from 'naive-ui';
import { $t } from '@/locales';
import { useAppStore } from '@/store/modules/app';
import { fetchAllGroupName, fetchJobLine, fetchRetryLine } from '@/service/api';
+import DatetimeRange from '@/components/common/datetime-range.vue';
import TaskLineChart from './task-line-chart.vue';
import TaskPieChart from './task-pie-chart.vue';
@@ -64,7 +65,7 @@ const onUpdateTab = (value: string) => {
}
};
-const onUpdateDate = (value: [string, string]) => {
+const onUpdateDate = (value: [string, string] | null) => {
if (value) {
tabParams.value.type = 'OTHERS';
}
@@ -203,14 +204,10 @@ getGroupNames();
-
diff --git a/src/views/job/batch/modules/job-batch-search.vue b/src/views/job/batch/modules/job-batch-search.vue
index 557c5d6..57b8856 100644
--- a/src/views/job/batch/modules/job-batch-search.vue
+++ b/src/views/job/batch/modules/job-batch-search.vue
@@ -1,6 +1,7 @@