Merge branch 'develop' of gitadmin/tuoheng_pilot_web into release

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()

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