diff --git a/frontend/src/components/Schedule/ScheduleTaskList.vue b/frontend/src/components/Schedule/ScheduleTaskList.vue
new file mode 100644
index 00000000..854678e4
--- /dev/null
+++ b/frontend/src/components/Schedule/ScheduleTaskList.vue
@@ -0,0 +1,24 @@
+
diff --git a/frontend/src/i18n/zh.js b/frontend/src/i18n/zh.js
index 8b5c7683..25a3df73 100644
--- a/frontend/src/i18n/zh.js
+++ b/frontend/src/i18n/zh.js
@@ -297,6 +297,7 @@ export default {
'Cron': 'Cron',
'Cron Expression': 'Cron 表达式',
'Cron expression is invalid': 'Cron 表达式不正确',
+ 'View Tasks': '查看任务',
// 网站
'Site': '网站',
diff --git a/frontend/src/views/schedule/ScheduleList.vue b/frontend/src/views/schedule/ScheduleList.vue
index 48ee1f97..96ad76c3 100644
--- a/frontend/src/views/schedule/ScheduleList.vue
+++ b/frontend/src/views/schedule/ScheduleList.vue
@@ -161,6 +161,18 @@
{{$t('Submit')}}
+
+
+
+
+
+
+
@@ -245,19 +257,25 @@
-
+
-
+
-
+
+
+
-
-
-
+
+
+
+
+
+
+
@@ -273,10 +291,12 @@ import {
mapState
} from 'vuex'
import ParametersDialog from '../../components/Common/ParametersDialog'
+import ScheduleTaskList from '../../components/Schedule/ScheduleTaskList'
export default {
name: 'ScheduleList',
components: {
+ ScheduleTaskList,
VueCronLinux,
ParametersDialog
},
@@ -305,6 +325,7 @@ export default {
isShowCron: false,
isLoading: false,
isParametersVisible: false,
+ isViewTasksDialogVisible: false,
// tutorial
tourSteps: [
@@ -593,6 +614,11 @@ export default {
onShowCronDialog () {
this.cronDialogVisible = true
this.$st.sendEv('定时任务', '点击编辑Cron')
+ },
+ async onViewTasks (row) {
+ this.isViewTasksDialogVisible = true
+ this.$store.commit('schedule/SET_SCHEDULE_FORM', row)
+ this.$st.sendEv('定时任务', '查看任务列表')
}
},
created () {
@@ -637,6 +663,12 @@ export default {
margin-top: 10px;
}
+ .table .el-button {
+ width: 28px;
+ height: 28px;
+ padding: 0;
+ }
+
.status-tag {
cursor: pointer;
}
diff --git a/frontend/src/views/task/TaskList.vue b/frontend/src/views/task/TaskList.vue
index 663448a9..8f77ad41 100644
--- a/frontend/src/views/task/TaskList.vue
+++ b/frontend/src/views/task/TaskList.vue
@@ -21,7 +21,7 @@
-
+
@@ -241,6 +241,7 @@ export default {
}
}
],
+
tourCallbacks: {
onStop: () => {
this.$utils.tour.finishTour('task-list')
@@ -251,7 +252,9 @@ export default {
onNextStep: (currentStep) => {
this.$utils.tour.nextStep('task-list', currentStep)
}
- }
+ },
+
+ isFilterSpiderDisabled: false
}
},
computed: {