Merge branch 'dev-lhf' into 'dev'

Dev lhf

See merge request product-group-fe/sfy-safety-group/sfy-safety!52

src/components/Nav.vue

@@ -45,6 +45,7 @@
   import { useUserStore } from '@/store/modules/user';
   import SwitchTenant from '@/layout/components/SwitchTenant.vue';
   import { SYS_TENANT_ID } from '@/utils/useTargetTenantIdSetting';
+  import { ElMessage } from 'element-plus';
 
   const userStore = useUserStore();
   const activeNav = ref(NAV_LIST[0].name);
@@ -69,7 +70,10 @@
   const { title } = useGlobSetting();
 
   const handleNavClick = (item: { name: string; path: string }) => {
-    if (!item.path) return;
+    if (!item.path) {
+      ElMessage.warning(`${item.name}功能建设中，暂无法访问`);
+      return;
+    }
     activeNav.value = item.name;
     router.push(item.path);
   };

src/router/router-icons.ts

@@ -62,4 +62,8 @@ export const constantRouterIcon = {
   DisasterWarningIcon: renderSvg('disaster-warning'),
   DisasterControlIcon: renderSvg('disaster-control'),
   DisasterPrecaution: renderSvg('disaster-precaution'),
+  UserManageIcon: renderSvg('user-manage'),
+  MenuManageIcon: renderSvg('menu-manage'),
+  PermissionManageIcon: renderSvg('permission-manage'),
+  DictManageIcon: renderSvg('dict-manage'),
 };

src/views/system/menu/menu.vue

@@ -20,7 +20,7 @@
                   </template>
                 </el-button>
 
-                <el-button type="primary" plain icon-placement="left" @click="packHandle">
+                <el-button type="primary" icon-placement="left" @click="packHandle">
                   全部{{ expandedKeys.length ? '收起' : '展开' }}
                   <template #icon>
                     <div class="flex items-center">

src/views/system/permission/PagePermission.vue

@@ -22,7 +22,7 @@
                   </template>
                 </el-button>
 
-                <el-button type="primary" plain icon-placement="left" @click="packHandle">
+                <el-button type="primary" icon-placement="left" @click="packHandle">
                   全部{{ expandedKeys.length ? '收起' : '展开' }}
                   <template #icon>
                     <div class="flex items-center">