test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix(任务中心): bugFix

This commit is contained in:
baiqi 2024-10-24 11:03:25 +08:00 committed by 刘瑞斌
parent d1558051f4
commit d7d57690ce
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
frontend/src/views/taskCenter/component/caseTaskDetailTable.vue
View File

@ -52,6 +52,7 @@
{{ t(executeMethodMap[record.triggerMode]) }} {{ t(executeMethodMap[record.triggerMode]) }}
</template> </template>
<template #resourcePoolNode="{ record }"> <template #resourcePoolNode="{ record }">
<template v-if="record.resourcePoolNode">
<a-tooltip :content="record.resourcePoolNode"> <a-tooltip :content="record.resourcePoolNode">
<div class="one-line-text">{{ record.resourcePoolNode }}</div> <div class="one-line-text">{{ record.resourcePoolNode }}</div>
</a-tooltip> </a-tooltip>
@ -59,6 +60,8 @@
<icon-exclamation-circle-fill class="min-w-[18px] !text-[rgb(var(--warning-6))]" :size="18" /> <icon-exclamation-circle-fill class="min-w-[18px] !text-[rgb(var(--warning-6))]" :size="18" />
</a-tooltip> </a-tooltip>
</template> </template>
<span v-else>-</span>
</template>
<template #action="{ record }"> <template #action="{ record }">
<MsButton <MsButton
v-if="[ExecuteStatusEnum.RUNNING, ExecuteStatusEnum.RERUNNING].includes(record.status)" v-if="[ExecuteStatusEnum.RUNNING, ExecuteStatusEnum.RERUNNING].includes(record.status)"

5
frontend/src/views/taskCenter/component/caseTaskTable.vue
View File

@ -681,7 +681,10 @@
function showReportDetail(record: TaskCenterTaskItem) { function showReportDetail(record: TaskCenterTaskItem) {
activeDetailId.value = record.reportId; activeDetailId.value = record.reportId;
if ([ExecuteTaskType.API_SCENARIO, ExecuteTaskType.TEST_PLAN_API_SCENARIO].includes(record.taskType)) { if (
[ExecuteTaskType.API_SCENARIO, ExecuteTaskType.TEST_PLAN_API_SCENARIO].includes(record.taskType) ||
(record.taskType.includes('SCENARIO') && record.integrated === true)
) {
showDetailDrawer.value = true; showDetailDrawer.value = true;
} else { } else {
showCaseDetailDrawer.value = true; showCaseDetailDrawer.value = true;