数据中心最新

src/views/event.vue

@@ -1094,16 +1094,16 @@
         getEventSourceList(eventSource).then(res => {
           that.eventList = [];
           that.markersList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
+            let markersMap = {
+              lng: 124.59,
+              lat: 43.02,
+              icon: 'marker',
+              bindPopupHtml: '',
+              click: '',
+              keepBindPopup: false,
+              isAggregation: false
+            }
             if(res.data.eventList.length>500){
               markersMap.isAggregation = true
             }
@@ -1166,20 +1166,20 @@
         getEventListByDeptIdList(deptId).then(res => {
           that.markersList = [];
           that.eventList = [];
-          let markersMap = {
-            lng: 124.59,
-            lat: 43.02,
-            icon: 'marker',
-            bindPopupHtml: '',
-            click: '',
-            keepBindPopup: false,
-            isAggregation: false
-          }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
-              markersMap.isAggregation = true
-            }
             for (let i = 0; i < res.data.eventList.length; i++) {
+              let markersMap = {
+                lng: 124.59,
+                lat: 43.02,
+                icon: 'marker',
+                bindPopupHtml: '',
+                click: '',
+                keepBindPopup: false,
+                isAggregation: false
+              }
+              if(res.data.eventList.length>500){
+                markersMap.isAggregation = true
+              }
               if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
                 markersMap.click = "showEventInfo_Processed"
               }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
@@ -1240,11 +1240,6 @@
           that.eventList = [];
           if(res.data.eventList!=null&&res.data.eventList.length>0){
             for (let i = 0; i < res.data.eventList.length; i++) {
-              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
-                markersMap.click = "showEventInfo_Processed"
-              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
-                markersMap.click = "showEventInfo_notProcessed"
-              }
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
@@ -1257,6 +1252,11 @@
               if(res.data.eventList.length>500){
                 markersMap.isAggregation = true
               }
+              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
               markersMap.bindPopupHtml = '<div class="map-tip">' +

src/views/forest.vue

@@ -1530,11 +1530,6 @@
 
           if(res.data.eventList!=null&&res.data.eventList.length>0){
             for (let i = 0; i < res.data.eventList.length; i++) {
-              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
-                markersMap.click = "showEventInfo_Processed"
-              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
-                markersMap.click = "showEventInfo_notProcessed"
-              }
               let markersMap = {
                 lng: 124.59,
                 lat: 43.02,
@@ -1544,6 +1539,11 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
+              if(res.data.eventList[i].eventStatus=="event_event_status_1"||res.data.eventList[i].eventStatus=="event_event_status_2"||res.data.eventList[i].eventStatus=="event_event_status_6"){
+                markersMap.click = "showEventInfo_Processed"
+              }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
+                markersMap.click = "showEventInfo_notProcessed"
+              }
               if(res.data.eventList.length>500){
                 markersMap.isAggregation = true
               }