Merge branch 'qin_26' into power_master

src/permission.ts

@@ -31,7 +31,7 @@ router.beforeEach(async (to:any, from:any, next:any) => {
 		} else {
       const userStore = useUserStoreHook();
       const hasRoles = userStore.roles && userStore.roles.length > 0;
-			// console.log("如果已登录，跳转首页",hasRoles)
+			console.log("如果已登录，跳转首页",hasRoles)
       if (hasRoles) {
         // 未匹配到任何路由，跳转404
         if (to.matched.length === 0) {

src/store/modules/permission.ts

@@ -108,9 +108,9 @@ export const usePermissionStore = defineStore("permission", () => {
           console.log("获取到的路由--roles-->",roles);
           const accessedRoutes = filterAsyncRoutes(asyncRoutes, roles);
 
-          // console.log("获取到的路由--1-->",accessedRoutes);
+          console.log("获取到的路由--1-->",accessedRoutes);
 
-          // console.log("获取到的路由--2-->",roles);
+          console.log("获取到的路由--2-->",roles);
 
           setRoutes(accessedRoutes);
           resolve(accessedRoutes);

src/views/system/monitor/online/index.vue

@@ -587,7 +587,7 @@ onMounted(()=>{
                     >
                         <template #default="{ node }" >
                             <div class="treeRoleBox">
-                                <span>{{ node.label }}</span>
+                                <span><svg-icon v-if="node.data.types == 2" icon-class="zzqz" style="margin-right: 10px;" /><svg-icon v-else icon-class="zhqxgl" style="margin-right: 10px;" />{{ node.label }}</span>
                                 <div class="spanButBox">
                                     <el-dropdown trigger="click">
                                        <svg-icon icon-class="xiala1"  style="margin-right: 20px;" />
@@ -831,13 +831,13 @@ onMounted(()=>{
         width: 100%;
         align-items: center;
         svg{
-            display: none;
+            display: black;
             margin: 0 5px 0 auto;
         }
         
     }
     .treeRoleBox:hover svg{
-        display: block;
+        // display: block;
     }