mirror of
https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
synced 2024-12-04 04:59:48 +08:00
fix(任务中心): bugFix
This commit is contained in:
parent
18fe38f877
commit
176801e843
@ -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;
|
||||
|
@ -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];
|
||||
|
||||
/**
|
||||
|
@ -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',
|
||||
};
|
||||
|
@ -57,4 +57,5 @@ export default {
|
||||
'ms.taskCenter.openTaskSuccess': '任务开启成功',
|
||||
'ms.taskCenter.closeTaskSuccess': '任务关闭成功',
|
||||
'ms.taskCenter.waitQueue': '等待排队',
|
||||
'ms.taskCenter.caseName': '用例名称',
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user