数据中心

src/views/event.vue

@@ -1056,6 +1056,7 @@
         let that = this
         getEventStatusList(eventStatus).then(res => {
           that.$refs.supermap.clearM(false)
+          that.$refs.supermap.clearM(true)
           that.eventList=res.data.eventList;
           that.markersList = [];
           let markersMap = {
@@ -1069,10 +1070,15 @@
             isAggregation: false
           }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
+            if(res.data.eventList.length>500){
+              markersMap.isAggregation = true
+            }
             if(eventStatus=="event_event_status_1_2_6"){
               markersMap.click = "showEventInfo_Processed"
             }else if(eventStatus=="event_event_status_4"){
               markersMap.click = "showEventInfo_notProcessed"
+            }else{
+              markersMap.click = "showEventInfo_Processed"
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
               markersMap.parameter = res.data.eventList[i].id
@@ -1122,6 +1128,7 @@
         //点击今日事件后三个按钮列表
         let that = this
         getEventSourceList(eventSource).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.eventList=res.data.eventList;
           that.markersList = [];
@@ -1135,6 +1142,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1182,6 +1192,7 @@
         //点击事件分类
         let that = this
         getEventListByDeptIdList(deptId).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.eventList=res.data.eventList;
           that.markersList = [];
@@ -1195,6 +1206,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1242,6 +1256,7 @@
         //点击事件分类
         let that = this
         getEventListByTypeList(eventType).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.eventList=res.data.eventList;
           that.markersList = [];
@@ -1255,6 +1270,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude

src/views/forest.vue

@@ -1367,6 +1367,7 @@
         //点击今日事件前三个按钮列表
         let that = this
         getEventStatusList(eventStatus).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.markersList = [];
           let markersMap = {
@@ -1379,6 +1380,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1426,6 +1430,7 @@
         //点击今日事件后三个按钮列表
         let that = this
         getEventSourceList(eventSource).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.markersList = [];
           let markersMap = {
@@ -1438,6 +1443,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1485,6 +1493,7 @@
         //点击事件分类
         let that = this
         getEventListByDeptIdList(deptId).then(res => {
+          that.$refs.supermap.clearM(true)
           that.$refs.supermap.clearM(false)
           that.eventList=res.data.eventList;
           that.markersList = [];
@@ -1498,6 +1507,9 @@
             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++) {
               markersMap.lng = res.data.eventList[i].longitude
               markersMap.lat =res.data.eventList[i].latitude
@@ -1544,19 +1556,23 @@
       showDevice(deviceType){
 			  this.cameraMarkersList=[];
 			  if(deviceType=="sxt"){
+          this.$refs.supermap.clearM(true)
           this.$refs.supermap.clearM(false)
+          let markersMap = {
+            lng: 124.59,
+            lat: 43.02,
+            icon: 'camera',
+            bindPopupHtml: '',
+            click: 'preview',
+            parameter: '',
+            keepBindPopup: false,
+            isAggregation: false
+          }
 			    if(this.cameraList!=null&&this.cameraList.length>0){
+            if(this.cameraList.length>500){
+              markersMap.isAggregation = true
+            }
             for (let i = 0; i < this.cameraList.length; i++) {
-              let markersMap = {
-                lng: 124.59,
-                lat: 43.02,
-                icon: 'camera',
-                bindPopupHtml: '',
-                click: 'preview',
-                parameter: '',
-                keepBindPopup: false,
-                isAggregation: false
-              }
               markersMap.parameter=this.cameraList[i].channelCode.split(",");
               markersMap.lng=this.cameraList[i].longitude;
               markersMap.lat=this.cameraList[i].latitude;