Merge branch 'dev' into ChronicMag_zxc

src/components/common/Menu.vue

@@ -12,7 +12,7 @@
                     <i class="el-icon-location"></i>
                     <span>{{item.name}}</span>
                 </template>
-                <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code">{{sub.name}}</el-menu-item>
+                <el-menu-item v-for="(sub,i) in item.subMenuList" :index="'/'+role+'/'+sub.code"><p>{{sub.name}}</p></el-menu-item>
             </el-submenu>
         </template>
     </el-menu>
@@ -41,7 +41,14 @@
 </script>
 
 <style lang="less" scoped>
-  .el-menu-vertical-demo {
+    .el-menu-item p{
+        display: table-cell;
+        vertical-align: middle;
+        white-space: normal;
+        line-height: 20px;
+        height: 50px;
+    }
+  /*.el-menu-vertical-demo {
     min-width: 300px;
-  }
+  }*/
 </style>

src/less/common.less

@@ -7,6 +7,7 @@
 /*公共变量*/
 @disableColor: #ccc;
 @aside-width: 20%;
+@aside-min-width:270px;
 @header-height: 60px;
 @gray: #c9c9c9;
 @baseBackage: #dee2ea;
@@ -37,13 +38,14 @@
 
 .el-aside {
   background: #fff;
+  min-width: @aside-min-width;
   width: @aside-width !important;
   min-height: 220px;
   border-right: 1px @gray solid;
   height: 100%;
   .logo {
-    width: 100%;
-    min-width: 300px;
+    /*width: 100%;
+    min-width: 300px;*/
     text-align: center;
     color: #fff;
     height: @header-height;