From 83469090ddfac504174bb40985753667d4e3338a Mon Sep 17 00:00:00 2001
From: Jason <5340635+wen-jason@user.noreply.gitee.com>
Date: Mon, 19 Sep 2022 12:12:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AD=97=E5=85=B8=E6=95=B0=E6=8D=AE=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E8=AE=BF=E9=97=AEbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 admin/src/router/index.ts                   |  4 ++--
 admin/src/views/setting/dict/type/index.vue | 17 +++++++----------
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/admin/src/router/index.ts b/admin/src/router/index.ts
index 283e0f8b..91b6f880 100644
--- a/admin/src/router/index.ts
+++ b/admin/src/router/index.ts
@@ -86,8 +86,8 @@ export function findFirstValidRoute(routes: RouteRecordRaw[]): string | undefine
 }
 //通过权限字符查询路由路径
 export function getRoutePath(perms: string) {
-    const router = useRouter()
-    return router.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
+    const routerObj = useRouter() || router
+    return routerObj.getRoutes().find((item) => item.meta?.perms == perms)?.path || ''
 }
 
 // 重置路由
diff --git a/admin/src/views/setting/dict/type/index.vue b/admin/src/views/setting/dict/type/index.vue
index 100792d0..50c55e07 100644
--- a/admin/src/views/setting/dict/type/index.vue
+++ b/admin/src/views/setting/dict/type/index.vue
@@ -80,20 +80,17 @@
                                 >
                                     编辑
                                 </el-button>
-                                <el-button
-                                    v-perms="['setting:dict:data:list']"
-                                    type="primary"
-                                    link
-                                    @click="
-                                        $router.push({
+                                <el-button v-perms="['setting:dict:data:list']" type="primary" link>
+                                    <router-link
+                                        :to="{
                                             path: getRoutePath('setting:dict:data:list'),
                                             query: {
                                                 type: row.dictType
                                             }
-                                        })
-                                    "
-                                >
-                                    数据管理
+                                        }"
+                                    >
+                                        数据管理
+                                    </router-link>
                                 </el-button>
                                 <el-button
                                     v-perms="['setting:dict:type:del']"