diff --git a/src/compenents/left-menu/index.tsx b/src/compenents/left-menu/index.tsx index 7c9cfde..04ef101 100644 --- a/src/compenents/left-menu/index.tsx +++ b/src/compenents/left-menu/index.tsx @@ -59,6 +59,16 @@ const items = [ ], null ), + getItem( + "系统设置", + "7", + , + [ + getItem("管理人员", "/system/administrator", null, null, null), + getItem("角色配置", "/system/adminroles", null, null, null), + ], + null + ), ]; const children2Parent: any = { diff --git a/src/pages/home/index.module.less b/src/pages/home/index.module.less index 7b8a0e9..7c49d81 100644 --- a/src/pages/home/index.module.less +++ b/src/pages/home/index.module.less @@ -1,12 +1,14 @@ .layout-wrap { width: 100%; - height: 100vh; + height: 100%; display: flex; .left-menu { width: 200px; + height: auto; + float: left; } .right-cont { - width: calc(100% - 200px); + flex:1; display: flex; flex-direction: column; .right-top { @@ -15,6 +17,7 @@ } .right-main { width: 100%; + height: auto; box-sizing: border-box; -moz-box-sizing: border-box; /* Firefox */