Просмотр исходного кода

层级信息新增第一层级,修改部分页面样式

cfort 2 лет назад
Родитель
Сommit
67119e8fe8

+ 3 - 3
src/assets/styles/theme/theme-base.scss

@@ -27,7 +27,7 @@
   .ibps-layout-header-aside-content {
     @extend %full;
     .ibps-theme-header {
-      height: 60px;
+      height: 50px;
       .ibps-theme-header-menu {
         overflow: hidden;
         &.is-scrollable {
@@ -68,7 +68,7 @@
 		  }
         }
         .ibps-theme-header-menu__prev, .ibps-theme-header-menu__next {
-          height: 60px;
+          height: 50px;
           position: absolute;
           top: 0;
           font-size: 20px;
@@ -201,7 +201,7 @@
       // 顶栏右侧的按钮
       .ibps-header-right {
         float: right;
-        height: 60px;
+        height: 50px;
         display: flex;
         align-items: center;
         .btn-text {

+ 27 - 26
src/assets/styles/theme/theme.scss

@@ -49,12 +49,13 @@
     background: $theme-menu-item-background-color-hover;
   }
   %el-menu-icon {
-    i {
-      display: inline-block;
-      width: 14px;
-      text-align: center;
-      margin-right: 5px;
-    }
+    // 去除主题差异
+    // i {
+    //   display: inline-block;
+    //   width: 14px;
+    //   text-align: center;
+    //   margin-right: 5px;
+    // }
     svg {
       margin: 0px;
       height: 14px;
@@ -176,27 +177,27 @@
         }
       }
     }
-    // zxh 新增
-     .ibps-layout-header-user{
-      width:95px;
-      .user-name-span{
-        display: inline-block;
-        margin-top: 5px;
-        margin-left: 5px;
-        width:45px;
-        color: $theme-header-item-color;
-        .user-name-title{
-          overflow: hidden; 
-          white-space: nowrap;
-          width:42px;
-          color: $theme-header-item-color;
-        }
-      }
-       i.user-dropdown{
-        color: $theme-header-item-color;
-      }
+    // // zxh 新增
+    //  .ibps-layout-header-user{
+    //   width:95px;
+    //   .user-name-span{
+    //     display: inline-block;
+    //     margin-top: 5px;
+    //     margin-left: 5px;
+    //     width:45px;
+    //     color: $theme-header-item-color;
+    //     .user-name-title{
+    //       overflow: hidden; 
+    //       white-space: nowrap;
+    //       width:42px;
+    //       color: $theme-header-item-color;
+    //     }
+    //   }
+    //    i.user-dropdown{
+    //     color: $theme-header-item-color;
+    //   }
  
-    }
+    // }
     
   }
   // [布局] 顶栏下面

+ 1 - 1
src/components/ibps-tree-select/index.vue

@@ -162,7 +162,7 @@ const popperMixin = {
       type: String,
       default: 'bottom-start'
     },
-    appendToBody: Popper.props.appendToBody,
+    appendToBody: false,
     arrowOffset: Popper.props.arrowOffset,
     offset: Popper.props.offset,
     boundariesPadding: Popper.props.boundariesPadding,

+ 5 - 2
src/store/modules/ibps/modules/param.js

@@ -6,7 +6,10 @@ export default {
         // 所有用户信息
         usersList: [],
         // 当前用户层级
-        level: ''
+        level: {
+            first: '',
+            second: ''
+        }
     },
     mutations: {
         myformSet (state, myform) {
@@ -16,7 +19,7 @@ export default {
             state.usersList = data.length ? data : []
         },
         level (state, data) {
-            state.level = data || ''
+            state.level = data || { first: '', second: '' }
         }
     },
     actions: {

+ 4 - 1
src/store/modules/ibps/modules/user.js

@@ -74,7 +74,10 @@ export default {
                             root: true
                         })
                         if (info.positions && info.positions.length) {
-                            const level = [...new Set(info.positions.map(obj => obj.path ? obj.path.split('.')[1] : '').filter(Boolean))].join(',')
+                            const level = {
+                                first: [...new Set(info.positions.map(obj => obj.path ? obj.path.split('.')[0] : '').filter(Boolean))].join(','),
+                                second: [...new Set(info.positions.map(obj => obj.path ? obj.path.split('.')[1] : '').filter(Boolean))].join(',')
+                            }
                             await dispatch('ibps/param/setLevel', level, {
                                 root: true
                             })