From f843eacb70dc3a90e6d49ddaa104adbd1eb568a6 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Sun, 26 May 2024 18:34:05 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.0.0):=20=E8=B0=83=E6=95=B4=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E6=A0=B7=E5=BC=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/job/batch/index.vue | 10 ++- src/views/retry/dead-letter/index.vue | 5 +- src/views/retry/log/index.vue | 2 +- src/views/retry/scene/index.vue | 4 +- src/views/retry/task/index.vue | 94 +++++++++++++++------------ src/views/user/manager/index.vue | 5 +- src/views/workflow/batch/index.vue | 4 +- 7 files changed, 72 insertions(+), 52 deletions(-) diff --git a/src/views/job/batch/index.vue b/src/views/job/batch/index.vue index dd5971e..2bf152f 100644 --- a/src/views/job/batch/index.vue +++ b/src/views/job/batch/index.vue @@ -87,6 +87,12 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP return {label}; } }, + { + key: 'createDt', + title: $t('common.createDt'), + align: 'center', + minWidth: 120 + }, { key: 'operationReason', title: $t('page.jobBatch.operationReason'), @@ -113,7 +119,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP {{ default: () => $t('common.confirmStop'), trigger: () => ( - + {$t('common.stop')} ) @@ -127,7 +133,7 @@ const { columnChecks, columns, data, getData, loading, mobilePagination, searchP {{ default: () => $t('common.confirmRetry'), trigger: () => ( - + {$t('common.retry')} ) diff --git a/src/views/retry/dead-letter/index.vue b/src/views/retry/dead-letter/index.vue index f43d6bf..574524b 100644 --- a/src/views/retry/dead-letter/index.vue +++ b/src/views/retry/dead-letter/index.vue @@ -112,14 +112,15 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP width: 130, render: row => (
- rollback(row)}> + rollback(row)}> {$t('common.rollback')} + handleDelete(row)}> {{ default: () => $t('common.confirmDelete'), trigger: () => ( - + {$t('common.delete')} ) diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue index 7cf4f5f..b92bee7 100644 --- a/src/views/retry/log/index.vue +++ b/src/views/retry/log/index.vue @@ -132,7 +132,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP {{ default: () => $t('common.confirmDelete'), trigger: () => ( - + {$t('common.delete')} ) diff --git a/src/views/retry/scene/index.vue b/src/views/retry/scene/index.vue index 0e655b7..3219301 100644 --- a/src/views/retry/scene/index.vue +++ b/src/views/retry/scene/index.vue @@ -147,10 +147,10 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP title: $t('common.operate'), align: 'center', fixed: 'right', - width: 130, + width: 120, render: row => (
- edit(row.id!)}> + edit(row.id!)}> {$t('common.edit')}
diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index f28f302..02d4cef 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -150,61 +150,73 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP
{/* 非[完成,最大次数], 显示[执行]按钮 */} {row.retryStatus !== 1 && row.retryStatus !== 2 ? ( - handleExecute(row.groupName!, row.uniqueId!)}> - {{ - default: () => $t('common.confirmExecute'), - trigger: () => ( - - {$t('common.execute')} - - ) - }} - + <> + handleExecute(row.groupName!, row.uniqueId!)}> + {{ + default: () => $t('common.confirmExecute'), + trigger: () => ( + + {$t('common.execute')} + + ) + }} + + + ) : ( '' )} {/* 非[完成,最大次数], 显示[完成]按钮 */} {row.retryStatus !== 1 && row.retryStatus !== 2 ? ( - handleFinish(Number(row.id!), row.groupName!)}> - {{ - default: () => $t('common.confirmFinish'), - trigger: () => ( - - {$t('common.finish')} - - ) - }} - + <> + handleFinish(Number(row.id!), row.groupName!)}> + {{ + default: () => $t('common.confirmFinish'), + trigger: () => ( + + {$t('common.finish')} + + ) + }} + + + ) : ( '' )} {/* 重试中, 显示[停止]按钮 */} {row.retryStatus === 0 ? ( - handlePause(Number(row.id!), row.groupName!)}> - {{ - default: () => $t('common.confirmPause'), - trigger: () => ( - - {$t('common.pause')} - - ) - }} - + <> + handlePause(Number(row.id!), row.groupName!)}> + {{ + default: () => $t('common.confirmPause'), + trigger: () => ( + + {$t('common.pause')} + + ) + }} + + + ) : ( '' )} {/* 暂停, 显示[开始]按钮 */} {row.retryStatus === 3 ? ( - handleResume(Number(row.id!), row.groupName!)}> - {{ - default: () => $t('common.confirmResume'), - trigger: () => ( - - {$t('common.resume')} - - ) - }} - + <> + handleResume(Number(row.id!), row.groupName!)}> + {{ + default: () => $t('common.confirmResume'), + trigger: () => ( + + {$t('common.resume')} + + ) + }} + + + ) : ( '' )} @@ -213,7 +225,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP {{ default: () => $t('common.confirmDelete'), trigger: () => ( - + {$t('common.delete')} ) diff --git a/src/views/user/manager/index.vue b/src/views/user/manager/index.vue index 38d3fae..ead0477 100644 --- a/src/views/user/manager/index.vue +++ b/src/views/user/manager/index.vue @@ -107,14 +107,15 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP width: 130, render: row => (
- edit(row.id!)}> + edit(row.id!)}> {$t('common.edit')} + handleDelete(row.id!)}> {{ default: () => $t('common.confirmDelete'), trigger: () => ( - + {$t('common.delete')} ) diff --git a/src/views/workflow/batch/index.vue b/src/views/workflow/batch/index.vue index 01e7188..2f1947a 100644 --- a/src/views/workflow/batch/index.vue +++ b/src/views/workflow/batch/index.vue @@ -102,7 +102,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP width: 130, render: row => (
- detail(row.id!)}> + detail(row.id!)}> {$t('common.detail')} {row?.taskBatchStatus === 1 || row?.taskBatchStatus === 2 ? ( @@ -110,7 +110,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP {{ default: () => $t('common.confirmStop'), trigger: () => ( - + {$t('common.stop')} )