From 260c2dca4c2c87384ee7de7b0b9a0a0d72f7be53 Mon Sep 17 00:00:00 2001
From: song-tianyang <tianyang.song@fit2cloud.com>
Date: Mon, 22 May 2023 15:59:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E6=89=A7=E8=A1=8C=E6=97=B6=E6=8A=A5=E5=91=8A=E8=A7=A6?=
 =?UTF-8?q?=E5=8F=91=E6=96=B9=E5=BC=8F=E4=B8=8D=E4=B8=BA=E6=89=B9=E9=87=8F?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1026387 --user=宋天阳 【测试跟踪】测试计划批量执行-查看报告触发方式-仍为手动触发
https://www.tapd.cn/55049933/s/1373930
---
 .../io/metersphere/plan/service/TestPlanService.java |  2 ++
 .../report/components/TestPlanReportList.vue         | 12 ++++++------
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
index 5c35e5d9c5..8890ddf0f1 100644
--- a/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
+++ b/test-track/backend/src/main/java/io/metersphere/plan/service/TestPlanService.java
@@ -2174,6 +2174,7 @@ public class TestPlanService {
                 }
                 runRequest.setTestPlanId(planExecutionQueue.getTestPlanId());
                 runRequest.setReportId(planExecutionQueue.getReportId());
+                runRequest.setTriggerMode(request.getTriggerMode());
                 runPlan(runRequest);
             } else {
                 for (TestPlanExecutionQueue planExecutionQueue : planExecutionQueues) {
@@ -2182,6 +2183,7 @@ public class TestPlanService {
                     TestPlanRequestUtil.changeStringToBoolean(jsonObject);
                     TestPlanRunRequest runRequest = JSON.parseObject(JSON.toJSONString(jsonObject), TestPlanRunRequest.class);
                     runRequest.setReportId(planExecutionQueue.getReportId());
+                    runRequest.setTriggerMode(request.getTriggerMode());
                     runPlan(runRequest);
                 }
             }
diff --git a/test-track/frontend/src/business/report/components/TestPlanReportList.vue b/test-track/frontend/src/business/report/components/TestPlanReportList.vue
index 0f921bd22e..b65234d332 100644
--- a/test-track/frontend/src/business/report/components/TestPlanReportList.vue
+++ b/test-track/frontend/src/business/report/components/TestPlanReportList.vue
@@ -141,10 +141,10 @@
           :label="$t('test_track.report.list.pass_rate')"
         >
           <template v-slot:default="scope">
-            <span>{{
-              (scope.row.passRate ? (scope.row.passRate * 100).toFixed(1) : 0) +
-              "%"
-            }}</span>
+            <span v-if="scope.row.status  === 'RUNNING' || scope.row.status  === 'Running'"> - </span>
+            <span v-else> {{
+                (scope.row.passRate ? (scope.row.passRate * 100).toFixed(1) : 0) + "%"
+              }}</span>
           </template>
         </ms-table-column>
       </span>
@@ -169,7 +169,7 @@ import MsTablePagination from "metersphere-frontend/src/components/pagination/Ta
 import MsTableHeader from "metersphere-frontend/src/components/MsTableHeader";
 import MsTableOperatorButton from "metersphere-frontend/src/components/MsTableOperatorButton";
 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 MsTag from "metersphere-frontend/src/components/MsTag";
 import ShowMoreBtn from "metersphere-frontend/src/components/table/ShowMoreBtn";
@@ -180,7 +180,7 @@ import {
   initCondition,
 } from "metersphere-frontend/src/utils/tableUtils";
 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 MsTable from "metersphere-frontend/src/components/table/MsTable";
 import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";