diff --git a/src/locales/langs/en-us.ts b/src/locales/langs/en-us.ts index f6c9d65..007dba3 100644 --- a/src/locales/langs/en-us.ts +++ b/src/locales/langs/en-us.ts @@ -344,8 +344,8 @@ const local: App.I18n.Schema = { notify_config: 'Notify Config', retry: 'Retry Task', retry_task: 'Retry Task', + retry_info: "'Retry Task Management", retry_scene: 'Retry Scene', - retry_log: 'Retry Log', 'retry_dead-letter': 'Retry Dead Letter', user: 'User', user_manager: 'User Info', diff --git a/src/locales/langs/zh-cn.ts b/src/locales/langs/zh-cn.ts index 26a8337..6eec867 100644 --- a/src/locales/langs/zh-cn.ts +++ b/src/locales/langs/zh-cn.ts @@ -344,12 +344,12 @@ const local: App.I18n.Schema = { notify_recipient: '通知人', notify_config: '通知配置', retry: '重试任务', - retry_task: '任务管理', + retry_task: '重试任务', + retry_info: '任务管理', 'retry_dead-letter': '死信任务', user: '用户管理', user_manager: '用户信息', retry_scene: '重试场景', - retry_log: '重试日志', workflow: '工作流', workflow_task: '任务管理', workflow_batch: '执行批次', diff --git a/src/router/elegant/imports.ts b/src/router/elegant/imports.ts index 9eca2cd..d662622 100644 --- a/src/router/elegant/imports.ts +++ b/src/router/elegant/imports.ts @@ -31,7 +31,7 @@ export const views: Record Promise import("@/views/notify/recipient/index.vue"), pods: () => import("@/views/pods/index.vue"), "retry_dead-letter": () => import("@/views/retry/dead-letter/index.vue"), - retry_log: () => import("@/views/retry/log/index.vue"), + retry_info: () => import("@/views/retry/info/index.vue"), retry_scene: () => import("@/views/retry/scene/index.vue"), retry_task: () => import("@/views/retry/task/index.vue"), user_manager: () => import("@/views/user/manager/index.vue"), diff --git a/src/router/elegant/routes.ts b/src/router/elegant/routes.ts index 4b13fef..1741143 100644 --- a/src/router/elegant/routes.ts +++ b/src/router/elegant/routes.ts @@ -234,15 +234,13 @@ export const generatedRoutes: GeneratedRoute[] = [ } }, { - name: 'retry_log', - path: '/retry/log', - component: 'view.retry_log', + name: 'retry_info', + path: '/retry/info', + component: 'view.retry_info', meta: { - title: 'retry_log', - i18nKey: 'route.retry_log', - icon: 'tabler:logs', - order: 20, - keepAlive: false + title: 'retry_info', + i18nKey: 'route.retry_info', + icon: 'octicon:tasklist' } }, { @@ -264,8 +262,7 @@ export const generatedRoutes: GeneratedRoute[] = [ meta: { title: 'retry_task', i18nKey: 'route.retry_task', - icon: 'octicon:tasklist', - order: 10, + icon: 'carbon:batch-job', keepAlive: false } } diff --git a/src/views/home/modules/card-data.vue b/src/views/home/modules/card-data.vue index 7bc0860..31cca60 100644 --- a/src/views/home/modules/card-data.vue +++ b/src/views/home/modules/card-data.vue @@ -143,22 +143,22 @@ const cardData = computed(() => [ { label: $t('common.success'), value: props.modelValue?.retryTask.finishNum ?? 0, - click: () => routerPushByKey('retry_log', { state: { retryStatus: 1 } }) + click: () => routerPushByKey('retry_info', { state: { retryStatus: 1 } }) }, { label: $t('common.running'), value: props.modelValue?.retryTask.runningNum ?? 0, - click: () => routerPushByKey('retry_log', { state: { retryStatus: 0 } }) + click: () => routerPushByKey('retry_info', { state: { retryStatus: 0 } }) }, { label: $t('page.home.retryTask.status.maxRetryTimes'), value: props.modelValue?.retryTask.maxCountNum ?? 0, - click: () => routerPushByKey('retry_log', { state: { retryStatus: 2 } }) + click: () => routerPushByKey('retry_info', { state: { retryStatus: 2 } }) }, { label: $t('page.home.retryTask.status.pauseRetry'), value: props.modelValue?.retryTask.suspendNum ?? 0, - click: () => routerPushByKey('retry_log', { state: { retryStatus: 3 } }) + click: () => routerPushByKey('retry_info', { state: { retryStatus: 3 } }) } ] }, diff --git a/src/views/retry/info/index.vue b/src/views/retry/info/index.vue new file mode 100644 index 0000000..4373453 --- /dev/null +++ b/src/views/retry/info/index.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue deleted file mode 100644 index 4203251..0000000 --- a/src/views/retry/log/index.vue +++ /dev/null @@ -1,201 +0,0 @@ - - - - - diff --git a/src/views/retry/log/modules/retry-log-detail-drawer.vue b/src/views/retry/log/modules/retry-log-detail-drawer.vue deleted file mode 100644 index ba72dd4..0000000 --- a/src/views/retry/log/modules/retry-log-detail-drawer.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - diff --git a/src/views/retry/log/modules/retry-log-search.vue b/src/views/retry/log/modules/retry-log-search.vue deleted file mode 100644 index de69fb7..0000000 --- a/src/views/retry/log/modules/retry-log-search.vue +++ /dev/null @@ -1,67 +0,0 @@ - - - - - diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index 0c4a318..c77f741 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -1,56 +1,51 @@ - - - + diff --git a/src/views/retry/task/modules/retry-task-detail-drawer.vue b/src/views/retry/task/modules/retry-task-detail-drawer.vue index 4a5043b..ba72dd4 100644 --- a/src/views/retry/task/modules/retry-task-detail-drawer.vue +++ b/src/views/retry/task/modules/retry-task-detail-drawer.vue @@ -1,9 +1,7 @@