Merge remote-tracking branch 'origin/visu_firecontrol_01_siping_2.5d' into visu_firecontrol_01_siping_2.5d

# Conflicts:
#	src/views/firespread.vue

src/views/eventdetailsdialog.vue

@@ -1664,13 +1664,7 @@ console.log(this.dutysystemTableData)
                   keepBindPopup: false,
                   isAggregation: true
                 }
-                if (res.data.pointList.length > 50) {
-                  markersMap.isAggregation = true
-                }
-                // centerdata_t_firecontrol_basic_linkage_force
-                // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
                 markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
-                // alert(res.data.pointList[i].longitude)
                 markersMap.lng = res.data.pointList[i].longitude;
                 markersMap.lat = res.data.pointList[i].latitude;
                 markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -1739,9 +1733,6 @@ console.log(this.dutysystemTableData)
                 keepBindPopup: false,
                 isAggregation: true
               }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
-              }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-centerdata-t-forest-waterintake'
               } else if (type == 'sh') {

src/views/firespread.vue

@@ -2158,13 +2158,7 @@ export default {
                   keepBindPopup: false,
                   isAggregation: true
                 }
-                if (res.data.pointList.length > 50) {
-                  markersMap.isAggregation = true
-                }
-                // centerdata_t_firecontrol_basic_linkage_force
-                // sj-icon-map-centerdata-t-firecontrol-basic-linkage-force
                 markersMap.icon = 'sj-icon-map-' + type.replaceAll("_", "-");
-                // alert(res.data.pointList[i].longitude)
                 markersMap.lng = res.data.pointList[i].longitude;
                 markersMap.lat = res.data.pointList[i].latitude;
                 markersMap.bindPopupHtml = '<div class="map-tip">' +
@@ -2400,9 +2394,6 @@ export default {
                 keepBindPopup: false,
                 isAggregation: true
               }
-              if (res.data.length > 50) {
-                markersMap.isAggregation = true
-              }
               if (type == 'qsk') {
                 markersMap.icon = 'sj-icon-waterintake'
               } else if (type == 'sh') {