diff --git a/src/service/api/retry-task.ts b/src/service/api/retry-task.ts index 2612f5d..8a324d3 100644 --- a/src/service/api/retry-task.ts +++ b/src/service/api/retry-task.ts @@ -62,6 +62,15 @@ export function fetchExecuteRetryTask(data: Api.RetryTask.ManualTriggerTaskReque }); } +/** manual execute callbackTask */ +export function fetchExecuteCallbackTask(data: Api.RetryTask.ManualTriggerTaskRequestVO) { + return request({ + url: '/retry-task/manual/trigger/callback/task', + method: 'post', + data + }); +} + /** batch delete retryTask */ export function fetchBatchDeleteRetryTask(data: Api.RetryTask.BatchDeleteRetryTaskVO) { return request({ diff --git a/src/views/retry/log/index.vue b/src/views/retry/log/index.vue index 4e73c0b..a9b183f 100644 --- a/src/views/retry/log/index.vue +++ b/src/views/retry/log/index.vue @@ -133,7 +133,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP width: 80, render: row => (
- {row.retryStatus === 1 ? ( + {row.retryStatus === 1 || row.retryStatus === 2 ? ( handleDelete(row.id)}> {{ default: () => $t('common.confirmDelete'), diff --git a/src/views/retry/task/index.vue b/src/views/retry/task/index.vue index 7114fc1..f0a8e62 100644 --- a/src/views/retry/task/index.vue +++ b/src/views/retry/task/index.vue @@ -4,6 +4,7 @@ import { useBoolean } from '@sa/hooks'; import { onMounted, ref } from 'vue'; import { fetchBatchDeleteRetryTask, + fetchExecuteCallbackTask, fetchExecuteRetryTask, fetchGetAllGroupNameList, fetchGetRetryTaskById, @@ -158,7 +159,7 @@ const { columns, columnChecks, data, getData, loading, mobilePagination, searchP {/* 非[完成,最大次数], 显示[执行]按钮 */} {row.retryStatus !== 1 && row.retryStatus !== 2 ? ( <> - handleExecute(row.groupName!, row.uniqueId!)}> + handleExecute(row.groupName!, row.uniqueId!, row.taskType!)}> {{ default: () => $t('common.confirmExecute'), trigger: () => ( @@ -281,8 +282,15 @@ function handleBatchAdd() { openBatchAddDrawer(); } -function handleExecute(groupName: string, uniqueId: string) { - fetchExecuteRetryTask({ groupName, uniqueIds: [uniqueId] }); +function handleExecute(groupName: string, uniqueId: string, type: Api.RetryTask.TaskType) { + if (type === 1) { + fetchExecuteRetryTask({ groupName, uniqueIds: [uniqueId] }); + return; + } + + if (type === 2) { + fetchExecuteCallbackTask({ groupName, uniqueIds: [uniqueId] }); + } } function handleResume(id: number, groupName: string) {