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

fix(测试跟踪): 修复测试计划批量执行时报告触发方式不为批量的问题 

--bug=1026387 --user=宋天阳 【测试跟踪】测试计划批量执行-查看报告触发方式-仍为手动触发
https://www.tapd.cn/55049933/s/1373930
This commit is contained in:
song-tianyang 2023-05-22 15:59:31 +08:00 committed by 建国
parent cacd315da8
commit 260c2dca4c
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
View File

@ -2174,6 +2174,7 @@ public class TestPlanService {
} }
runRequest.setTestPlanId(planExecutionQueue.getTestPlanId()); runRequest.setTestPlanId(planExecutionQueue.getTestPlanId());
runRequest.setReportId(planExecutionQueue.getReportId()); runRequest.setReportId(planExecutionQueue.getReportId());
runRequest.setTriggerMode(request.getTriggerMode());
runPlan(runRequest); runPlan(runRequest);
} else { } else {
for (TestPlanExecutionQueue planExecutionQueue : planExecutionQueues) { for (TestPlanExecutionQueue planExecutionQueue : planExecutionQueues) {
@ -2182,6 +2183,7 @@ public class TestPlanService {
TestPlanRequestUtil.changeStringToBoolean(jsonObject); TestPlanRequestUtil.changeStringToBoolean(jsonObject);
TestPlanRunRequest runRequest = JSON.parseObject(JSON.toJSONString(jsonObject), TestPlanRunRequest.class); TestPlanRunRequest runRequest = JSON.parseObject(JSON.toJSONString(jsonObject), TestPlanRunRequest.class);
runRequest.setReportId(planExecutionQueue.getReportId()); runRequest.setReportId(planExecutionQueue.getReportId());
runRequest.setTriggerMode(request.getTriggerMode());
runPlan(runRequest); runPlan(runRequest);
} }
} }

12
test-track/frontend/src/business/report/components/TestPlanReportList.vue
View File

@ -141,10 +141,10 @@
:label="$t('test_track.report.list.pass_rate')" :label="$t('test_track.report.list.pass_rate')"
> >
<template v-slot:default="scope"> <template v-slot:default="scope">
<span>{{ <span v-if="scope.row.status === 'RUNNING' || scope.row.status === 'Running'"> - </span>
(scope.row.passRate ? (scope.row.passRate * 100).toFixed(1) : 0) + <span v-else> {{
"%" (scope.row.passRate ? (scope.row.passRate * 100).toFixed(1) : 0) + "%"
}}</span> }}</span>
</template> </template>
</ms-table-column> </ms-table-column>
</span> </span>
@ -169,7 +169,7 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
import MsTableHeader from "metersphere-frontend/src/components/MsTableHeader"; import MsTableHeader from "metersphere-frontend/src/components/MsTableHeader";
import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOperatorButton"; import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOperatorButton";
import MsTableOperator from "metersphere-frontend/src/components/MsTableOperator"; import MsTableOperator from "metersphere-frontend/src/components/MsTableOperator";
import { TEST_PLAN_REPORT_CONFIGS } from "metersphere-frontend/src/components/search/search-components"; import {TEST_PLAN_REPORT_CONFIGS} from "metersphere-frontend/src/components/search/search-components";
import ReportTriggerModeItem from "metersphere-frontend/src/components/tableItem/ReportTriggerModeItem"; import ReportTriggerModeItem from "metersphere-frontend/src/components/tableItem/ReportTriggerModeItem";
import MsTag from "metersphere-frontend/src/components/MsTag"; import MsTag from "metersphere-frontend/src/components/MsTag";
import ShowMoreBtn from "metersphere-frontend/src/components/table/ShowMoreBtn"; import ShowMoreBtn from "metersphere-frontend/src/components/table/ShowMoreBtn";
@ -180,7 +180,7 @@ import {
initCondition, initCondition,
} from "metersphere-frontend/src/utils/tableUtils"; } from "metersphere-frontend/src/utils/tableUtils";
import MsTableHeaderSelectPopover from "metersphere-frontend/src/components/table/MsTableHeaderSelectPopover"; import MsTableHeaderSelectPopover from "metersphere-frontend/src/components/table/MsTableHeaderSelectPopover";
import { getCurrentProjectID } from "metersphere-frontend/src/utils/token"; import {getCurrentProjectID} from "metersphere-frontend/src/utils/token";
import TestPlanDbReport from "@/business/report/components/TestPlanDbReport"; import TestPlanDbReport from "@/business/report/components/TestPlanDbReport";
import MsTable from "metersphere-frontend/src/components/table/MsTable"; import MsTable from "metersphere-frontend/src/components/table/MsTable";
import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn"; import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";