From a66741406f6241dc666671af59ef3eb6d85cc58a Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 30 Sep 2020 14:07:09 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E4=BF=AE=E5=A4=8D=E9=87=8D=E5=A4=8D?=
 =?UTF-8?q?=E7=82=B9=E5=87=BB=E5=AF=BC=E8=88=AA=E8=B7=AF=E7=94=B1=E6=8A=A5?=
 =?UTF-8?q?=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/common/components/MsTableHeader.vue         | 4 ++--
 frontend/src/business/components/common/router/router.js   | 7 +++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/frontend/src/business/components/common/components/MsTableHeader.vue b/frontend/src/business/components/common/components/MsTableHeader.vue
index e48db2f2b0..3caf914e37 100644
--- a/frontend/src/business/components/common/components/MsTableHeader.vue
+++ b/frontend/src/business/components/common/components/MsTableHeader.vue
@@ -7,15 +7,15 @@
       </slot>
     </el-row>
     <el-row type="flex" justify="space-between" align="middle">
+      <template v-slot:button>
       <span class="operate-button">
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showCreate" icon="el-icon-circle-plus-outline"
                          :content="createTip" @click="create"/>
         <ms-table-button :is-tester-permission="isTesterPermission" v-if="showRun" icon="el-icon-video-play"
                          type="primary"
                          :content="runTip" @click="runTest"/>
-
-        <slot name="button"></slot>
       </span>
+      </template>
       <span>
         <ms-table-search-bar :condition.sync="condition" @change="search" class="search-bar" :tip="tip"/>
         <ms-table-adv-search-bar :condition.sync="condition" @search="search" v-if="isCombine"/>
diff --git a/frontend/src/business/components/common/router/router.js b/frontend/src/business/components/common/router/router.js
index da7d79e786..f5821015c4 100644
--- a/frontend/src/business/components/common/router/router.js
+++ b/frontend/src/business/components/common/router/router.js
@@ -41,6 +41,13 @@ router.beforeEach((to, from, next) => {
   }
 });
 
+//重复点击导航路由报错
+const routerPush = VueRouter.prototype.push;
+VueRouter.prototype.push = function push(location) {
+  return routerPush.call(this, location).catch(error => error)
+}
+
+
 // 登入后跳转至原路径
 function redirectLoginPath(originPath) {
   let redirectUrl = sessionStorage.getItem('redirectUrl');