From 73af2374371f07e5b9cda2e9ae512eeab9d71444 Mon Sep 17 00:00:00 2001
From: shiziyuan9527 <yuhao.li@fit2cloud.com>
Date: Wed, 29 Jul 2020 17:30:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=9C=A8=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8=E9=A1=B5=E9=9D=A2=E7=82=B9=E5=87=BB=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E5=85=A8=E9=83=A8=E6=97=A0=E6=95=88=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/business/components/api/head/ApiHeaderMenus.vue   | 6 +++---
 frontend/src/business/components/common/head/ShowAll.vue  | 8 +++++++-
 .../performance/head/PerformanceHeaderMenus.vue           | 6 +++---
 .../performance/report/PerformanceTestReport.vue          | 6 ++++++
 frontend/src/business/components/project/MsProject.vue    | 3 +++
 .../business/components/track/head/TrackHeaderMenus.vue   | 6 +++---
 6 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/frontend/src/business/components/api/head/ApiHeaderMenus.vue b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
index 7246c6d84f..2fdd1e8bd3 100644
--- a/frontend/src/business/components/api/head/ApiHeaderMenus.vue
+++ b/frontend/src/business/components/api/head/ApiHeaderMenus.vue
@@ -11,7 +11,7 @@
             <template v-slot:title>{{$t('commons.project')}}</template>
             <ms-recent-list :options="projectRecent"/>
             <el-divider class="menu-divider"/>
-            <ms-show-all :index="'/api/project/all'"/>
+            <ms-show-all :index="'/api/project'"/>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/api/project/create'"
                               :title="$t('project.create')"/>
           </el-submenu>
@@ -20,7 +20,7 @@
             <template v-slot:title>{{$t('commons.test')}}</template>
             <ms-recent-list :options="testRecent"/>
             <el-divider class="menu-divider"/>
-            <ms-show-all :index="'/api/test/list/all'"/>
+            <ms-show-all :index="'/api/test/list'"/>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/api/test/create'"
                               :title="$t('load_test.create')"/>
           </el-submenu>
@@ -29,7 +29,7 @@
             <template v-slot:title>{{$t('commons.report')}}</template>
             <ms-recent-list :options="reportRecent"/>
             <el-divider class="menu-divider"/>
-            <ms-show-all :index="'/api/report/list/all'"/>
+            <ms-show-all :index="'/api/report/list'"/>
           </el-submenu>
         </el-menu>
       </el-col>
diff --git a/frontend/src/business/components/common/head/ShowAll.vue b/frontend/src/business/components/common/head/ShowAll.vue
index 355c167514..09f4ebec6d 100644
--- a/frontend/src/business/components/common/head/ShowAll.vue
+++ b/frontend/src/business/components/common/head/ShowAll.vue
@@ -1,5 +1,5 @@
 <template>
-  <el-menu-item :index="this.index">
+  <el-menu-item :index="this.index" @click="changeRoute">
     <font-awesome-icon :icon="['fa', 'list-ul']"/>
     <span>{{$t('commons.show_all')}}</span>
   </el-menu-item>
@@ -10,6 +10,12 @@
     name: "MsShowAll",
     props: {
       index: String
+    },
+    methods: {
+      changeRoute() {
+        // 解决在列表页面点击 显示全部 无效的问题（点击显示全部后改变路由）
+        this.$router.push(this.index + '/all');
+      }
     }
   }
 </script>
diff --git a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
index cb0fc1c071..924a4cac97 100644
--- a/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
+++ b/frontend/src/business/components/performance/head/PerformanceHeaderMenus.vue
@@ -12,7 +12,7 @@
             <template v-slot:title>{{$t('commons.project')}}</template>
             <ms-recent-list :options="projectRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/performance/project/all'"/>
+            <ms-show-all :index="'/performance/project'"/>
             <ms-create-button v-permission="['test_manager','test_user']"  :index="'/performance/project/create'" :title="$t('project.create')"/>
           </el-submenu>
 
@@ -21,7 +21,7 @@
             <template v-slot:title>{{$t('commons.test')}}</template>
             <ms-recent-list :options="testRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/performance/test/all'"/>
+            <ms-show-all :index="'/performance/test'"/>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/performance/test/create'" :title="$t('load_test.create')"/>
           </el-submenu>
 
@@ -30,7 +30,7 @@
             <template v-slot:title>{{$t('commons.report')}}</template>
             <ms-recent-list :options="reportRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/performance/report/all'"/>
+            <ms-show-all :index="'/performance/report'"/>
           </el-submenu>
         </el-menu>
       </el-col>
diff --git a/frontend/src/business/components/performance/report/PerformanceTestReport.vue b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
index fce3f24486..c9d977ead0 100644
--- a/frontend/src/business/components/performance/report/PerformanceTestReport.vue
+++ b/frontend/src/business/components/performance/report/PerformanceTestReport.vue
@@ -125,6 +125,12 @@
         ],
       }
     },
+    watch: {
+      '$route'(to) {
+        this.projectId = to.params.projectId;
+        this.initTableData();
+      }
+    },
     methods: {
       initTableData(combine) {
         let condition = combine ? {combine: combine} : this.condition;
diff --git a/frontend/src/business/components/project/MsProject.vue b/frontend/src/business/components/project/MsProject.vue
index 3b29659e73..607914efca 100644
--- a/frontend/src/business/components/project/MsProject.vue
+++ b/frontend/src/business/components/project/MsProject.vue
@@ -136,6 +136,9 @@
           to.path.split('/')[3] === 'create') {
           this.create();
           this.$router.push('/' + this.baseUrl + '/project/all');
+        } else if (this.$route.path.split('/')[2] === 'project' &&
+          to.path.split('/')[3] === 'all') {
+          this.list();
         }
       }
     },
diff --git a/frontend/src/business/components/track/head/TrackHeaderMenus.vue b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
index 9e351fb219..627bdbfe6d 100644
--- a/frontend/src/business/components/track/head/TrackHeaderMenus.vue
+++ b/frontend/src/business/components/track/head/TrackHeaderMenus.vue
@@ -13,7 +13,7 @@
             <template v-slot:title>{{$t('commons.project')}}</template>
             <ms-recent-list :options="projectRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/track/project/all'"/>
+            <ms-show-all :index="'/track/project'"/>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/project/create'" :title="$t('project.create')"/>
           </el-submenu>
 
@@ -22,7 +22,7 @@
             <template v-slot:title>{{$t('test_track.case.test_case')}}</template>
             <ms-recent-list :options="caseRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/track/case/all'"/>
+            <ms-show-all :index="'/track/case'"/>
             <el-menu-item :index="testCaseEditPath" class="blank_item"></el-menu-item>
             <el-menu-item :index="testCaseProjectPath" class="blank_item"></el-menu-item>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/case/create'" :title="$t('test_track.case.create_case')"/>
@@ -32,7 +32,7 @@
             <template v-slot:title>{{$t('test_track.plan.test_plan')}}</template>
             <ms-recent-list :options="planRecent"/>
             <el-divider/>
-            <ms-show-all :index="'/track/plan/all'"/>
+            <ms-show-all :index="'/track/plan'"/>
             <el-menu-item :index="testPlanViewPath" class="blank_item"></el-menu-item>
             <ms-create-button v-permission="['test_manager','test_user']" :index="'/track/plan/create'" :title="$t('test_track.plan.create_plan')"/>
           </el-submenu>