diff --git a/src/App.vue b/src/App.vue index f39d54b..2c89d05 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,12 +1,14 @@ + + diff --git a/src/pages/sys/task/execute-log/Executelog.vue b/src/pages/sys/task/execute-log/Executelog.vue index ce04b27..d92b0a4 100644 --- a/src/pages/sys/task/execute-log/Executelog.vue +++ b/src/pages/sys/task/execute-log/Executelog.vue @@ -1,78 +1,67 @@ - - + +
+
+ 调试 + 普通 + 警告 + 错误 +
{{ content.logTime }}
+
+ +
{{ (Strings.isBlank(content.place) ? '' : (content.place + '  ')) + (content.line == null ? '' : ('(第' + content.line + '行)\n\n')) + (Strings.isBlank(content.msg) ? '' : (content.msg)) + (Strings.isBlank(content.err) ? '' : ('\n' + content.err)) }}
+
+ +
+ +
+ - + diff --git a/src/pages/sys/task/execute-log/ExecutelogForm.vue b/src/pages/sys/task/execute-log/ExecutelogForm.vue deleted file mode 100644 index e1cae8f..0000000 --- a/src/pages/sys/task/execute-log/ExecutelogForm.vue +++ /dev/null @@ -1,115 +0,0 @@ - - - diff --git a/src/pages/sys/task/execute-log/execute-log-api.ts b/src/pages/sys/task/execute-log/execute-log-api.ts index 57330f8..149a0a8 100644 --- a/src/pages/sys/task/execute-log/execute-log-api.ts +++ b/src/pages/sys/task/execute-log/execute-log-api.ts @@ -4,16 +4,16 @@ import { } from '@/common/utils/http-util.ts' export default { - paging(data: Task_execute_logTypes.SearchTask_execute_logParam) { - return get>('/task_execute_log/paging', data) + paging(data: TaskExecuteLogTypes.SearchTaskExecuteLogParam) { + return get>('/task_execute_log/paging', data) }, detail(id: string) { - return get('/task_execute_log/detail', {id}) + return get('/task_execute_log/detail', {id}) }, - add(data: Task_execute_logTypes.AddTask_execute_logParam) { + add(data: TaskExecuteLogTypes.AddTaskExecuteLogParam) { return post('/task_execute_log/add', data) }, - modify(data: Task_execute_logTypes.ModifyTask_execute_logParam) { + modify(data: TaskExecuteLogTypes.ModifyTaskExecuteLogParam) { return post('/task_execute_log/modify', data) }, del(ids: string[]) { diff --git a/src/pages/sys/task/execute-log/execute-log.d.ts b/src/pages/sys/task/execute-log/execute-log.d.ts index b280ac0..4807512 100644 --- a/src/pages/sys/task/execute-log/execute-log.d.ts +++ b/src/pages/sys/task/execute-log/execute-log.d.ts @@ -1,10 +1,11 @@ export {} + declare global { - namespace Task_execute_logTypes { - interface SearchTask_execute_logParam extends G.PageParam { + namespace TaskExecuteLogTypes { + interface SearchTaskExecuteLogParam extends G.PageParam { // Id id?: string - // 调度 Id + // 调度 Id;sys_task_schedule_recode.id scheduleId?: string // 日志等级 logLevel?: string @@ -18,12 +19,14 @@ declare global { msg?: string // 错误信息 err?: string + // 创建时间 + createTime?: string } - interface SearchTask_execute_logResult { + interface SearchTaskExecuteLogResult { // Id id?: string - // 调度 Id + // 调度 Id;sys_task_schedule_recode.id scheduleId?: string // 日志等级 logLevel?: string @@ -37,12 +40,14 @@ declare global { msg?: string // 错误信息 err?: string + // 创建时间 + createTime?: string } - interface AddTask_execute_logParam { + interface AddTaskExecuteLogParam { // Id id?: string - // 调度 Id + // 调度 Id;sys_task_schedule_recode.id scheduleId?: string // 日志等级 logLevel?: string @@ -56,12 +61,14 @@ declare global { msg?: string // 错误信息 err?: string + // 创建时间 + createTime?: string } - interface ModifyTask_execute_logParam { + interface ModifyTaskExecuteLogParam { // Id id?: string - // 调度 Id + // 调度 Id;sys_task_schedule_recode.id scheduleId?: string // 日志等级 logLevel?: string @@ -75,6 +82,8 @@ declare global { msg?: string // 错误信息 err?: string + // 创建时间 + createTime?: string } } } diff --git a/src/pages/sys/task/execute-log/page.ts b/src/pages/sys/task/execute-log/page.ts deleted file mode 100644 index d8444d5..0000000 --- a/src/pages/sys/task/execute-log/page.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default { - component: () => import("@/pages/sys/task/execute-log/Executelog.vue"), -} as RouterTypes.RouteConfig; diff --git a/src/pages/sys/task/schedule-recode/ScheduleRecode.vue b/src/pages/sys/task/schedule-recode/ScheduleRecode.vue new file mode 100644 index 0000000..0ed4429 --- /dev/null +++ b/src/pages/sys/task/schedule-recode/ScheduleRecode.vue @@ -0,0 +1,288 @@ + + + diff --git a/src/pages/sys/task/schedule-recode/ScheduleRecodePanel.vue b/src/pages/sys/task/schedule-recode/ScheduleRecodePanel.vue new file mode 100644 index 0000000..791a57d --- /dev/null +++ b/src/pages/sys/task/schedule-recode/ScheduleRecodePanel.vue @@ -0,0 +1,27 @@ + + + diff --git a/src/pages/sys/task/schedule-recode/Schedulerecode.vue b/src/pages/sys/task/schedule-recode/Schedulerecode.vue deleted file mode 100644 index e5465a5..0000000 --- a/src/pages/sys/task/schedule-recode/Schedulerecode.vue +++ /dev/null @@ -1,262 +0,0 @@ - - - diff --git a/src/pages/sys/task/schedule-recode/SchedulerecodeForm.vue b/src/pages/sys/task/schedule-recode/SchedulerecodeForm.vue deleted file mode 100644 index af64ee4..0000000 --- a/src/pages/sys/task/schedule-recode/SchedulerecodeForm.vue +++ /dev/null @@ -1,145 +0,0 @@ - - - diff --git a/src/pages/sys/task/schedule-recode/SchedulerecodeList.vue b/src/pages/sys/task/schedule-recode/SchedulerecodeList.vue deleted file mode 100644 index 95bc592..0000000 --- a/src/pages/sys/task/schedule-recode/SchedulerecodeList.vue +++ /dev/null @@ -1,96 +0,0 @@ - - - diff --git a/src/pages/sys/task/schedule-recode/page.ts b/src/pages/sys/task/schedule-recode/page.ts deleted file mode 100644 index 1875c1d..0000000 --- a/src/pages/sys/task/schedule-recode/page.ts +++ /dev/null @@ -1,3 +0,0 @@ -export default { - component: () => import("@/pages/sys/task/schedule-recode/Schedulerecode.vue"), -} as RouterTypes.RouteConfig; diff --git a/src/pages/sys/task/schedule-recode/schedule-recode-api.ts b/src/pages/sys/task/schedule-recode/schedule-recode-api.ts index 45b5f12..da6c8ec 100644 --- a/src/pages/sys/task/schedule-recode/schedule-recode-api.ts +++ b/src/pages/sys/task/schedule-recode/schedule-recode-api.ts @@ -4,16 +4,16 @@ import { } from '@/common/utils/http-util.ts' export default { - paging(data: Task_schedule_recodeTypes.SearchTask_schedule_recodeParam) { - return get>('/task_schedule_recode/paging', data) + paging(data: TaskScheduleRecodeTypes.SearchTaskScheduleRecodeParam) { + return get>('/task_schedule_recode/paging', data) }, detail(id: string) { - return get('/task_schedule_recode/detail', {id}) + return get('/task_schedule_recode/detail', {id}) }, - add(data: Task_schedule_recodeTypes.AddTask_schedule_recodeParam) { + add(data: TaskScheduleRecodeTypes.AddTaskScheduleRecodeParam) { return post('/task_schedule_recode/add', data) }, - modify(data: Task_schedule_recodeTypes.ModifyTask_schedule_recodeParam) { + modify(data: TaskScheduleRecodeTypes.ModifyTaskScheduleRecodeParam) { return post('/task_schedule_recode/modify', data) }, del(ids: string[]) { diff --git a/src/pages/sys/task/schedule-recode/schedule-recode.d.ts b/src/pages/sys/task/schedule-recode/schedule-recode.d.ts index 0b03bc9..0ea5d26 100644 --- a/src/pages/sys/task/schedule-recode/schedule-recode.d.ts +++ b/src/pages/sys/task/schedule-recode/schedule-recode.d.ts @@ -1,7 +1,7 @@ export {} declare global { - namespace Task_schedule_recodeTypes { - interface SearchTask_schedule_recodeParam extends G.PageParam { + namespace TaskScheduleRecodeTypes { + interface SearchTaskScheduleRecodeParam extends G.PageParam { // Id id?: string // 任务 Id @@ -30,7 +30,7 @@ declare global { memo?: string } - interface SearchTask_schedule_recodeResult { + interface SearchTaskScheduleRecodeResult { // Id id?: string // 任务 Id @@ -59,7 +59,7 @@ declare global { memo?: string } - interface AddTask_schedule_recodeParam { + interface AddTaskScheduleRecodeParam { // Id id?: string // 任务 Id @@ -88,7 +88,7 @@ declare global { memo?: string } - interface ModifyTask_schedule_recodeParam { + interface ModifyTaskScheduleRecodeParam { // Id id?: string // 任务 Id diff --git a/src/pages/sys/task/task-api.ts b/src/pages/sys/task/task-api.ts index 4435af3..e4902c3 100644 --- a/src/pages/sys/task/task-api.ts +++ b/src/pages/sys/task/task-api.ts @@ -10,6 +10,15 @@ export default { detail(id: string) { return get('/task/detail', {id}) }, + fn(keywords?: string) { + return get('/task/fn', {keywords}) + }, + trigger(id: string) { + return get('/task/trigger', {id}) + }, + disable(id: string, disable: boolean) { + return get('/task/disable', {id, disable}) + }, add(data: TaskTypes.AddTaskParam) { return post('/task/add', data) }, diff --git a/src/pages/sys/task/task.d.ts b/src/pages/sys/task/task.d.ts index ac43707..ad9d937 100644 --- a/src/pages/sys/task/task.d.ts +++ b/src/pages/sys/task/task.d.ts @@ -18,6 +18,7 @@ declare global { criticalTiming?: string // 是否禁用 disabled?: boolean + builtin?: boolean // 备注 memo?: string } @@ -43,6 +44,13 @@ declare global { memo?: string } + interface FnHandle { + // Id + fn?: string + // 任务名称 + defineName?: string + } + interface AddTaskParam { // Id id?: string diff --git a/tsconfig.app.json b/tsconfig.app.json index f47bc29..997de4a 100644 --- a/tsconfig.app.json +++ b/tsconfig.app.json @@ -25,6 +25,7 @@ "include": [ "src/**/*.ts", "src/**/*.tsx", + "src/**/*.d.ts", "src/**/*.vue" ] }