From 4654e5fff2210e0a239de5d974fff960bd9cea96 Mon Sep 17 00:00:00 2001
From: fit2-zhao <yong.zhao@fit2cloud.com>
Date: Wed, 13 Jan 2021 10:20:59 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E8=AF=AF=E5=88=A0?=
 =?UTF-8?q?=E9=99=A4=E5=BC=95=E7=94=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/business/components/xpack | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/frontend/src/business/components/xpack b/frontend/src/business/components/xpack
index 010ad7a5f0..3d96d7c61b 160000
--- a/frontend/src/business/components/xpack
+++ b/frontend/src/business/components/xpack
@@ -1 +1 @@
-Subproject commit 010ad7a5f072a5e9d368c756a2473bbd20781433
+Subproject commit 3d96d7c61bc50f32f18311d23f447663e02d7d44

From 6811a5c9a22290d3de8bef9090ed6de2eb827363 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 13 Jan 2021 11:19:22 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E6=B5=8B=E8=AF=95=E8=AE=A1?=
 =?UTF-8?q?=E5=88=92):=20=E7=BB=9F=E8=AE=A1=E6=8A=A5=E5=91=8A=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../FailureResultAdvanceComponent.vue         |  8 ++---
 .../component/LoadFailureCasesList.vue        | 34 +++++--------------
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultAdvanceComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultAdvanceComponent.vue
index dc99df61ba..0c767abe2f 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultAdvanceComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/FailureResultAdvanceComponent.vue
@@ -79,11 +79,11 @@
               ],
               loadTestCases: [
                 {
-                  caseName: 'testCase4',
-                  projectName: 'P3',
-                  userName: '/module1/module2',
+                  caseName: 'testCase5',
+                  projectName: '测试项目',
+                  userName: 'Tom',
                   createTime:  new Date(),
-                  status: 'error',
+                  caseStatus: 'error',
                 }
               ]
             }
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/LoadFailureCasesList.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/LoadFailureCasesList.vue
index a2cb727759..053878274c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/LoadFailureCasesList.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/component/LoadFailureCasesList.vue
@@ -33,43 +33,27 @@
         </template>
       </el-table-column>
       <el-table-column
-        prop="status"
-        column-key="status"
-        :filters="statusFilters"
-        :label="$t('commons.status')">
+        prop="caseStatus"
+        :label="$t('test_track.plan.load_case.execution_status')">
         <template v-slot:default="{row}">
-          <ms-performance-test-status :row="row"/>
+          <el-tag size="mini" type="danger" v-if="row.caseStatus === 'error'">
+            {{ row.caseStatus }}
+          </el-tag>
+          <el-tag size="mini" type="success" v-else-if="row.caseStatus === 'success'">
+            {{ row.caseStatus }}
+          </el-tag>
+          <span v-else>-</span>
         </template>
       </el-table-column>
-<!--      <el-table-column-->
-<!--        prop="caseStatus"-->
-<!--        :label="$t('test_track.plan.load_case.execution_status')">-->
-<!--        <template v-slot:default="{row}">-->
-<!--          <el-tag size="mini" type="danger" v-if="row.caseStatus === 'error'">-->
-<!--            {{ row.caseStatus }}-->
-<!--          </el-tag>-->
-<!--          <el-tag size="mini" type="success" v-else-if="row.caseStatus === 'success'">-->
-<!--            {{ row.caseStatus }}-->
-<!--          </el-tag>-->
-<!--          <span v-else>-</span>-->
-<!--        </template>-->
-<!--      </el-table-column>-->
 
     </el-table>
   </div>
 </template>
 
 <script>
-import MsTag from "@/business/components/common/components/MsTag";
-import PriorityTableItem from "@/business/components/track/common/tableItems/planview/PriorityTableItem";
-import TypeTableItem from "@/business/components/track/common/tableItems/planview/TypeTableItem";
-import MethodTableItem from "@/business/components/track/common/tableItems/planview/MethodTableItem";
-import StatusTableItem from "@/business/components/track/common/tableItems/planview/StatusTableItem";
-import MsPerformanceTestStatus from "@/business/components/performance/test/PerformanceTestStatus";
 
 export default {
   name: "LoadFailureCasesList",
-  components: {MsTag, PriorityTableItem, TypeTableItem, MethodTableItem, StatusTableItem, MsPerformanceTestStatus},
   props: ['loadTestCases'],
   data() {
     return {