diff --git a/.env.development b/.env.development index 09628d1..2c9db82 100644 --- a/.env.development +++ b/.env.development @@ -12,7 +12,7 @@ VITE_DROP_CONSOLE = true # 跨域代理,可以配置多个,请注意不要换行 #VITE_PROXY = [["/appApi","http://localhost:8001"],["/upload","http://localhost:8001/upload"]] -VITE_PROXY=[["/api","http://192.168.124.203:8081/api"]] +VITE_PROXY=[["/api","http://192.168.124.32:8081/api"]] # API 接口地址 VITE_GLOB_API_URL = diff --git a/src/views/dashboard/message/edit.vue b/src/views/dashboard/message/edit.vue index b931545..5d5ef4e 100644 --- a/src/views/dashboard/message/edit.vue +++ b/src/views/dashboard/message/edit.vue @@ -3,7 +3,7 @@ v-model="props.visible" title="消息详情" - width="700" + width="750" :close-on-click-modal="false" :before-close="dialogClose" > diff --git a/src/views/data/message/edit.vue b/src/views/data/message/edit.vue index c868cce..f37e1a5 100644 --- a/src/views/data/message/edit.vue +++ b/src/views/data/message/edit.vue @@ -3,7 +3,7 @@ v-model="props.visible" title="消息详情" - width="700" + width="750" :close-on-click-modal="false" :before-close="dialogClose" > diff --git a/src/views/logger/emailLog/edit.vue b/src/views/logger/emailLog/edit.vue index 7e304f2..01bda7b 100644 --- a/src/views/logger/emailLog/edit.vue +++ b/src/views/logger/emailLog/edit.vue @@ -3,7 +3,7 @@ v-model="props.visible" title="邮件日志详情" - width="700" + width="750" :close-on-click-modal="false" :before-close="dialogClose" > diff --git a/src/views/logger/fileLog/edit.vue b/src/views/logger/fileLog/edit.vue index 54edeea..d27428a 100644 --- a/src/views/logger/fileLog/edit.vue +++ b/src/views/logger/fileLog/edit.vue @@ -3,7 +3,7 @@ v-model="props.visible" title="文件日志详情" - width="700" + width="750" :close-on-click-modal="false" :before-close="dialogClose" > diff --git a/src/views/logger/smsLog/edit.vue b/src/views/logger/smsLog/edit.vue index e52a074..36aa666 100644 --- a/src/views/logger/smsLog/edit.vue +++ b/src/views/logger/smsLog/edit.vue @@ -3,7 +3,7 @@ v-model="props.visible" title="短信日志详情" - width="700" + width="750" :close-on-click-modal="false" :before-close="dialogClose" > diff --git a/src/views/monitor/job/log/columns.ts b/src/views/monitor/job/log/columns.ts index a59fabf..044b819 100644 --- a/src/views/monitor/job/log/columns.ts +++ b/src/views/monitor/job/log/columns.ts @@ -20,10 +20,17 @@ export const columns = [ { label: '任务触发器', prop: 'jobTrigger', + width: 150, }, { - label: '任务信息', + label: '任务日志信息', prop: 'jobMessage', + width: 150, + }, + { + label: '执行表达式', + prop: 'cronExpression', + width: 150, }, { label: '执行状态', @@ -50,7 +57,22 @@ export const columns = [ }, }, { - label: '执行时间', + label: '任务开始时间', prop: 'startTime', + width: 180, + }, + { + label: '任务结束时间', + prop: 'endTime', + width: 180, + }, + { + label: '任务执行时间', + prop: 'createTime', + width: 180, + }, + { + label: '任务执行耗时', + prop: 'consumeTime', }, ]; diff --git a/src/views/monitor/job/log/edit.vue b/src/views/monitor/job/log/edit.vue index b2cdf40..b0d1a52 100644 --- a/src/views/monitor/job/log/edit.vue +++ b/src/views/monitor/job/log/edit.vue @@ -1,44 +1,59 @@ + + diff --git a/src/views/monitor/job/log/edit2.vue b/src/views/monitor/job/log/edit2.vue new file mode 100644 index 0000000..b33fa17 --- /dev/null +++ b/src/views/monitor/job/log/edit2.vue @@ -0,0 +1,116 @@ + + diff --git a/src/views/monitor/job/log/index.vue b/src/views/monitor/job/log/index.vue index 3c6dc1f..959f512 100644 --- a/src/views/monitor/job/log/index.vue +++ b/src/views/monitor/job/log/index.vue @@ -75,7 +75,7 @@ const selectionData = ref([]) status:'' }); const actionColumn = reactive({ - width: 250, + width: 200, label: '操作', prop: 'action', fixed: 'right', diff --git a/src/views/system/logger/loginLog/edit.vue b/src/views/system/logger/loginLog/edit.vue index e765715..6cf41b9 100644 --- a/src/views/system/logger/loginLog/edit.vue +++ b/src/views/system/logger/loginLog/edit.vue @@ -2,7 +2,7 @@ diff --git a/src/views/system/logger/operLog/edit.vue b/src/views/system/logger/operLog/edit.vue index aa9f14d..2bd4242 100644 --- a/src/views/system/logger/operLog/edit.vue +++ b/src/views/system/logger/operLog/edit.vue @@ -2,7 +2,7 @@ diff --git a/src/views/system/user/edit.vue b/src/views/system/user/edit.vue index ec61a10..99bb62e 100644 --- a/src/views/system/user/edit.vue +++ b/src/views/system/user/edit.vue @@ -1,5 +1,5 @@