数据中心

src/views/event.vue

@@ -947,23 +947,83 @@
         let that = this
         //获取左侧菜单列表
         getTodayEvent().then(res => {
+          debugger
           //今日事件
-          that.todayEventCountList = res.data.eventcountStatus
-          that.todayEventSourcetList = res.data.eventcountSource
+          that.todayEventCountList = res.data.eventcountStatus;
+          that.todayEventSourcetList = res.data.eventcountSource;
           //  事件分布
-          that.todayEventCountDeptList = res.data.eventcountDept
+          that.todayEventCountDeptList = res.data.eventcountDept;
           //  事件分类
-          that.todayEventCountTypeList = res.data.eventcountType
+          that.todayEventCountTypeList = res.data.eventcountType;
           if (res.data.eventcountSource != null && res.data.eventcountSource.length > 0) {
             for (let i = 0; i < res.data.eventcountSource.length; i++) {
-              let data = {}
-              data.name = res.data.eventcountSource[i].eventSourceName
-              data.value = res.data.eventcountSource[i].count
-              this.eventChartData.push(data)
+              let data = {};
+              data.name = res.data.eventcountSource[i].eventSourceName;
+              data.value = res.data.eventcountSource[i].count;
+              this.eventChartData.push(data);
             }
-
           }
-          this.eventChart()
+          this.eventChart();
+          that.markersList = [];
+          that.eventList = [];
+          if(res.data.eventListAll!=null&&res.data.eventListAll.length>0){
+            for (let i = 0; i < res.data.eventListAll.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                parameter: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventListAll.length>500){
+                markersMap.isAggregation = true
+              }
+              if(res.data.eventListAll[i].eventStatus=="event_event_status_1"||res.data.eventListAll[i].eventStatus=="event_event_status_2"||res.data.eventListAll[i].eventStatus=="event_event_status_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(res.data.eventListAll[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }else{
+                markersMap.click = "showEventInfo_Processed"
+              }
+              markersMap.parameter = res.data.eventListAll[i].id
+              markersMap.lng = res.data.eventListAll[i].longitude
+              markersMap.lat =res.data.eventListAll[i].latitude
+              markersMap.bindPopupHtml = '<div class="map-tip">' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>经纬度：' +res.data.eventListAll[i].longitude + ',' +res.data.eventListAll[i]
+                  .latitude + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>事件名称：' +res.data.eventListAll[i].eventTitle + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '<span>' +
+                '                  <div class="d-l-con">' +
+                '                  <div class="d-l-l-text">' +
+                '                  <h4>事件时间：' +res.data.eventListAll[i].reportTime + '</h4>' +
+                '                </div>' +
+                '                </div>' +
+                '                </span>' +
+                '</div>';
+              that.markersList.push(markersMap)
+            }
+            that.eventList=res.data.eventListAll;
+            setTimeout(() => {
+              that.$refs.supermap.clearM(false)
+              that.$refs.supermap.clearM(true)
+              that.$refs.supermap.setMarkers(that.markersList)
+            },1000)
+          }
         })
       },
       todayEventCountSetMarkers(eventStatus) {

src/views/forest.vue

@@ -1224,9 +1224,98 @@
             }
           }
 
+          // that.markersList = [];
+          // if(res.data.visuForestVgdEventBOList!=null&&res.data.visuForestVgdEventBOList.length>0){
+          //   for (let i = 0; i < res.data.visuForestVgdEventBOList.length; i++) {
+          //     let markersMap = {
+          //       lng: 124.59,
+          //       lat: 43.02,
+          //       icon: 'marker',
+          //       bindPopupHtml: '',
+          //       click: '',
+          //       parameter: '',
+          //       keepBindPopup: false,
+          //       isAggregation: false
+          //     }
+          //     if(res.data.visuForestVgdEventBOList.length>500){
+          //       markersMap.isAggregation = true
+          //     }
+          //     if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_1"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_2"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_6"){
+          //       markersMap.click = "showEventInfo_Processed"
+          //     }else if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_4"){
+          //       markersMap.click = "showEventInfo_notProcessed"
+          //     }else{
+          //       markersMap.click = "showEventInfo_Processed"
+          //     }
+          //     markersMap.parameter = res.data.visuForestVgdEventBOList[i].id
+          //     markersMap.lng = res.data.visuForestVgdEventBOList[i].longitude
+          //     markersMap.lat =res.data.visuForestVgdEventBOList[i].latitude
+          //     markersMap.bindPopupHtml = '<div class="map-tip">' +
+          //       '<span>' +
+          //       '                  <div class="d-l-con">' +
+          //       '                  <div class="d-l-l-text">' +
+          //       '                  <h4>经纬度：' +res.data.visuForestVgdEventBOList[i].longitude + ',' +res.data.visuForestVgdEventBOList[i]
+          //         .latitude + '</h4>' +
+          //       '                </div>' +
+          //       '                </div>' +
+          //       '                </span>' +
+          //       '<span>' +
+          //       '                  <div class="d-l-con">' +
+          //       '                  <div class="d-l-l-text">' +
+          //       '                  <h4>事件名称：' +res.data.visuForestVgdEventBOList[i].eventTitle + '</h4>' +
+          //       '                </div>' +
+          //       '                </div>' +
+          //       '                </span>' +
+          //       '<span>' +
+          //       '                  <div class="d-l-con">' +
+          //       '                  <div class="d-l-l-text">' +
+          //       '                  <h4>事件时间：' +res.data.visuForestVgdEventBOList[i].reportTime + '</h4>' +
+          //       '                </div>' +
+          //       '                </div>' +
+          //       '                </span>' +
+          //       '</div>';
+          //     that.markersList.push(markersMap)
+          //   }
+          //   setTimeout(() => {
+          //     that.$refs.supermap.clearM(false)
+          //     that.$refs.supermap.setMarkers(that.markersList)
+          //   }, 1000);
+          // }
+
+          that.visuForestCloudRYBO=res.data.visuForestCloudRYBO;
+          // VisuForestCloudTodaySjfbBO: (2) [{…}, {…}]
+          // baseinfo: {baseinfo: '子挖的'}基本情况
+          // cameraList: (2) [{…}, {…}]
+          // visuForestCloudRYBO: (3) [{…}, {…}, {…}]
+          // visuForestCloudTodaySjlyBOList: (3) [{…}, {…}, {…}]
+          // visuForestCloudTodayTjBO: {wclCount: '82', clzCount: '0', ybjCount: '0'}
+          // visuForestVgdEventBOList
+          this.cameraChat();
+        })
+      },
+      getTodayEvent() {
+        let that = this
+        //获取右侧菜单列表
+        getTodayEvent().then(res => {
+          //今日事件
+          that.todayEventCountList = res.data.eventcountStatus
+          that.todayEventSourcetList = res.data.eventcountSource
+          //  事件分布
+          that.todayEventCountDeptList = res.data.eventcountDept
+          //  事件分类
+          that.todayEventCountTypeList = res.data.eventcountType
+          if (res.data.eventcountSource != null && res.data.eventcountSource.length > 0) {
+            for (let i = 0; i < res.data.eventcountSource.length; i++) {
+              let data = {}
+              data.name = res.data.eventcountSource[i].eventSourceName
+              data.value = res.data.eventcountSource[i].count
+              this.eventChartData.push(data)
+            }
+          }
+          this.eventChart()
           that.markersList = [];
-          if(res.data.visuForestVgdEventBOList!=null&&res.data.visuForestVgdEventBOList.length>0){
-            for (let i = 0; i < res.data.visuForestVgdEventBOList.length; i++) {
+          if(res.data.eventListAll!=null&&res.data.eventListAll.length>0){
+            for (let i = 0; i < res.data.eventListAll.length; i++) {
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
@@ -1237,24 +1326,24 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.visuForestVgdEventBOList.length>500){
+              if(res.data.eventListAll.length>500){
                 markersMap.isAggregation = true
               }
-              if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_1"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_2"||res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_6"){
+              if(res.data.eventListAll[i].eventStatus=="event_event_status_1"||res.data.eventListAll[i].eventStatus=="event_event_status_2"||res.data.eventListAll[i].eventStatus=="event_event_status_6"){
                 markersMap.click = "showEventInfo_Processed"
-              }else if(res.data.visuForestVgdEventBOList[i].eventStatus=="event_event_status_4"){
+              }else if(res.data.eventListAll[i].eventStatus=="event_event_status_4"){
                 markersMap.click = "showEventInfo_notProcessed"
               }else{
                 markersMap.click = "showEventInfo_Processed"
               }
-              markersMap.parameter = res.data.visuForestVgdEventBOList[i].id
-              markersMap.lng = res.data.visuForestVgdEventBOList[i].longitude
-              markersMap.lat =res.data.visuForestVgdEventBOList[i].latitude
+              markersMap.parameter = res.data.eventListAll[i].id
+              markersMap.lng = res.data.eventListAll[i].longitude
+              markersMap.lat =res.data.eventListAll[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>经纬度：' +res.data.visuForestVgdEventBOList[i].longitude + ',' +res.data.visuForestVgdEventBOList[i]
+                '                  <h4>经纬度：' +res.data.eventListAll[i].longitude + ',' +res.data.eventListAll[i]
                   .latitude + '</h4>' +
                 '                </div>' +
                 '                </div>' +
@@ -1262,57 +1351,27 @@
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件名称：' +res.data.visuForestVgdEventBOList[i].eventTitle + '</h4>' +
+                '                  <h4>事件名称：' +res.data.eventListAll[i].eventTitle + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '<span>' +
                 '                  <div class="d-l-con">' +
                 '                  <div class="d-l-l-text">' +
-                '                  <h4>事件时间：' +res.data.visuForestVgdEventBOList[i].reportTime + '</h4>' +
+                '                  <h4>事件时间：' +res.data.eventListAll[i].reportTime + '</h4>' +
                 '                </div>' +
                 '                </div>' +
                 '                </span>' +
                 '</div>';
               that.markersList.push(markersMap)
             }
+            that.eventList=res.data.eventListAll;
             setTimeout(() => {
               that.$refs.supermap.clearM(false)
+              that.$refs.supermap.clearM(true)
               that.$refs.supermap.setMarkers(that.markersList)
-            }, 1000);
+            },1000)
           }
-
-          that.visuForestCloudRYBO=res.data.visuForestCloudRYBO;
-          // VisuForestCloudTodaySjfbBO: (2) [{…}, {…}]
-          // baseinfo: {baseinfo: '子挖的'}基本情况
-          // cameraList: (2) [{…}, {…}]
-          // visuForestCloudRYBO: (3) [{…}, {…}, {…}]
-          // visuForestCloudTodaySjlyBOList: (3) [{…}, {…}, {…}]
-          // visuForestCloudTodayTjBO: {wclCount: '82', clzCount: '0', ybjCount: '0'}
-          // visuForestVgdEventBOList
-          this.cameraChat();
-        })
-      },
-      getTodayEvent() {
-        let that = this
-        //获取右侧菜单列表
-        getTodayEvent().then(res => {
-          //今日事件
-          that.todayEventCountList = res.data.eventcountStatus
-          that.todayEventSourcetList = res.data.eventcountSource
-          //  事件分布
-          that.todayEventCountDeptList = res.data.eventcountDept
-          //  事件分类
-          that.todayEventCountTypeList = res.data.eventcountType
-          if (res.data.eventcountSource != null && res.data.eventcountSource.length > 0) {
-            for (let i = 0; i < res.data.eventcountSource.length; i++) {
-              let data = {}
-              data.name = res.data.eventcountSource[i].eventSourceName
-              data.value = res.data.eventcountSource[i].count
-              this.eventChartData.push(data)
-            }
-          }
-          this.eventChart()
         })
       },
       todayEventCountSetMarkers(eventStatus) {