From 8d843d9dcde35ef4f57f773c703881b2546729f8 Mon Sep 17 00:00:00 2001
From: "nathan.liu" <yao.liu@fit2cloud.com>
Date: Wed, 26 Oct 2022 16:38:46 +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=8DUI=E5=85=B3=E8=81=94=E7=94=A8=E4=BE=8B?=
 =?UTF-8?q?=E4=B8=AD=E6=89=A7=E8=A1=8C=E7=BB=93=E6=9E=9C=E4=B8=8B=E6=8B=89?=
 =?UTF-8?q?=E9=80=89=E9=A1=B9=E7=9A=84=E9=A1=BA=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1018856 --user=刘瑶 【测试跟踪】测试计划-UI测试用例列表/关联用例/关联用例-高级搜索3个地方的执行结果状态显示及搜索返回不符 https://www.tapd.cn/55049933/s/1278393
---
 .../src/components/search/search-components.js       |  4 ++--
 .../view/comonents/ui/RelevanceUiScenarioList.vue    |  5 ++++-
 .../view/comonents/ui/TestPlanUiScenarioList.vue     | 12 ++++++++++++
 3 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/framework/sdk-parent/frontend/src/components/search/search-components.js b/framework/sdk-parent/frontend/src/components/search/search-components.js
index 063923e4e5..e39ff39d4a 100644
--- a/framework/sdk-parent/frontend/src/components/search/search-components.js
+++ b/framework/sdk-parent/frontend/src/components/search/search-components.js
@@ -282,9 +282,9 @@ export const UI_SCENARIO_RESULT = {
     options: [OPERATORS.IN, OPERATORS.NOT_IN]
   },
   options: [
-    {text: 'Pending', value: 'PENDING'},
-    {text: 'Success', value: 'SUCCESS'},
     {text: 'Error', value: 'ERROR'},
+    {text: 'Success', value: 'SUCCESS'},
+    {text: 'Pending', value: 'PENDING'},
   ],
   props: { // 尾部控件的props，一般为element ui控件的props
     multiple: true
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
index d958954146..c6a49d190e 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/RelevanceUiScenarioList.vue
@@ -58,9 +58,12 @@
           <el-link type="success" @click="showReport(row)" v-if="row.lastResult === 'Success' || row.lastResult === 'SUCCESS'">
             {{ $t('api_test.automation.success') }}
           </el-link>
-          <el-link type="danger" @click="showReport(row)" v-if="row.lastResult === 'Fail' || row.lastResult === 'FAIL'">
+          <el-link type="danger" @click="showReport(row)" v-else-if="row.lastResult === 'Fail' || row.lastResult === 'FAIL' || row.lastResult === 'ERROR'">
             {{ $t('api_test.automation.fail') }}
           </el-link>
+          <el-link type="info" v-else-if="row.lastResult === 'PENDING' || row.lastResult === 'UnExecute' || !row.lastResult">
+            {{ $t('api_test.home_page.detail_card.unexecute') }}
+          </el-link>
         </template>
       </el-table-column>
       <el-table-column prop="passRate" :label="$t('api_test.automation.passing_rate')"
diff --git a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
index d3ad54bfb0..2987042221 100644
--- a/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
+++ b/test-track/frontend/src/business/plan/view/comonents/ui/TestPlanUiScenarioList.vue
@@ -357,6 +357,18 @@ export default {
     },
     search() {
       initCondition(this.condition, this.condition.selectAll);
+      if(this.condition && this.condition.filters && this.condition.filters.last_result){
+        if(this.condition.filters.last_result.length > 0){
+          //校验是否含有PENDING
+          if(this.condition.filters.last_result.includes("PENDING")){
+            this.condition.filters.last_result = [...this.condition.filters.last_result, "UnExecute"]
+          }
+          //校验是否含有ERROR
+          if(this.condition.filters.last_result.includes("ERROR")){
+            this.condition.filters.last_result = [...this.condition.filters.last_result, "FAIL"]
+          }
+        }
+      }
       this.loading = true;
       this.condition.moduleIds = this.selectNodeIds;
       if (this.clickType) {