彭宇 3 lat temu
rodzic
commit
efaefcf866
2 zmienionych plików z 10 dodań i 10 usunięć
  1. 4 4
      src/views/event.vue
  2. 6 6
      src/views/forest.vue

+ 4 - 4
src/views/event.vue

@@ -1001,7 +1001,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventList.length>500){
+              if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
               if(eventStatus=="event_event_status_1_2_6"){
@@ -1073,7 +1073,7 @@
             isAggregation: false
           }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
+            if(res.data.eventList.length>50){
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
@@ -1145,7 +1145,7 @@
             isAggregation: false
           }
           if(res.data.eventList!=null&&res.data.eventList.length>0){
-            if(res.data.eventList.length>500){
+            if(res.data.eventList.length>50){
               markersMap.isAggregation = true
             }
             for (let i = 0; i < res.data.eventList.length; i++) {
@@ -1212,7 +1212,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventList.length>500){
+              if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
               markersMap.lng = res.data.eventList[i].longitude

+ 6 - 6
src/views/forest.vue

@@ -1038,7 +1038,7 @@
                   marke.parameter =   code;
                   marke.keepBindPopup = false;
                   marke.isAggregation = false;
-                  marke.icon = "marker";
+                  marke.icon = "camera";
                   that.markersMapList.push(marke)
                 }
               }
@@ -1329,7 +1329,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventListAll.length>500){
+              if(res.data.eventListAll.length>50){
                 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"){
@@ -1396,7 +1396,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventList.length>500){
+              if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
               if(eventStatus=="event_event_status_1_2_6"){
@@ -1468,7 +1468,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(res.data.eventList.length>500){
+              if(res.data.eventList.length>50){
                 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"){
@@ -1547,7 +1547,7 @@
               }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
                 markersMap.click = "showEventInfo_notProcessed"
               }
-              if(res.data.eventList.length>500){
+              if(res.data.eventList.length>50){
                 markersMap.isAggregation = true
               }
               markersMap.lng = res.data.eventList[i].longitude
@@ -1615,7 +1615,7 @@
                 keepBindPopup: false,
                 isAggregation: false
               }
-              if(this.cameraList.length>500){
+              if(this.cameraList.length>50){
                 markersMap.isAggregation = true
               }
               if(this.cameraList[i].channelCode!=null){