sunlupeng 1 rok temu
rodzic
commit
dd6e2a42fb

+ 1 - 1
src/assets/styles/index.scss

@@ -127,7 +127,7 @@ aside {
   overflow: auto;
   position: absolute;
   right: 0;
-  top:50px;
+  top:60px;
 }
 
 .components-container {

+ 8 - 7
src/components/AppList/index.vue

@@ -45,6 +45,12 @@ export default {
             //   title: '自定义应用',
             //   icon: 'zidingyi',
             // },
+            {
+              type: 3,
+              path: '/system/companyInfo',
+              title: '系统管理',
+              icon: 'chuchai',
+            },
             {
               type: 1,
               path: '/oa/entry',
@@ -69,14 +75,9 @@ export default {
               title: '离职申请',
               icon: 'chuchai',
             },
+           
             {
-              type: 3,
-              path: '/system/companyInfo',
-              title: '系统管理',
-              icon: 'chuchai',
-            },
-            {
-              type: 3,
+              type: 4,
               path: '/meeting/list',
               title: '会议室管理',
               icon: 'chuchai',

+ 13 - 13
src/layout/components/Homebar.vue

@@ -159,19 +159,19 @@ export default {
               "alwaysShow": true,
               "children": null
             },
-            // {
-            //   "id": 102,
-            //   "parentId": 1,
-            //   "name": "菜单管理",
-            //   "path": "menu",
-            //   "component": "system/menu/index",
-            //   "componentName": "SystemMenu",
-            //   "icon": "tree-table",
-            //   "visible": true,
-            //   "keepAlive": true,
-            //   "alwaysShow": true,
-            //   "children": null
-            // },
+            {
+              "id": 102,
+              "parentId": 1,
+              "name": "菜单管理",
+              "path": "menu",
+              "component": "system/menu/index",
+              "componentName": "SystemMenu",
+              "icon": "tree-table",
+              "visible": true,
+              "keepAlive": true,
+              "alwaysShow": true,
+              "children": null
+            },
             {
               "id": 103,
               "parentId": 1,

+ 5 - 5
src/layout/components/Navbar.vue

@@ -73,7 +73,7 @@ import RuoYiGit from '@/components/RuoYi/Git'
 import RuoYiDoc from '@/components/RuoYi/Doc'
 import NotifyMessage from '@/layout/components/Message'
 import {getPath} from "@/utils/ruoyi";
-
+import router from '@/router'
 export default {
   components: {
     Breadcrumb,
@@ -241,7 +241,7 @@ export default {
 <style lang="scss" scoped>
 .fx-entry-title {
     float: left;
-    line-height: 46px;
+    line-height: 56px;
     align-items: center;
     display: flex;
     max-width: 330px;
@@ -255,14 +255,14 @@ export default {
   }
 }
 .navbar {
-  height: 50px;
+  height: 60px;
   overflow: hidden;
   position: relative;
   background: #fff;
   box-shadow: 0 1px 4px rgba(0,21,41,.08);
 
   .hamburger-container {
-    line-height: 46px;
+    line-height: 56px;
     height: 100%;
     float: left;
     cursor: pointer;
@@ -291,7 +291,7 @@ export default {
   .right-menu {
     float: right;
     height: 100%;
-    line-height: 50px;
+    line-height: 60px;
 
     &:focus {
       outline: none;