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

# Conflicts:
#	src/views/monitor.vue

src/views/monitor.vue

@@ -226,6 +226,7 @@ export default {
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
+    this.selectDeviceType(-1)
     this.selectKeyAreaList()
     this.bottomMenuList() //获取底部公共组件消息和任务
     this.getTreeselect()
@@ -912,6 +913,10 @@ export default {
         }
       })
     },
+    //查询监测设备List
+    selectMonitoringEquipmentList(){
+
+    },
     dropLocation(lat, lng, index) {
       this.listCurrentIndex2 = index
       this.$refs.supermap.dropLocation(lat, lng)