fix(任务中心): bugFix

This commit is contained in:
baiqi 2024-10-23 18:29:54 +08:00 committed by Craftsman
parent 18fe38f877
commit 176801e843
4 changed files with 22 additions and 11 deletions

View File

@ -176,16 +176,25 @@
fixed: 'left', fixed: 'left',
showDrag: true, showDrag: true,
}, },
{
title: 'ms.taskCenter.caseName',
dataIndex: 'resourceName',
showTooltip: true,
width: 150,
showDrag: true,
},
{ {
title: 'ms.taskCenter.executeStatus', title: 'ms.taskCenter.executeStatus',
dataIndex: 'status', dataIndex: 'status',
slotName: 'status', slotName: 'status',
width: 120, width: 120,
filterConfig: { filterConfig: {
options: Object.keys(executeStatusMap).map((key) => ({ options: Object.keys(executeStatusMap)
label: t(executeStatusMap[key as ExecuteStatusEnum].label), .map((key) => ({
value: key, label: t(executeStatusMap[key as ExecuteStatusEnum].label),
})), value: key,
}))
.filter((e) => e.value !== ExecuteStatusEnum.RERUNNING),
filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_EXEC_STATUS, filterSlotName: FilterSlotNameEnum.GLOBAL_TASK_CENTER_EXEC_STATUS,
}, },
sortable: { sortable: {
@ -500,7 +509,7 @@
const scenarioExecuteResultDrawerVisible = ref(false); const scenarioExecuteResultDrawerVisible = ref(false);
function checkExecuteResult(record: TaskCenterTaskDetailItem) { function checkExecuteResult(record: TaskCenterTaskDetailItem) {
activeRecord.value = record; activeRecord.value = record;
if (record.resourceType === 'API_SCENARIO') { if (record.resourceType.includes('API_SCENARIO')) {
scenarioExecuteResultDrawerVisible.value = true; scenarioExecuteResultDrawerVisible.value = true;
} else { } else {
caseExecuteResultDrawerVisible.value = true; caseExecuteResultDrawerVisible.value = true;

View File

@ -580,15 +580,15 @@
} }
const currentStopTask = { const currentStopTask = {
system: projectStopTask, system: systemStopTask,
project: organizationStopTask, project: projectStopTask,
org: systemStopTask, org: organizationStopTask,
}[props.type]; }[props.type];
const currentBatchStopTask = { const currentBatchStopTask = {
system: projectBatchStopTask, system: systemBatchStopTask,
project: organizationBatchStopTask, project: projectBatchStopTask,
org: systemBatchStopTask, org: organizationBatchStopTask,
}[props.type]; }[props.type];
/** /**

View File

@ -57,4 +57,5 @@ export default {
'ms.taskCenter.openTaskSuccess': 'Task started successfully', 'ms.taskCenter.openTaskSuccess': 'Task started successfully',
'ms.taskCenter.closeTaskSuccess': 'Task closed successfully', 'ms.taskCenter.closeTaskSuccess': 'Task closed successfully',
'ms.taskCenter.waitQueue': 'Waiting in line', 'ms.taskCenter.waitQueue': 'Waiting in line',
'ms.taskCenter.caseName': 'Case name',
}; };

View File

@ -57,4 +57,5 @@ export default {
'ms.taskCenter.openTaskSuccess': '任务开启成功', 'ms.taskCenter.openTaskSuccess': '任务开启成功',
'ms.taskCenter.closeTaskSuccess': '任务关闭成功', 'ms.taskCenter.closeTaskSuccess': '任务关闭成功',
'ms.taskCenter.waitQueue': '等待排队', 'ms.taskCenter.waitQueue': '等待排队',
'ms.taskCenter.caseName': '用例名称',
}; };