diff --git a/.gitignore b/.gitignore index b4381b2..8c29a71 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,6 @@ .settings/ .vscode/ vender/ -log/ composer.lock gitpush.sh pkg/ @@ -29,7 +28,6 @@ __pycache__/ *.py[cod] .pytest_cache/ *.egg-info/ -build/ dist/ venv/ .venv/ diff --git a/ui/src/views/monitor/job/log/columns.ts b/ui/src/views/monitor/job/log/columns.ts new file mode 100644 index 0000000..f9c131c --- /dev/null +++ b/ui/src/views/monitor/job/log/columns.ts @@ -0,0 +1,84 @@ +import { h } from 'vue'; +import { ElTag } from 'element-plus'; + +export const columns = [ + { + type: 'selection', + }, + { + label: 'ID', + prop: 'id', + fixed: 'left', + width: 100, + }, + { + label: '任务名称', + prop: 'jobName', + minWidth: 200, + }, + { + label: '任务组名', + prop: 'jobGroup', + minWidth: 100, + }, + { + label: '任务触发器', + prop: 'jobTrigger', + minWidth: 200, + }, + { + label: '任务日志信息', + prop: 'jobMessage', + minWidth: 300, + }, + { + label: '执行表达式', + prop: 'cronExpression', + minWidth: 150, + }, + { + label: '执行状态', + prop: 'status', + minWidth: 100, + render(record) { + let typeText = ''; + switch (record.row.status) { + case 0: + typeText = '未发布'; + break; + case 1: + typeText = '运行中'; + break; + case 2: + typeText = '暂停'; + break; + case 3: + typeText = '删除'; + break; + default: + break; + } + return h('span', typeText || '-'); + }, + }, + { + label: '任务开始时间', + prop: 'startTime', + minWidth: 180, + }, + { + label: '任务结束时间', + prop: 'endTime', + minWidth: 180, + }, + { + label: '任务执行时间', + prop: 'createTime', + minWidth: 180, + }, + { + label: '任务执行耗时', + prop: 'consumeTime', + minWidth: 120, + }, +]; diff --git a/ui/src/views/monitor/job/log/edit.vue b/ui/src/views/monitor/job/log/edit.vue new file mode 100644 index 0000000..24f0372 --- /dev/null +++ b/ui/src/views/monitor/job/log/edit.vue @@ -0,0 +1,122 @@ + + + diff --git a/ui/src/views/monitor/job/log/edit2.vue b/ui/src/views/monitor/job/log/edit2.vue new file mode 100644 index 0000000..70ebf8e --- /dev/null +++ b/ui/src/views/monitor/job/log/edit2.vue @@ -0,0 +1,116 @@ + + diff --git a/ui/src/views/monitor/job/log/index.vue b/ui/src/views/monitor/job/log/index.vue new file mode 100644 index 0000000..725b4fa --- /dev/null +++ b/ui/src/views/monitor/job/log/index.vue @@ -0,0 +1,215 @@ + + + + + diff --git a/ui/src/views/monitor/job/log/querySchemas.ts b/ui/src/views/monitor/job/log/querySchemas.ts new file mode 100644 index 0000000..40e5827 --- /dev/null +++ b/ui/src/views/monitor/job/log/querySchemas.ts @@ -0,0 +1,30 @@ +import { FormSchema } from '@/components/Form/index'; +export const schemas: FormSchema[] = [ + { + field: 'jobName', + component: 'Input', + label: '任务名称', + componentProps: { + placeholder: '请输入任务名称', + }, + }, + { + field: 'status', + component: 'Select', + label: '任务状态', + componentProps: { + placeholder: '请选择任务状态', + clearable: true, + options: [ + { + label: '正常', + value: 0, + }, + { + label: '失败', + value: 1, + }, + ], + }, + }, +];