|
@@ -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">' +
|
|
@@ -2398,10 +2392,7 @@ export default {
|
|
|
click: '',
|
|
|
parameter: '',
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: false
|
|
|
- }
|
|
|
- if (res.data.length > 50) {
|
|
|
- markersMap.isAggregation = true
|
|
|
+ isAggregation: true
|
|
|
}
|
|
|
if (type == 'qsk') {
|
|
|
markersMap.icon = 'sj-icon-waterintake'
|
|
@@ -2902,7 +2893,7 @@ export default {
|
|
|
click: '',
|
|
|
parameter: '',
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: false,
|
|
|
+ isAggregation: true,
|
|
|
radius: 0
|
|
|
}
|
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
@@ -2941,7 +2932,7 @@ export default {
|
|
|
click: 'preview',
|
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.name},
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: false,
|
|
|
+ isAggregation: true,
|
|
|
radius: 0
|
|
|
}
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
@@ -2998,7 +2989,7 @@ export default {
|
|
|
click: '',
|
|
|
parameter: '',
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: false,
|
|
|
+ isAggregation: true,
|
|
|
radius: 0
|
|
|
}
|
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
@@ -3039,7 +3030,7 @@ export default {
|
|
|
click: 'preview',
|
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory,name:res.data.centermonitorTCamera.cameraName},
|
|
|
keepBindPopup: false,
|
|
|
- isAggregation: false,
|
|
|
+ isAggregation: true,
|
|
|
radius: 0
|
|
|
}
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|