From 04d42a112b44c856fcf5bd0a5b1d84b4828f795a Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Fri, 24 Mar 2023 10:33:29 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=AE=A1=E5=88=92):=20?=
 =?UTF-8?q?=E6=8A=A5=E5=91=8A=E4=B8=ADUI=E7=94=A8=E4=BE=8B=E6=9C=AA?=
 =?UTF-8?q?=E6=89=A7=E8=A1=8Ctab=E9=A1=B5=E6=9C=AA=E5=B1=95=E7=A4=BA?=
 =?UTF-8?q?=E6=9C=AA=E6=89=A7=E8=A1=8C=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1024732 --user=李玉号
【UI测试】报告导出-未执行tab页未展示未执行数据
https://www.tapd.cn/55049933/s/1355416
---
 .../report/detail/ui/ScenarioResults.vue      | 21 +++++++++++++------
 .../report/detail/ui/UiShareReportDetail.vue  |  6 +++++-
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/ScenarioResults.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/ScenarioResults.vue
index ae00f6d031..87be3f2b07 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/ScenarioResults.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/ScenarioResults.vue
@@ -41,6 +41,10 @@ export default {
     isShare: Boolean,
     isTemplate: Boolean,
     shareId: String,
+    isUi: {
+      default: false,
+      type: Boolean
+    }
   },
   data() {
     return {
@@ -52,11 +56,6 @@ export default {
       this.$refs.resultsTree.root.expanded = true;
     }
   },
-  computed: {
-    isUi() {
-      return this.report && this.report.reportType && this.report.reportType.startsWith("UI");
-    },
-  },
   methods: {
     filterNode(value, data) {
       if (!data.value && (!data.children || data.children.length === 0)) {
@@ -74,7 +73,17 @@ export default {
           }
         } else {
           if (this.isUi) {
-            return data.value.success === false && data.value.startTime > 0;
+            if (value === 'PENDING') {
+              if (data.value.status === 'PENDING') {
+                return true;
+              }
+            } else if (value === 'ERROR') {
+              if (data.value.status === 'ERROR') {
+                return true;
+              }
+            } else {
+              return data.value.success === false && data.value.startTime > 0;
+            }
           } else {
             return data.totalStatus !== 'errorReportResult' && data.value.error > 0;
           }
diff --git a/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/UiShareReportDetail.vue b/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/UiShareReportDetail.vue
index 40afa4942e..5709ae7a05 100644
--- a/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/UiShareReportDetail.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/report/detail/ui/UiShareReportDetail.vue
@@ -38,6 +38,7 @@
                   :report="report"
                   :is-share="isShare"
                   :share-id="shareId"
+                  :is-ui="true"
                   v-on:requestResult="requestResult"
                   ref="resultsTree"
                 />
@@ -57,6 +58,7 @@
                   :treeData="fullTreeNodes"
                   ref="failsTree"
                   :errorReport="content.error"
+                  :is-ui="true"
                 />
               </el-tab-pane>
               <!--error step -->
@@ -75,6 +77,7 @@
                   :console="content.console"
                   :treeData="fullTreeNodes"
                   ref="errorReportTree"
+                  :is-ui="true"
                 />
               </el-tab-pane>
               <!-- Not performed step -->
@@ -93,6 +96,7 @@
                   :console="content.console"
                   :treeData="fullTreeNodes"
                   ref="unExecuteTree"
+                  :is-ui="true"
                 />
               </el-tab-pane>
               <!-- console -->
@@ -212,7 +216,7 @@ export default {
       } else if (this.activeName === "errorReport") {
         this.$refs.errorReportTree.filter("errorReport");
       } else if (this.activeName === "unExecute") {
-        this.$refs.unExecuteTree.filter("unexecute");
+        this.$refs.unExecuteTree.filter("PENDING");
       }
     },
     init() {