浏览代码

Merge branch 'yufei' of gitadmin/tuoheng_pilot_web into develop

pull/104/head
yufei111 1年前
父节点
当前提交
11c6f73912
共有 2 个文件被更改,包括 3 次插入2 次删除
  1. +1
    -0
      src/router/guard/permission-guard.js
  2. +2
    -2
      src/views/system-manage/role-manage/components/AuthModal.vue

+ 1
- 0
src/router/guard/permission-guard.js 查看文件

@@ -5,6 +5,7 @@ import { getUserInfo, signinRedirect, signoutRedirect } from '@/utils/oidc/index

export function createPermissionGuard(router) {
const userStore = useUserStore()
userStore.getUserInfos()
const permissionStore = usePermissionStore()
router.beforeEach(async(to, from, next) => {
const oidcUser = await getUserInfo()

+ 2
- 2
src/views/system-manage/role-manage/components/AuthModal.vue 查看文件

@@ -9,7 +9,7 @@
<n-tabs type="line" animated>
<n-tab-pane display-directive="show" name="pc" tab="管理端菜单">
<n-tree
v-if="tabsTreeVisible"
v-show="tabsTreeVisible"
ref="adminTreeRef"
block-line
cascade
@@ -24,7 +24,7 @@
</n-tab-pane>
<n-tab-pane display-directive="show" name="mp" tab="小程序菜单">
<n-tree
v-if="tabsTreeVisible"
v-show="tabsTreeVisible"
ref="miniTreeRef"
block-line
cascade

正在加载...
取消
保存