Merge remote-tracking branch 'origin/visu_forest_0_1' into visu_forest_0_1

src/assets/styles/base.scss

@@ -822,8 +822,8 @@ div::-webkit-scrollbar {
 
           .el-collapse-item__arrow {
             color: $inBlue;
-            position: relative;
-            left: -20.5rem;
+            position: absolute;
+            left: 1rem;
             margin: 0;
           }
 
@@ -1127,8 +1127,8 @@ div::-webkit-scrollbar {
 
           .el-collapse-item__arrow {
             color: $inBlue;
-            position: relative;
-            left: -20.5rem;
+            position: absolute;
+            left: 1rem;
             margin: 0;
           }
 
@@ -1792,8 +1792,8 @@ div::-webkit-scrollbar {
 
     .el-collapse-item__arrow {
       color: $inBlue;
-      position: relative;
-      left: -20.5rem;
+      position: absolute;
+      left: 1rem;
       margin: 0;
     }
 
@@ -2160,13 +2160,16 @@ div::-webkit-scrollbar {
     max-width: 90%;
   }
 
+
   .d-l-l-text {
     display: flex;
     align-items: center;
     flex: 1;
     color: $fListTitle;
     padding: .2rem;
-
+    .el-tooltip__popper{
+		width: 100px;
+	}
     h4 {
       font-size: .7rem;
       margin: 0;

src/views/leader.vue

@@ -79,7 +79,10 @@
                     <template slot="title">
                       <div class="d-l-con sj-collapse" @click="getRecordList(item.id, item.personId)">
                         <div class="d-l-l-text">
-                          <h4 class="collapse-title">{{ item.name }}</h4>
+                           <el-tooltip class="item" effect="dark"  placement="left" style="width:10rem ;">
+							   <div slot="content" v-if="item.name.length > 20"><h4 class="collapse-title" style="width: 200px;">{{ item.name}}</h4></div>
+                                <h4 class="collapse-title" style="width: 100px;">{{ item.name | ellipsis20}}</h4>
+                           </el-tooltip>
                         </div>
                         <div class="d-l-l-count">({{ item.recordCount }}-{{ item.planCount }})</div>
                       </div>
@@ -466,7 +469,22 @@ export default {
         }]
       })
     }
-  }
+		
+		
+  },
+  //过滤器
+  
+  filters: {
+  
+  	//标题截取前20
+  	ellipsis20(value) {
+  		if (!value) return '';
+  		if (value.length > 20) {
+  			return value.slice(0, 20) + '...'
+  		}
+  		return value
+  	}
+  },
 
 }
 </script>