diff --git a/kinit-admin/src/views/vadmin/system/task/components/CronExample.vue b/kinit-admin/src/views/vadmin/system/task/components/CronExample.vue new file mode 100644 index 0000000..f55e49a --- /dev/null +++ b/kinit-admin/src/views/vadmin/system/task/components/CronExample.vue @@ -0,0 +1,77 @@ + + + + + diff --git a/kinit-admin/src/views/vadmin/system/task/components/CronExpression.vue b/kinit-admin/src/views/vadmin/system/task/components/CronExpression.vue new file mode 100644 index 0000000..6ac48b9 --- /dev/null +++ b/kinit-admin/src/views/vadmin/system/task/components/CronExpression.vue @@ -0,0 +1,681 @@ + + + + + diff --git a/kinit-admin/src/views/vadmin/system/task/components/RunDatetimeList.vue b/kinit-admin/src/views/vadmin/system/task/components/RunDatetimeList.vue new file mode 100644 index 0000000..f757c04 --- /dev/null +++ b/kinit-admin/src/views/vadmin/system/task/components/RunDatetimeList.vue @@ -0,0 +1,565 @@ + + + + + diff --git a/kinit-admin/src/views/vadmin/system/task/components/task.data.ts b/kinit-admin/src/views/vadmin/system/task/components/task.data.ts index d2e2788..8ced805 100644 --- a/kinit-admin/src/views/vadmin/system/task/components/task.data.ts +++ b/kinit-admin/src/views/vadmin/system/task/components/task.data.ts @@ -174,7 +174,7 @@ export const schema = reactive([ style: { width: '100%' }, - placeholder: 'cron 表达式,六位或七位,分别表示秒、分钟、小时、天、月、星期几、年' + placeholder: 'cron 表达式,六位或七位,分别表示秒、分钟、小时、天、月、星期几、年(可选)' }, ifshow: (values) => values.exec_strategy === 'cron' }, diff --git a/kinit-admin/src/views/vadmin/system/task/index.vue b/kinit-admin/src/views/vadmin/system/task/index.vue index a267036..f04c5f8 100644 --- a/kinit-admin/src/views/vadmin/system/task/index.vue +++ b/kinit-admin/src/views/vadmin/system/task/index.vue @@ -30,6 +30,7 @@ import { Dialog } from '@/components/Dialog' import { useCache } from '@/hooks/web/useCache' import { useRouter } from 'vue-router' import Write from './components/Write.vue' +import CronExpression from './components/CronExpression.vue' const { wsCache } = useCache() const { t } = useI18n() @@ -67,6 +68,7 @@ watch( } ) +const cronDialogVisible = ref(false) const dialogVisible = ref(false) const dialogTitle = ref('') const loading = ref(false) @@ -98,7 +100,6 @@ getOptions() // 跳转到调度日志页面 const toRecord = (row: any) => { if (row) { - console.log(row) push(`/system/record/task?job_id=${row._id}`) } else { push(`/system/record/task`) @@ -205,7 +206,7 @@ const save = async () => { // 生成 cron 表达式 const generateCronExpression = () => { - ElMessage.info('下一个版本更新') + cronDialogVisible.value = true } getList() @@ -225,7 +226,7 @@ getList() 添加定时任务 调度日志 - 生成 Cron 表达式 + 快速生成 Cron 表达式 {{ t('dialogDemo.close') }} + + + + diff --git a/kinit-task/main.py b/kinit-task/main.py index 1d2c734..41ad4a1 100644 --- a/kinit-task/main.py +++ b/kinit-task/main.py @@ -113,6 +113,8 @@ class ScheduledTask: logger.info(content) print(content) getattr(self, operation)(**task) + else: + print("意外", message) def start_mongo(self) -> None: """