Merge branch 'master' of http://42.192.7.176:3000/suojin/jonhon-mes-web

src/page/index/index.vue

@@ -2,7 +2,7 @@
   <el-watermark :content="watermark" style="height: 100%">
     <div class="avue-contail" :class="{ 'avue--collapse': isCollapse }">
       <div class="avue-layout" :class="{ 'avue-layout--horizontal': isHorizontal }">
-        <div class="avue-sidebar" v-show="validSidebar" :style="{width:setting.styleRadio == '3' && '185px'}" :class="setting.styleRadio=='2'?'styleRadio':''">
+        <div class="avue-sidebar" v-show="validSidebar" :style="{width:setting.styleRadio == '3' && '195px'}" :class="setting.styleRadio=='2'?'styleRadio':''">
           <!-- 左侧导航栏 -->
           <logo v-if="setting.styleRadio == '1'||setting.styleRadio == '3'" />
           <sidebar />

src/page/index/sidebar/index.vue

@@ -8,9 +8,15 @@
     <div :class="leftMenu.find(item => item.children) ? 'children' : 'no_child'">
       <div class="left_menu" @click="clickItem(item, index)" v-for="(item, index) in leftMenu" :key="item.id"
         :class="index == selectIndex ? 'active' : ''">
+        <el-tooltip v-if="item.name && item.name.length > 4" class="item" effect="dark" :content="item.name" placement="right-start">
           <div class="left_menu_item">
             <i :class="item.source" style="margin-bottom: 5px;"></i>
-          {{ item.name }}
+                <span class="name_text">{{ item.name }}</span>
+          </div>
+        </el-tooltip>
+        <div class="left_menu_item" v-else>
+          <i :class="item.source" style="margin-bottom: 5px;"></i>
+              <span class="name_text">{{ item.name }}</span>
         </div>
       </div>
     </div>
@@ -145,6 +151,16 @@ export default {
     overflow: hidden;
     text-overflow: ellipsis;
 
+    .name_text{
+      display: inline-block;
+      width: 52px;
+      overflow: hidden;
+      text-overflow: ellipsis;  /* 超出宽度200px后显示省略号 */
+      white-space: nowrap;  /* 限制不允许换行 */
+    }
+
+    
+
     &:hover {
       background: #0066ff;
       color: #fff;