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

# Conflicts:
#	src/views/forest.vue

src/assets/styles/base.scss

@@ -86,8 +86,8 @@ $date-state3: #d6333b;
 }
 //电视墙视频摄像头预览弹层样式
 .TVWallCustomWidth {
-  width: 1150px !important;
-  height: 700px !important;
+  width: 1200px !important;
+  height: 750px !important;
 }
 
 //公共

src/components/vBottomMenu.vue

@@ -58,7 +58,7 @@
                 <!--                  v-model="filterbanText">-->
                 <!--                </el-input>-->
                 <el-tree :data="deptBanOptionsLiandong" ref="banDept" node-key="id"  :check-strictly="true"
-                         :filter-node-method="filterbanNode" @node-click="handlebanNodeClick" :accordion="true" empty-text="加载中，请稍候"
+                         :filter-node-method="filterbanNode" @node-click="handlebanNodeClick" :accordion="true" empty-text=""
                          :props="defaultProps"></el-tree>
               </div>
               <div class="forestban-right">
@@ -421,11 +421,11 @@ export default {
           icon: 'iconfont sj-icon-sjdw',
           click: 'eventLocation'
         },
-        {
-          name: '图层切换',
-          icon: 'iconfont sj-icon-tcqh',
-          click: 'layerSwitching'
-        },
+        // {
+        //   name: '图层切换',
+        //   icon: 'iconfont sj-icon-tcqh',
+        //   click: 'layerSwitching'
+        // },
         {
           name: '测量工具',
           icon: 'iconfont sj-icon-clgj',

src/views/forest.vue

@@ -1171,7 +1171,6 @@ export default {
         // 处理收到的消息
         this.handleWebSoceketEvent(e.data)
 
-
         this.getTodayEvents(this.getCurrentDataStr(), true);
         this.getDeptEventCount(this.getCurrentDataStr(), true);
         this.getEventByEventType(this.getCurrentDataStr(), true);
@@ -1270,6 +1269,7 @@ export default {
             this.$refs.bottomMenu.showChild = false
           }
         } else if (click == 'TVWall') {
+          console.log("this.$refs.TVWall=",this.$refs.TVWall)
           this.$refs.TVWall.showTVWall();
           this.$refs.supermap.isEditableLayers = false
           this.$refs.bottomMenu.showChild = false