diff --git a/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue b/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue index f65be9b1b4..51a3f700e6 100644 --- a/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue +++ b/frontend/src/views/taskCenter/component/caseTaskDetailTable.vue @@ -176,16 +176,25 @@ fixed: 'left', showDrag: true, }, + { + title: 'ms.taskCenter.caseName', + dataIndex: 'resourceName', + showTooltip: true, + width: 150, + showDrag: true, + }, { title: 'ms.taskCenter.executeStatus', dataIndex: 'status', slotName: 'status', width: 120, filterConfig: { - options: Object.keys(executeStatusMap).map((key) => ({ - label: t(executeStatusMap[key as ExecuteStatusEnum].label), - value: key, - })), + options: Object.keys(executeStatusMap) + .map((key) => ({ + label: t(executeStatusMap[key as ExecuteStatusEnum].label), + value: key, + })) + .filter((e) => e.value !== ExecuteStatusEnum.RERUNNING), filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_EXEC_STATUS, }, sortable: { @@ -500,7 +509,7 @@ const scenarioExecuteResultDrawerVisible = ref(false); function checkExecuteResult(record: TaskCenterTaskDetailItem) { activeRecord.value = record; - if (record.resourceType === 'API_SCENARIO') { + if (record.resourceType.includes('API_SCENARIO')) { scenarioExecuteResultDrawerVisible.value = true; } else { caseExecuteResultDrawerVisible.value = true; diff --git a/frontend/src/views/taskCenter/component/caseTaskTable.vue b/frontend/src/views/taskCenter/component/caseTaskTable.vue index 7db48ac53d..5a5f32acb4 100644 --- a/frontend/src/views/taskCenter/component/caseTaskTable.vue +++ b/frontend/src/views/taskCenter/component/caseTaskTable.vue @@ -580,15 +580,15 @@ } const currentStopTask = { - system: projectStopTask, - project: organizationStopTask, - org: systemStopTask, + system: systemStopTask, + project: projectStopTask, + org: organizationStopTask, }[props.type]; const currentBatchStopTask = { - system: projectBatchStopTask, - project: organizationBatchStopTask, - org: systemBatchStopTask, + system: systemBatchStopTask, + project: projectBatchStopTask, + org: organizationBatchStopTask, }[props.type]; /** diff --git a/frontend/src/views/taskCenter/locale/en-US.ts b/frontend/src/views/taskCenter/locale/en-US.ts index f903731a3e..78d893b3a1 100644 --- a/frontend/src/views/taskCenter/locale/en-US.ts +++ b/frontend/src/views/taskCenter/locale/en-US.ts @@ -57,4 +57,5 @@ export default { 'ms.taskCenter.openTaskSuccess': 'Task started successfully', 'ms.taskCenter.closeTaskSuccess': 'Task closed successfully', 'ms.taskCenter.waitQueue': 'Waiting in line', + 'ms.taskCenter.caseName': 'Case name', }; diff --git a/frontend/src/views/taskCenter/locale/zh-CN.ts b/frontend/src/views/taskCenter/locale/zh-CN.ts index 763a66eca2..379e1a7107 100644 --- a/frontend/src/views/taskCenter/locale/zh-CN.ts +++ b/frontend/src/views/taskCenter/locale/zh-CN.ts @@ -57,4 +57,5 @@ export default { 'ms.taskCenter.openTaskSuccess': '任务开启成功', 'ms.taskCenter.closeTaskSuccess': '任务关闭成功', 'ms.taskCenter.waitQueue': '等待排队', + 'ms.taskCenter.caseName': '用例名称', };