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

src/api/bigdata.js

@@ -187,10 +187,11 @@ export function selectCenterdataTForestResourcesSum() {
   })
 }
 //车辆信息统计
-export function selectCarCount() {
+export function selectCarCount(data) {
   return request({
     url: '/center-fire/VisuForestCloudBigDataController/selectCarCount',
-    method: 'get'
+    method: 'get',
+    params:data
   })
 }
 // 防火设备统计

src/api/leader.js

@@ -15,34 +15,20 @@ export function getForestLeader(linJob,linType) {
     method: 'get',
   })
 }
-// 点击左侧人员列表获取轨迹
-export function getLeaderTrack(trackById) {
-  return request({
-    url: '/center-fire/VisuForestLeaderController/getLeaderTrack?trackById='+trackById,
-    method: 'get',
-  })
-}
 
-// 点击左侧人员获取人员的巡林计划
-export function getRemotelist() {
+// 巡林任务
+export function getPlanList(userId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getRemotelist',
-    method: 'get',
-  })
-}
-
-// 巡林计划
-export function getPlanList(personId) {
-  return request({
-    url: '/center-fire/VisuForestLeaderController/getPlanList?personId='+personId,
-    method: 'get',
+    url: '/center-data/task/getPlanList',
+    method: 'post',
+    data: {userId:userId,type:'1'}
   })
 }
 
 // 巡林记录
-export function getRecordList(planId, personId) {
+export function getRecordList(taskId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getRecordList?planId='+planId+'&personId='+personId,
+    url: '/center-data/record/list?taskId='+taskId,
     method: 'get',
   })
 }
@@ -50,7 +36,7 @@ export function getRecordList(planId, personId) {
 // 巡林轨迹
 export function getPointList(recordId) {
   return request({
-    url: '/center-fire/VisuForestLeaderController/getPointList?recordId='+recordId,
+    url: '/center-data/track/getTrack/'+recordId.toString(),
     method: 'get',
   })
 }

src/api/monitor.js

@@ -29,3 +29,11 @@ export function getRegionalFlag(id) {
     method: 'get',
   })
 }
+// // 查询部门经纬度在摄像头半径范围内的摄像头列表(暂时不用 但不要删除)
+// export function findCameraByDept(deptId) {
+//   return request({
+//     url: '/center-fire/VisuForestEventCenterController/findCameraByDept',
+//     method: 'post',
+//     data: {deptId:deptId,type:'1'}
+//   })
+// }

src/components/wrj.vue

@@ -0,0 +1,290 @@
+<template>
+  <div>
+    <el-dialog title="无人机" customClass="TVWallCustomWidth" @close="cancelEventLocationShow()">
+      <div id="dom1" class="dom1"></div>
+    </el-dialog>
+  </div>
+</template>
+
+<script>
+/** ----------------------------------摄像头预览开始------------------------------------- */
+import DHWs from '@/dahua/lib/DHWs'
+
+/** ----------------------------------摄像头预览结束------------------------------------- */
+export default {
+  dicts: ['event_source'],
+  components: {},
+  data() {
+    return {
+      TVWallVisible:false,
+      isShowTipe: true,
+    }
+  },
+  created() {
+    const DHWsInstance = DHWs.getInstance();
+    this.ws = DHWsInstance;
+  },
+  methods: {
+    cancelEventLocationShow() {
+      // this.activeName = 'tv'
+      this.TVWallVisible = false
+      this.destroy()
+
+      if (this.oWebControl != null) {
+        this.oWebControl.JS_HideWnd()   // 先让窗口隐藏，规避可能的插件窗口滞后于浏览器消失问题
+        this.oWebControl.JS_Disconnect().then(function() {  // 断开与插件服务连接成功
+          },
+          function() {  // 断开与插件服务连接失败
+          })
+      }
+    },
+    destroy() { // 调用销毁控件接口
+      if (!this.isLogin) {
+        this.$modal.msgWarning('正在登陆客户端，请稍等......')
+        return false
+      }
+      const ctrls = this.ws.ctrls.map(i => {
+        if (i.ctrlCode === this.ctrl) {
+          return i.ctrlCode
+        }
+      })
+      this.ws.destroyCtrl(ctrls)
+    },
+    showWrj() {
+      this.ws.addEventListener('connectStateChange', data => {
+        if (data) {
+          console.log('连接成功')
+        } else {
+          console.log('连接失败，下载客户端')
+          this.alertReinstall()
+          this.isShowTipe && this.$modal.confirm({
+            title: '下载客户端',
+            content: '检测到您未安装部分插件,将影响部分功能使用，请下载后使用？',
+            onOk: () => {
+              //这里写下载方法
+              this.isShowTipe = false
+            },
+            onCancel: () => {
+              this.isShowTipe = false
+            }
+          });
+        }
+      })
+      this.preview()
+      this.TVWallVisible = true
+    },
+    /** ----------------------------------大华摄像头预览开始------------------------------------- */
+    alertLogin: function() {
+      this.$modal.msg('登录中....')
+    },
+    alertLoginSuccess: function() {
+      this.$modal.msgSuccess('登录成功！')
+    },
+    alertLoginFailed: function() {
+      this.$modal.msgError('登陆失败！')
+    },
+    alertReinstall: function() {
+      this.$modal.msgWarning('请重新安装客户端')
+    },
+    /** 预览按钮操作 */
+    preview() {
+      //这里写 无人机预览方法
+      let channelCode = []
+      channelCode.push("22060100001320100001")
+      this.ws.detectConnectQt().then(res => {
+        if (res) { // 连接客户端成功
+          this.alertLogin()
+          this.ws.login({
+            loginIp: '211.141.61.228',
+            loginPort: 7902,
+            userName: 'system',
+            userPwd: 'Admin123',
+            token: '',
+            https: 1
+          })
+          this.ws.on('loginState', (res) => {
+            this.isLogin = res
+            console.log('---res-----', res)
+            if (res) {
+              this.alertLoginSuccess()
+              this.activePanel = 'key2'
+              this.realTimeVideoDialog(channelCode);
+            } else {
+              this.alertLoginFailed()
+            }
+          })
+        } else { // 连接客户端失败
+          this.alertReinstall()
+        }
+      })
+      /** 摄像头预览方法结束 **/
+    },
+    realTimeVideoDialog(cameraParams) { // 调用弹窗实时播放接口
+      if (!this.isLogin) {
+        this.$Message.info('正在登陆客户端，请稍等......')
+        return false
+      }
+      this.ws.openVideo(cameraParams)
+    },
+    /** ----------------------------------大华摄像头预览结束------------------------------------- */
+  }
+}
+</script>
+
+<style rel="stylesheet/scss" lang="scss" scoped>
+@import '@/assets/styles/base.scss';
+
+.event-info-con {
+  width: 100%;
+  display: flex;
+
+  .e-left {
+    width: 32%;
+  }
+
+  .e-center {
+    width: 30%;
+    margin-left: 1%;
+
+    .img-company {
+      width: 100%;
+      height: 18.3vh;
+
+      img {
+      }
+    }
+  }
+
+  .e-right {
+    margin-left: 1%;
+    width: 45%;
+  }
+
+  .e-location-left {
+    width: 28%;
+    margin-top: 1rem;
+  }
+
+  .e-location-right {
+    width: 71%;
+    margin-top: 1.3rem;
+    margin-left: 1rem;
+  }
+}
+
+.el-dialog:not(.is-fullscreen) {
+  margin-top: 5.5vh !important;
+}
+
+.bottom-menu-normal {
+  max-width: 90%;
+  padding: 0 3rem;
+  position: absolute;
+  left: 50%;
+  transform: translateX(-50%);
+  bottom: 0;
+  z-index: 100000;
+  border-radius: 5px;
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  background: url(../assets/images/integrated/btm-menu.png) center no-repeat;
+  background-size: cover;
+  overflow: hidden;
+
+  .btm-m-con {
+    position: relative;
+    color: $inBlue;
+    font-size: .5rem;
+    padding: 1rem 1.5rem;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    -webkit-transform: translateY(0);
+    transform: translateY(0);
+    transition: all 0.2s ease-in-out;
+    cursor: pointer;
+    white-space: nowrap;
+
+    i {
+      font-size: 1rem;
+      color: $inBlue;
+      text-shadow: 0 0 10px rgba($color: $inBlue, $alpha: .6);
+      margin-right: 0.2rem;
+    }
+  }
+
+  .btm-m-con:hover {
+    text-shadow: 0 0 20px rgba($color: $inBlueHover, $alpha: 1.0);
+    filter: brightness(2.3);
+    -webkit-transform: translateX(0.2rem);
+    transform: translateX(0.2rem);
+    transition: all 0.2s ease-in-out;
+
+    i {
+      color: $inBlueHover;
+      text-shadow: 0 0 20px rgba($color: $inBlueHover, $alpha: 1.0);
+    }
+  }
+
+  .m-l-none {
+    .el-input__inner {
+      margin-left: 0 !important;
+    }
+  }
+
+}
+
+/*海康*/
+html, body {
+  padding: 0;
+  margin: 0;
+}
+
+.playWnd {
+  margin: -13px 0 0 255px;
+  width: 850px; /*播放容器的宽和高设定*/
+  height: 615px;
+  border: 1px solid red;
+}
+
+.operate {
+  margin-top: 24px;
+}
+
+.operate::after {
+  content: '';
+  display: block;
+  clear: both;
+}
+
+.module {
+  float: left;
+  width: 340px;
+  /*min-height: 320px;*/
+  margin-left: 16px;
+  padding: 16px 8px;
+  box-sizing: border-box;
+  border: 1px solid #e5e5e5;
+}
+
+.module .item {
+  margin-bottom: 4px;
+}
+
+.module input[type="text"] {
+  box-sizing: border-box;
+  display: inline-block;
+  vertical-align: middle;
+  margin-left: 0;
+  width: 150px;
+  min-height: 20px;
+}
+
+.module .btn {
+  min-width: 80px;
+  min-height: 24px;
+  margin-top: 100px;
+  margin-left: 80px;
+}
+</style>

src/views/afforestation.vue

@@ -109,11 +109,13 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     this.getInit();
     this.listPublishTask();
+    this.bottomMenuList() //获取底部公共组件消息和任务
   },
   data() {
     return {
@@ -139,6 +141,10 @@ export default {
 
   methods: {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -199,6 +205,10 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
+    },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
 
     getInit() {

src/views/animal.vue

@@ -174,15 +174,21 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     // this.getInit();
     this.getAnimalRemotelist();
     this.selectAnimalCountByType();
+    this.bottomMenuList() //获取底部公共组件消息和任务
   },
   methods: {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -243,6 +249,10 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
+    },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     selectAnimalCountByType(){
       selectAnimalCountByType().then(res => {

src/views/bigdata/bigdata.vue

@@ -372,7 +372,6 @@ export default {
 
       getEventInfoList(){
         getEventInfoList().then(res => {
-          debugger
           for(let i in res.data){
             const data = [];
             data.push(res.data[i].areaTotal);

src/views/bigdata/chart-pit.vue

@@ -26,7 +26,7 @@
 
     methods: {
       selectCarCount(){
-        selectCarCount().then(resp => {
+        selectCarCount({areaType:"1"}).then(resp => {
           this.myEcharts(resp.data);
         })
       },

src/views/bigdata/tabbar.vue

@@ -132,12 +132,15 @@
     },
 
     methods: {
-
       zhxx() {
         let that = this
         getZhxx().then(resp => {
-          console.log("hhh",resp)
-          that.regionNum = resp.data.data
+          that.regionNum = [];
+          that.regionNum.push(...resp.data.event)
+          that.regionNum.push(...resp.data.data)
+          for(let i in resp.data.device){
+            that.regionNum.push({value: resp.data.device[i].deviceCount,name: resp.data.device[i].deviceName})
+          }
         })
       },
 

src/views/datacenter.vue

@@ -100,10 +100,12 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     this.getResource()
+    this.bottomMenuList() //获取底部公共组件消息和任务
   },
   data() {
     return {
@@ -134,6 +136,10 @@ export default {
 
   methods: {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -194,6 +200,10 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
+    },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     //数据分布chart
     dataChat() {

src/views/disaster.vue

@@ -356,10 +356,12 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     this.getInit()
+    this.bottomMenuList() //获取底部公共组件消息和任务
   },
   data() {
     return {
@@ -446,6 +448,10 @@ export default {
 
   methods: {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -506,6 +512,10 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
+    },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     choseFireList(id,eventId, index) {
       this.listCurrentIndex = index

src/views/eventdetailsdialog.vue

@@ -192,7 +192,7 @@
                                   <el-button size="small"
                                              icon="el-icon-s-flag"
                                              @click="updateCentereventTEventcatalogueStatus('qs',false)">
-                                    签收
+                                    派发
                                   </el-button>
                                   <!--<el-button size="small"-->
                                              <!--icon="el-icon-question"-->
@@ -285,7 +285,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'">
+        <el-form-item label="事件类型" v-if="eventStatusButton=='qs'&& eventTypeXl == null">
           <el-select v-model="sendEventType" placeholder="请选择事件类型！" clearable>
             <el-option
               v-for="item in eventTypeList"
@@ -1039,6 +1039,12 @@ export default {
   data() {
     return {
       showFindUserByDept: false,//责任人选择框
+      /** ----------------------------------摄像头预览开始------------------------------------- */
+      //大华
+      activePanel: 'key1',
+      isLogin: false,
+      cameraParams: [],
+      ws: null,
       //海康
       cameraTitle: '',
       cameraCode:'',
@@ -1046,7 +1052,7 @@ export default {
       initCount: 0,
       pubKey: '',
       oWebControl: null,
-
+      /** ----------------------------------摄像头预览结束------------------------------------- */
       playVideo: '',//视频预览地址
       showTcPlayer: false,//视频预览弹窗
       regionalFlagOpen: false,//区域标记
@@ -1180,6 +1186,7 @@ export default {
       eventName: null,
       longitude: null,
       latitude: null,
+      eventTypeXl:null,
       eventLog: null,
       eventLogList: [],
       visuForestCloudYuAnBo: null,
@@ -1421,11 +1428,11 @@ export default {
                 click: '',
                 parameter: '',
                 keepBindPopup: false,
-                isAggregation: false
-              }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
+                isAggregation: true
               }
+              // if (res.data.length > 50) {
+              //   markersMap.isAggregation = true
+              // }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-waterintake'
               } else if (type == 'sh') {
@@ -1656,12 +1663,16 @@ export default {
         if (eventStatus == 'qs') {//签收
           that.eventConfirmTitle = '事件签收'
           let param = { parentId: that.eventType }
-          await listSJfl(param).then(res => {
-            //事件类型
-            if (res.code == 200) {
-              that.eventTypeList = res.data
-            }
-          })
+          if(that.eventTypeXl != null){
+            that.sendEventType = that.eventTypeXl;
+          }else{
+            await listSJfl(param).then(res => {
+              //事件类型
+              if (res.code == 200) {
+                that.eventTypeList = res.data
+              }
+            })
+          }
           await listYuAn().then(res => {
             //关联预案
             if (res.code == 200) {
@@ -1887,6 +1898,7 @@ export default {
       let that = this
       //获取事件详情
       getEventDetail({ eventCode: eventCode }).then(res => {
+
         that.eventDialog = true
         that.eventLogList = res.data.eventlog//日志列表
         that.visuForestCloudYuAnBo = res.data.visuForestCloudYuAnBo//应急预案
@@ -1899,6 +1911,7 @@ export default {
         that.longitude = res.data.catalogue.longitude
         that.latitude = res.data.catalogue.latitude
         that.eventName = res.data.catalogue.eventName
+        that.eventTypeXl = res.data.catalogue.eventTypeXl
         let markersMap = {
           lng: 124.59,
           lat: 43.02,
@@ -1907,7 +1920,7 @@ export default {
           click: '',
           parameter: '',
           keepBindPopup: false,
-          isAggregation: false,
+          isAggregation: true,
           radius: 0
         }
         if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -1945,7 +1958,7 @@ export default {
             click: 'preview',
             parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1983,6 +1996,7 @@ export default {
         that.latitude = res.data.catalogue.latitude
         that.longitude = res.data.catalogue.longitude
         that.eventName = res.data.catalogue.eventName
+        that.eventTypeXl = res.data.catalogue.eventTypeXl
         let markersMap = {
           lng: 124.59,
           lat: 43.02,
@@ -1991,7 +2005,7 @@ export default {
           click: '',
           parameter: '',
           keepBindPopup: false,
-          isAggregation: false,
+          isAggregation: true,
           radius: 0
         }
         if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -2014,7 +2028,7 @@ export default {
           markersMap.radius = res.data.eventdetail[0].fireRadius
         }
         setTimeout(() => {
-          that.$refs.supermapDialog.clearM(false)
+          that.$refs.supermapDialog.clearM(true)
           if (res.data.eventdetail != null && res.data.eventdetail.length > 0 && res.data.eventdetail[0].fireRadius != null && res.data.eventdetail[0].fireRadius != '' && res.data.eventdetail[0].fireRadius > 0) {
             that.$refs.supermapDialog.setMarkersRadius([markersMap])
           } else {
@@ -2031,7 +2045,7 @@ export default {
             click: 'preview',
             parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -2182,7 +2196,8 @@ export default {
         this.$Message.info('正在登陆客户端，请稍等......')
         return false
       }
-      this.ws.openVideo(cameraParams)
+      const params = [cameraParams];
+      this.ws.openVideo(params)
     },
     /** ----------------------------------摄像头预览结束------------------------------------- */
 

src/views/firespread.vue

@@ -1369,11 +1369,11 @@
                   click: '',
                   parameter: '',
                   keepBindPopup: false,
-                  isAggregation: false
-                }
-                if (res.data.length > 50) {
-                  markersMap.isAggregation = true
+                  isAggregation: true
                 }
+                // if (res.data.length > 50) {
+                //   markersMap.isAggregation = true
+                // }
                 if (type == 'qsk') {
                   markersMap.icon = 'sj-icon-waterintake'
                 } else if (type == 'sh') {
@@ -1854,7 +1854,7 @@
             click: '',
             parameter: '',
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -1892,7 +1892,7 @@
               click: 'preview',
               parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
               keepBindPopup: false,
-              isAggregation: false,
+              isAggregation: true,
               radius: 0
             }
             markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1938,7 +1938,7 @@
             click: '',
             parameter: '',
             keepBindPopup: false,
-            isAggregation: false,
+            isAggregation: true,
             radius: 0
           }
           if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
@@ -1978,7 +1978,7 @@
               click: 'preview',
               parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
               keepBindPopup: false,
-              isAggregation: false,
+              isAggregation: true,
               radius: 0
             }
             markersMap.bindPopupHtml = '<div class="map-tip">' +

src/views/forest.vue

@@ -428,6 +428,7 @@
                 @getSupermap="getSupermap"></firespread>
     <eventLocation ref="eventLocation"></eventLocation>
     <TVWall ref="TVWall"></TVWall>
+    <wrj ref="wrj"></wrj>
   </div>
 </template>
 
@@ -457,14 +458,13 @@
   import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
   import eventLocation from '@/components/eventLocation.vue' //事件定位弹窗
   import TVWall from '@/components/TVWall.vue' //电视墙弹窗
+  import wrj from '@/components/wrj.vue' //无人机
   import eventdetailsdialog from '@/views/eventdetailsdialog.vue' //事件详情弹窗
   import firespread from '@/views/firespread.vue' //事件详情弹窗
 
   /** ----------------------------------摄像头预览开始------------------------------------- */
-  import {
-    getDahuaVideoServer
-  } from '@/api/dahua/dahua'
-  // import DHWs from '@/dahua/lib/DHWs'
+  import { getDahuaVideoServer } from '@/api/dahua/dahua'
+  import DHWs from '@/dahua/lib/DHWs'
   import Firespread from "./firespread";
 
   /** ----------------------------------摄像头预览结束------------------------------------- */
@@ -480,6 +480,7 @@
       vBottomMenu,
       eventLocation,
       TVWall,
+      wrj,
       dateChoose,
       eventdetailsdialog,
       firespread
@@ -489,7 +490,10 @@
       window.showDialog = this.showDialog
       window.choseLayerSwitching = this.choseLayerSwitching
       window.choseLayerSwitchingList = this.choseLayerSwitchingList
+      window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
       /** ----------------------------------底部按钮公用组件结束------------------------------------- */
+      const DHWsInstance = DHWs.getInstance();
+      this.ws = DHWsInstance;
     },
     mounted() {
       this.getBaseInfo()
@@ -504,7 +508,6 @@
       /** ----------------------------------weosocket开始------------------------------------- */
       this.initWebSocket()
       /** ----------------------------------weosocket结束------------------------------------- */
-      this.selectTaskList() //获取任务
       setInterval(() => {
         if (this.calendarDay == this.getCurrentDataStr()) {
           this.getTodayEvents(this.getCurrentDataStr(), true);
@@ -515,7 +518,8 @@
           this.getExposureStage(this.getCurrentDataStr(), true);
           this.getSupermap(this.getCurrentDataStr(), true);
         }
-      }, 10000)
+      }, 4000)
+      this.bottomMenuList() //获取底部公共组件消息和任务
     },
     data() {
       return {
@@ -817,9 +821,6 @@
           }]
         })
       },
-      selectTaskList() {
-        this.$refs.bottomMenu.selectTaskList()
-      },
       getBaseInfo() {
         //左侧获取部门信息
         getBaseInfo().then(res => {
@@ -896,11 +897,11 @@
                 click: '',
                 parameter: '',
                 keepBindPopup: false,
-                isAggregation: false
-              }
-              if (res.data.length > 200) {
-                markersMap.isAggregation = true
+                isAggregation: true
               }
+              // if (res.data.length > 200) {
+              //   markersMap.isAggregation = true
+              // }
               if (res.data[i].eventStatusValue == 'forest_event_status_1' && res.data[i].urgeCount == 0) {
                 markersMap.click = 'showEventDialog'
                 markersMap.icon = 'sj-icon-map-xinshangbao'
@@ -1047,7 +1048,7 @@
           click: '',
           parameter: '',
           keepBindPopup: false,
-          isAggregation: false
+          isAggregation: true
         }
         if (event.eventStatusValue == 'forest_event_status_1' && event.urgeCount == 0) {
           markersMap.click = 'showEventDialog'
@@ -1191,6 +1192,10 @@
       /** ----------------------------------weosocket结束------------------------------------- */
 
       /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+      bottomMenuList() {
+        this.$refs.bottomMenu.selectTaskList()//获取任务列表
+        this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      },
       showDialog(click) {
         if (click == 'eventLocation') {
           this.$refs.eventLocation.showEventLocation()
@@ -1217,7 +1222,13 @@
             this.$refs.bottomMenu.showChild = false
           }
         } else if (click == 'TVWall') {
-          this.$refs.TVWall.showTVWall()
+          this.$refs.TVWall.showTVWall();
+          this.$refs.supermap.isEditableLayers = false
+          this.$refs.bottomMenu.showChild = false
+          this.$refs.bottomMenu.showBanChild = false
+          this.$refs.bottomMenu.showChangChild = false
+        } else if (click == 'wrj') {
+          this.$refs.wrj.showWrj();
           this.$refs.supermap.isEditableLayers = false
           this.$refs.bottomMenu.showChild = false
           this.$refs.bottomMenu.showBanChild = false
@@ -1251,6 +1262,10 @@
       choseLayerSwitchingList(urlList) {
         this.$refs.supermap.layerSwitchingList(urlList)
       },
+      //选择图层(传递数组)  带数据
+      choseLayerSwitchingList_Data(urlList) {
+        this.$refs.supermap.layerSwitchingList_Data(urlList)
+      },
       /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     }
   }

src/views/leader.vue

@@ -68,47 +68,46 @@
 					<dv-border-box-13 backgroundColor="rgba(12, 19, 38, .90)" style="padding-bottom: 1rem;">
 						<img src="../assets/images/integrated/light.png" style="width: 100%; margin-top: .4rem;" />
 						<div class="this-title">
-							<span>巡林计划</span>
+							<span>巡林任务</span>
 							<dv-decoration-3 style="width:150px;height:15px;margin-right: 1rem;" />
 						</div>
 						<div class="i-list-con h-73">
-
 							<div class="h-73 overflow-y">
-								<el-collapse accordion>
-									<el-collapse-item v-for="(item,index) in xunLinListOne">
-										<template slot="title">
-											<div class="d-l-con sj-collapse"
-												@click="getRecordList(item.id, item.personId)">
-												<div class="d-l-l-text">
-													<el-tooltip class="item" effect="dark" placement="left"
-														style="width:10rem ;" :disabled="(item.name.length <= 20)">
-														<div slot="content">
-															<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>
-										</template>
-										<div class="d-l-con this-child sj-collapse" @click="getPointList(child.id)"
-											v-for="(child,index) in recordList">
-											<div class="d-l-l-text">
-												<h4>{{child.beginTime}} - {{child.endTime}}</h4>
-											</div>
-											<!--<div class="d-l-l-count">{{index}}</div>-->
-										</div>
-										<div class="d-l-con this-child sj-collapse"
-											v-if="showNothing && (recordList == null || recordList == '' || recordList == [])">
-											<div class="d-l-l-text">
-												<h4 class="text-gray">暂无信息</h4>
-											</div>
-										</div>
-									</el-collapse-item>
-								</el-collapse>
+                <el-collapse accordion>
+                  <el-collapse-item v-for="(item,index) in xunLinListOne">
+                    <template slot="title">
+                      <div class="d-l-con sj-collapse"
+                           @click="getRecordList(item.id)">
+                        <div class="d-l-l-text">
+                          <el-tooltip class="item" effect="dark" placement="left"
+                                      style="width:10rem ;" :disabled="(item.taskName.length <= 20)">
+                            <div slot="content">
+                              <h4 class="collapse-title" style="width: 200px;">
+                                {{ item.taskName}}</h4>
+                            </div>
+                            <h4 class="collapse-title" style="width: 100px;">
+                              {{ item.taskName | ellipsis20}}</h4>
+                          </el-tooltip>
+                        </div>
+                        <div class="d-l-l-count">({{ item.recordCount }}/{{ item.planCount }})
+                        </div>
+                      </div>
+                    </template>
+                    <div class="d-l-con this-child sj-collapse" @click="getPointList(child.id)"
+                         v-for="(child,index) in recordList">
+                      <div class="d-l-l-text">
+                        <h4>{{child.beginTime}} - {{child.endTime}}</h4>
+                      </div>
+                      <!--<div class="d-l-l-count">{{index}}</div>-->
+                    </div>
+                    <div class="d-l-con this-child sj-collapse"
+                         v-if="showNothing && (recordList == null || recordList == '' || recordList == [])">
+                      <div class="d-l-l-text">
+                        <h4 class="text-gray">暂无信息</h4>
+                      </div>
+                    </div>
+                  </el-collapse-item>
+                </el-collapse>
 								<!--<div class="d-l-con" :class="{on:listCurrentIndex2==item.planName}"
                      v-for="(item,index) in xunLinListOne"
                      @click="setConnectList(item.planLine,item.planName)">
@@ -139,12 +138,10 @@
 <script>
 	import {
 		getForestLeader,
-		getLeaderTrack,
 		getPlanList,
 		getRecordList,
 		getPointList,
-		getRy,
-		getRemotelist
+		getRy
 	} from '@/api/leader'
 
 	import supermap from '@/components/supermap' //超图
@@ -176,7 +173,7 @@
 				visuForestCloudRYBO: [], //人员类型列表
 				peopleList: [], //人员列表
 				connectList: [], //画线
-				xunLinListOne: [], //巡林计划
+				xunLinListOne: [], //巡林任务
 				recordList: [], //巡查记录
 				showNothing: false, //暂无信息
 				zrs: 0, //总人数
@@ -189,10 +186,18 @@
 			window.showDialog = this.showDialog
 			window.choseLayerSwitching = this.choseLayerSwitching
 			window.choseLayerSwitchingList = this.choseLayerSwitchingList
+      window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
 			/** ----------------------------------底部按钮公用组件结束------------------------------------- */
 		},
+    mounted(){
+      this.bottomMenuList() //获取底部公共组件消息和任务
+    },
 		methods: {
 			/** ----------------------------------底部按钮公用组件开始------------------------------------- */
+      bottomMenuList() {
+        this.$refs.bottomMenu.selectTaskList()//获取任务列表
+        this.$refs.bottomMenu.selectMessageList()//获取消息列表
+      },
 			showDialog(click) {
 				if (click == 'eventLocation') {
 					this.$refs.eventLocation.showEventLocation()
@@ -253,6 +258,10 @@
 			choseLayerSwitchingList(urlList) {
 				this.$refs.supermap.layerSwitchingList(urlList)
 			},
+      //选择图层(传递数组)  带数据
+      choseLayerSwitchingList_Data(urlList) {
+        this.$refs.supermap.layerSwitchingList_Data(urlList)
+      },
 			/** ----------------------------------底部按钮公用组件结束------------------------------------- */
 
 			//初始化
@@ -268,10 +277,6 @@
 					that.zxrs = res.data.visuForestCloudRyZxBO.zxrs
 					this.personnelChart()
 				})
-				//获取巡林计划
-				// getPlanList().then(res => {
-				//   this.xunLinListOne = res.data
-				// })
 			},
 			//获取左侧人员列表
 			getForestLeader(linJob, linType) {
@@ -285,71 +290,31 @@
 				this.connectList = []
 				this.$refs.supermap.clearC()
 			},
-			//获取巡林计划
-			// getPlanList(personId) {
-			//   alert(personId)
-			//   getPlanList(personId).then(res => {
-			//     console.log("计划", res.data)
-			//     this.xunLinListOne = res.data
-			//   })
-			// },
 			//点击左侧人员列表获取 巡林计划
 			getPlanList(personId) {
 				this.showNothing = false;
 				this.recordList = [];
 				getPlanList(personId).then(res => {
-					console.log("计划", res.data);
 					this.xunLinListOne = res.data;
 				})
 				this.$refs.supermap.clearC()
 			},
-			//点击左侧人员列表获取轨迹
-			getLeaderTrack(userId) {
-				this.getRemotelist();
-				this.listCurrentIndex1 = userId
-				let that = this
-				this.connectList = []
-				getLeaderTrack(userId).then(res => {
-					if (res.data != null && res.data.length > 0) {
-						for (let i = 0; i < res.data.length; i++) {
-							let latlng = {
-								lat: res.data[i].latitude,
-								lng: res.data[i].longitude
-							}
-							this.connectList.push(latlng)
-						}
-						setTimeout(() => {
-							that.$refs.supermap.clearC()
-							that.$refs.supermap.setConnectList(this.connectList, 'red')
-						}, 1000)
-					} else {
-						that.$refs.supermap.clearC()
-					}
-				})
-			},
 			//点击右侧巡林计划获取 巡查记录
-			getRecordList(id, personId) {
+			getRecordList(id) {
 				this.showNothing = false;
 				this.recordList = [];
-				getRecordList(id, personId).then(res => {
-					console.log("记录", res.data);
+				getRecordList(id).then(res => {
 					this.recordList = res.data;
 				})
 				this.$refs.supermap.clearC()
 			},
 			//点击右侧巡查记录获取 巡查轨迹
-			getPointList(id, ) {
+			getPointList(id) {
 				getPointList(id).then(res => {
 					// console.log("落点",res.data);
 					this.setPointList(res);
 				})
 			},
-			//点击左侧人员获取人员的巡林计划列表
-			getRemotelist() {
-				getRemotelist().then(res => {
-					this.xunLinListOne = res.data;
-				})
-			},
 			//点击巡查轨迹时段 巡查轨迹落点
 			setPointList(res) {
 				let that = this;

src/views/monitor.vue

@@ -41,26 +41,52 @@
                   </div>
                 </div>
               </div>
-              <div class="overflow-y" style="height: 33vh;">
-                <el-collapse accordion>
-                  <el-collapse-item v-for="(item,index) in region" :key="index">
-                    <!-- deptId -->
-                    <template slot="title">
-                      <div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.deptId}"
-                           v-on:click="selectCameraByDeptId(item.deptId)">
-                        <div class="d-l-l-text">
-                          <h4 class="collapse-title">{{ item.deptName }}</h4>
-                        </div>
-                        <div class="d-l-l-count">{{ item.deptCount }}</div>
-                      </div>
-                    </template>
-                  </el-collapse-item>
-                </el-collapse>
-              </div>
+              <!--<div class="overflow-y" style="height: 33vh;">-->
+                <!--<el-collapse accordion>-->
+                  <!--<el-collapse-item v-for="(item,index) in region" :key="index">-->
+                    <!--&lt;!&ndash; deptId &ndash;&gt;-->
+                    <!--<template slot="title">-->
+                      <!--<div class="d-l-con sj-collapse" :class="{on:listCurrentIndex1==item.deptId}"-->
+                           <!--v-on:click="selectCameraByDeptId(item.deptId)">-->
+                        <!--<div class="d-l-l-text">-->
+                          <!--<h4 class="collapse-title">{{ item.deptName }}</h4>-->
+                        <!--</div>-->
+                        <!--<div class="d-l-l-count">{{ item.deptCount }}</div>-->
+                      <!--</div>-->
+                    <!--</template>-->
+                  <!--</el-collapse-item>-->
+                <!--</el-collapse>-->
+              <!--</div>-->
 
-              <!-- 横向柱状 echart -->
-              <div class="overflow-y" style="height: 33vh;">
-                <div id="camera-chart" style="width: 100%;height:33vh;"></div>
+              <!--&lt;!&ndash; 横向柱状 echart &ndash;&gt;-->
+              <!--<div class="overflow-y" style="height: 33vh;">-->
+                <!--<div id="camera-chart" style="width: 100%;height:33vh;"></div>-->
+              <!--</div>-->
+              <div  class="overflow-y" style="height: 70vh;">
+                  <div class="i-list-con h-65">
+                    <div class="head-container">
+                      <el-input
+                        v-model="deptName"
+                        placeholder="请输入部门名称"
+                        clearable
+                        size="small"
+                        prefix-icon="el-icon-search"
+                        style="margin-bottom: 20px"
+                      />
+                    </div>
+                    <div class="head-container tree-scrollbar" style="height: 700px;overflow-y:auto;">
+                      <el-tree
+                        :data="deptOptions"
+                        :props="defaultProps"
+                        :expand-on-click-node="false"
+                        :filter-node-method="filterNode"
+                        ref="tree"
+                        node-key="id"
+                        :default-expanded-keys="[100]"
+                        @node-click="handleNodeClick"
+                      />
+                    </div>
+                  </div>
               </div>
             </div>
           </dv-border-box-13>
@@ -110,7 +136,6 @@
         </div>
       </div>
       <vBottomMenu ref="bottomMenu"></vBottomMenu>
-<!--      <el-tooltip :content="indentText" placement="top" :disabled="indentdisabled">-->
 <!--        <div class="mascot" ref="mascot" :class="indentStyle" @click="indent"><img-->
 <!--          src="@/assets/images/mascot.png"/></div>-->
 <!--      </el-tooltip>-->
@@ -133,9 +158,10 @@ import {
   selectDeviceType,
   selectCameraByDeptId,
   selectKeyAreaList,
-  getRegionalFlag
+  getRegionalFlag,
+  findCameraByDept
 } from '@/api/monitor'
-
+import { treeselect } from '@/api/system/dept'
 import supermap from '@/components/supermap' //超图
 import vheader from '@/components/v-header.vue' //一体化共用头部
 import vBottomMenu from '@/components/vBottomMenu.vue' //一体化公共底部菜单
@@ -163,6 +189,12 @@ export default {
     eventLocation,
     TVWall
   },
+  watch: {
+    // 根据名称筛选部门树
+    deptName(val) {
+      this.$refs.tree.filter(val)
+    }
+  },
   created() {
     /** ----------------------------------摄像头预览开始------------------------------------- */
     const DHWsInstance = DHWs.getInstance()
@@ -173,11 +205,14 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     this.selectDeviceType(-1)
     this.selectKeyAreaList()
+    this.bottomMenuList() //获取底部公共组件消息和任务
+    this.getTreeselect()
   },
   data() {
     return {
@@ -217,9 +252,125 @@ export default {
       indentText: '收起左右栏',
       indentdisabled: false,
       domId: 'dom1',
+
+
+
+      // 部门名称
+      deptName: undefined,
+      // 部门树选项
+      deptOptions: undefined,
+      defaultProps: {
+        children: 'children',
+        label: 'label'
+      },
     }
   },
   methods: {
+    /** 部门树*/
+    // 查询部门下拉树结构
+    getTreeselect() {
+      treeselect().then(response => {
+        console.log(response.data)
+        this.deptOptions = response.data
+      })
+    },
+    // 筛选节点
+    filterNode(value, data) {
+      if (!value) return true
+      return data.label.indexOf(value) !== -1
+    },
+    // 节点单击事件
+    handleNodeClick(data) {
+      // this.findCameraByDept(data.id)
+      this.selectCameraByDeptId(data.id);
+    },
+    findCameraByDept(deptId) {
+      findCameraByDept(deptId).then(res => {
+        let that = this;
+        //根据设备类型查看列表
+        this.cameraMarkersList = [];
+        that.visuForestCloudCameraBOList = res.data
+        if (res.data != null && res.data.length > 0) {
+          this.cameraMarkersList.push({
+            lng: res.data[0].deptLongitude,
+            lat: res.data[0].deptLatitude,
+            icon: 'marker',
+            bindPopupHtml: '',
+            click: '',
+            keepBindPopup: false,
+            isAggregation: true,
+            radius:0
+          })
+          for (let i = 0; i < res.data.length; i++) {
+            let markersMap = {
+              lng: 124.59,
+              lat: 43.02,
+              icon: 'camera',
+              bindPopupHtml: '',
+              click: 'preview',
+              parameter: '',
+              keepBindPopup: false,
+              isAggregation: false
+            }
+            if (res.data[i].channelCode != null) {
+              markersMap.parameter = {code:res.data[i].cameraCode,
+                type:res.data[i].cameraFactory}
+            } else {
+              markersMap.parameter = []
+            }
+
+            markersMap.lng = res.data[i].longitude
+            markersMap.lat = res.data[i].latitude
+            markersMap.radius = res.data[i].cameraRadius
+            markersMap.bindPopupHtml = '<div class="map-tip">' +
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>经纬度：' + res.data[i].longitude + ',' + res.data[i].latitude +
+              '</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>' +
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>摄像头名称：' + res.data[i].cameraName + '</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>' +
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>摄像头类型：' + (res.data[i].cameraFactory=="1"?"大华":"海康") + '</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>' +
+              '<span>' +
+              '                  <div class="d-l-con">' +
+              '                  <div class="d-l-l-text">' +
+              '                  <h4>摄像头半径：' + res.data[i].cameraRadius + '米</h4>' +
+              '                </div>' +
+              '                </div>' +
+              '                </span>' +
+              '</div>'
+            this.cameraMarkersList.push(markersMap)
+          }
+          setTimeout(() => {
+            that.$refs.supermap.clearM(true)
+            that.$refs.supermap.clearM(false)
+            that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
+          }, 1000)
+        }else{
+          setTimeout(() => {
+            that.$refs.supermap.clearM(false)
+            that.$refs.supermap.clearM(false)
+            that.$refs.supermap.setMarkersRadius(this.cameraMarkersList)
+          }, 1000)
+        }
+      })
+    },
+    /** 部门树*/
+
     selectKeyAreaList() {
       this.keyAreaList=[]
       //获取重点区域列表
@@ -253,6 +404,10 @@ export default {
       })
     },
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -313,113 +468,117 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
-    /** ----------------------------------底部按钮公用组件结束------------------------------------- */
-    cameraChat() {
-      // 基于准备好的dom，初始化echarts实例
-      let myChart = echarts.init(document.getElementById('camera-chart'))
-      // 绘制图表
-      const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848']
-      myChart.setOption({
-        dataset: {
-          source: this.sourceData
-        },
-        tooltip: {
-          trigger: 'item'
-
-        },
-        grid: {
-          top: '5%',
-          left: '5%',
-          // right: "4%",
-          bottom: '0%',
-          width: '75%',
-          containLabel: true
-        },
-        dataZoom: [{
-          show:true,
-          type: 'slider',
-          yAxisIndex:0,
-          left:10,
-          start: 0,
-          end: this.sourceData.length > 10 ? 40 : 100,
-          width:15
-        }],
-        xAxis: {
-          show: false,
-          type: 'value',
-          left:10
-        },
-        yAxis: {
-          type: 'category', // 不设置类目轴，抽离的dataset数据展示不出来
-          inverse: true,
-          axisLabel: {
-            show: true,
-            textStyle: {
-              color: '#5deaff',
-              fontSize: '12'
-            }
-          },
-          splitLine: {
-            show: false
-          },
-          axisTick: {
-            show: false
-          },
-          axisLine: {
-            show: false
-          }
-        },
-
-        series: [{
-
-          type: 'bar',
-          animationCurve: 'easeOutBack',
-          barWidth: 5,
-          label: {
-            show: true,
-            position: 'right',
-            offset: [0, 0],
-            color: '#88dfd5',
-            // fontSize: "12",
-            style: {
-              fill: '#fff'
-            }
-          },
-          backgroundBar: {
-            show: true,
-            style: {
-              fill: 'rgba(97,152,255,0.20)'
-            }
-          },
-          barStyle: {
-            stroke: 'rgba(41,244,236,1)'
-          },
-          gradient: {
-            color: ['rgba(41,244,236,1)', 'rgba(41,244,236,0)']
-          },
-          itemStyle: {
-            label: {
-              show: true
-            },
-            labelLine: {
-              show: false
-            },
-            color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
-              offset: 0,
-              color: 'rgba(41,244,236,0)'
-            },
-              {
-                offset: 1,
-                color: 'rgba(41,244,236,.5)'
-              }
-            ]),
-            borderColor: '#a2f9f7',
-            shadowBlur: 16,
-            shadowColor: '#a2f9f7'
-          }
-        }]
-      })
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
     },
+    /** ----------------------------------底部按钮公用组件结束------------------------------------- */
+    // cameraChat() {
+    //   // 基于准备好的dom，初始化echarts实例
+    //   let myChart = echarts.init(document.getElementById('camera-chart'))
+    //   // 绘制图表
+    //   const dfColor = ['#92E1FF', '#0097FB', '#30ECA6', '#FFC227', '#FF4848']
+    //   myChart.setOption({
+    //     dataset: {
+    //       source: this.sourceData
+    //     },
+    //     tooltip: {
+    //       trigger: 'item'
+    //
+    //     },
+    //     grid: {
+    //       top: '5%',
+    //       left: '5%',
+    //       // right: "4%",
+    //       bottom: '0%',
+    //       width: '75%',
+    //       containLabel: true
+    //     },
+    //     dataZoom: [{
+    //       show:true,
+    //       type: 'slider',
+    //       yAxisIndex:0,
+    //       left:10,
+    //       start: 0,
+    //       end: this.sourceData.length > 10 ? 40 : 100,
+    //       width:15
+    //     }],
+    //     xAxis: {
+    //       show: false,
+    //       type: 'value',
+    //       left:10
+    //     },
+    //     yAxis: {
+    //       type: 'category', // 不设置类目轴，抽离的dataset数据展示不出来
+    //       inverse: true,
+    //       axisLabel: {
+    //         show: true,
+    //         textStyle: {
+    //           color: '#5deaff',
+    //           fontSize: '12'
+    //         }
+    //       },
+    //       splitLine: {
+    //         show: false
+    //       },
+    //       axisTick: {
+    //         show: false
+    //       },
+    //       axisLine: {
+    //         show: false
+    //       }
+    //     },
+    //
+    //     series: [{
+    //
+    //       type: 'bar',
+    //       animationCurve: 'easeOutBack',
+    //       barWidth: 5,
+    //       label: {
+    //         show: true,
+    //         position: 'right',
+    //         offset: [0, 0],
+    //         color: '#88dfd5',
+    //         // fontSize: "12",
+    //         style: {
+    //           fill: '#fff'
+    //         }
+    //       },
+    //       backgroundBar: {
+    //         show: true,
+    //         style: {
+    //           fill: 'rgba(97,152,255,0.20)'
+    //         }
+    //       },
+    //       barStyle: {
+    //         stroke: 'rgba(41,244,236,1)'
+    //       },
+    //       gradient: {
+    //         color: ['rgba(41,244,236,1)', 'rgba(41,244,236,0)']
+    //       },
+    //       itemStyle: {
+    //         label: {
+    //           show: true
+    //         },
+    //         labelLine: {
+    //           show: false
+    //         },
+    //         color: new echarts.graphic.LinearGradient(0, 1, 0, 0, [{
+    //           offset: 0,
+    //           color: 'rgba(41,244,236,0)'
+    //         },
+    //           {
+    //             offset: 1,
+    //             color: 'rgba(41,244,236,.5)'
+    //           }
+    //         ]),
+    //         borderColor: '#a2f9f7',
+    //         shadowBlur: 16,
+    //         shadowColor: '#a2f9f7'
+    //       }
+    //     }]
+    //   })
+    // },
     selectDeviceType(index) {
       this.iconCurrentIndex1 = index
       //获取左侧动态感知设备
@@ -441,7 +600,7 @@ export default {
         }
 
         that.visuForestCloudCameraBOList = res.data.visuForestCloudCameraBOList
-        this.cameraChat()
+        // this.cameraChat()
         if (res.data.visuForestCloudCameraBOList != null && res.data.visuForestCloudCameraBOList
           .length > 0) {
           for (let i = 0; i < res.data.visuForestCloudCameraBOList.length; i++) {
@@ -549,8 +708,8 @@ export default {
               isAggregation: false
             }
             if (res.data[i].channelCode != null) {
-              markersMap.parameter = {code:res.data.data[i].cameraCode,
-                type:res.data.data[i].cameraFactory}
+              markersMap.parameter = {code:res.data[i].cameraCode,
+                type:res.data[i].cameraFactory}
             } else {
               markersMap.parameter = []
             }

src/views/trees.vue

@@ -85,14 +85,20 @@ export default {
     window.showDialog = this.showDialog
     window.choseLayerSwitching = this.choseLayerSwitching
     window.choseLayerSwitchingList = this.choseLayerSwitchingList
+    window.choseLayerSwitchingList_Data = this.choseLayerSwitchingList_Data
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
   },
   mounted() {
     this.selectCenterdataTForestTreesGroupByType();
     this.getTreesRemoteList();
+    this.bottomMenuList() //获取底部公共组件消息和任务
   },
   methods: {
     /** ----------------------------------底部按钮公用组件开始------------------------------------- */
+    bottomMenuList() {
+      this.$refs.bottomMenu.selectTaskList()//获取任务列表
+      this.$refs.bottomMenu.selectMessageList()//获取消息列表
+    },
     showDialog(click) {
       if (click == 'eventLocation') {
         this.$refs.eventLocation.showEventLocation()
@@ -153,6 +159,10 @@ export default {
     choseLayerSwitchingList(urlList) {
       this.$refs.supermap.layerSwitchingList(urlList)
     },
+    //选择图层(传递数组)  带数据
+    choseLayerSwitchingList_Data(urlList) {
+      this.$refs.supermap.layerSwitchingList_Data(urlList)
+    },
     /** ----------------------------------底部按钮公用组件结束------------------------------------- */
     selectCenterdataTForestTreesGroupByType(){
       selectCenterdataTForestTreesGroupByType().then(res => {