From 2224614fb52792e75b42b1d969ed74151774a83e Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 24 Oct 2022 16:09:37 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92=E6=80=A7=E8=83=BD=E6=B5=8B?=
 =?UTF-8?q?=E8=AF=95=E6=89=B9=E9=87=8F=E6=89=A7=E8=A1=8C=E6=9C=89=E7=94=A8?=
 =?UTF-8?q?=E4=BE=8B=E6=B2=A1=E6=89=A7=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018671 --user=陈建星 【测试跟踪】测试计划-性能测试-批量串行执行用例实际只执行了一个 https://www.tapd.cn/55049933/s/1274480
---
 .../base/mapper/ext/ExtLoadTestReportMapper.xml          | 2 +-
 .../metersphere/plan/controller/PerfExecController.java  | 2 +-
 .../comonents/report/detail/component/LoadAllResult.vue  | 9 +++++++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
index 6dc1646c99..7be9886462 100644
--- a/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
+++ b/performance-test/backend/src/main/java/io/metersphere/base/mapper/ext/ExtLoadTestReportMapper.xml
@@ -245,7 +245,7 @@
         SELECT id
         FROM load_test_report
         WHERE test_id = #{testId}
-          AND `status` !='Completed'
+          AND `status` !='Completed' AND `status` !='Error'
     </select>
 
     <select id="selectStatusById" resultType="string">
diff --git a/performance-test/backend/src/main/java/io/metersphere/plan/controller/PerfExecController.java b/performance-test/backend/src/main/java/io/metersphere/plan/controller/PerfExecController.java
index 9a2e5fbada..71aaa5df36 100644
--- a/performance-test/backend/src/main/java/io/metersphere/plan/controller/PerfExecController.java
+++ b/performance-test/backend/src/main/java/io/metersphere/plan/controller/PerfExecController.java
@@ -17,7 +17,7 @@ public class PerfExecController {
     PerfExecService perfExecService;
 
     @PostMapping("/run")
-    public Map<String, String> getLoadFailureCases(@RequestBody PlanPerformanceExecRequest request) {
+    public Map<String, String> run(@RequestBody PlanPerformanceExecRequest request) {
       return perfExecService.run(request.getPlanReportId(), request.getConfig(), request.getTriggerMode(), request.getPerfMap());
     }
 }
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/LoadAllResult.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/LoadAllResult.vue
index c824d240f0..6d1a743443 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/component/LoadAllResult.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/component/LoadAllResult.vue
@@ -15,7 +15,7 @@
     <ms-main-container>
 
       <div v-if="showResponse">
-        <micro-app v-if="!isTemplate"
+        <micro-app v-if="!isTemplate && reportShow"
                    route-name="perReportView"
                    service="performance"
                    :route-params="{
@@ -75,7 +75,8 @@ export default {
       failureTestCases: [],
       showResponse: false,
       reportId: "",
-      response: null
+      response: null,
+      reportShow: true
     }
   },
   methods: {
@@ -112,6 +113,10 @@ export default {
       if (exist) {
         this.reportId = loadReportId;
         this.showResponse = true;
+        this.reportShow = false;
+        this.$nextTick(() => {
+          this.reportShow = true;
+        });
       } else {
         this.showResponse = false;
         this.$message.warning(this.$t('test_track.plan.load_case.report_not_found'));