|
@@ -1421,11 +1421,11 @@ export default {
|
|
click: '',
|
|
click: '',
|
|
parameter: '',
|
|
parameter: '',
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
- isAggregation: false
|
|
|
|
- }
|
|
|
|
- if (res.data.length > 50) {
|
|
|
|
- markersMap.isAggregation = true
|
|
|
|
|
|
+ isAggregation: true
|
|
}
|
|
}
|
|
|
|
+ // if (res.data.length > 50) {
|
|
|
|
+ // markersMap.isAggregation = true
|
|
|
|
+ // }
|
|
if (type == 'qsk') {
|
|
if (type == 'qsk') {
|
|
markersMap.icon = 'sj-icon-waterintake'
|
|
markersMap.icon = 'sj-icon-waterintake'
|
|
} else if (type == 'sh') {
|
|
} else if (type == 'sh') {
|
|
@@ -1907,7 +1907,7 @@ export default {
|
|
click: '',
|
|
click: '',
|
|
parameter: '',
|
|
parameter: '',
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
- isAggregation: false,
|
|
|
|
|
|
+ isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
}
|
|
}
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
@@ -1945,7 +1945,7 @@ export default {
|
|
click: 'preview',
|
|
click: 'preview',
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
- isAggregation: false,
|
|
|
|
|
|
+ isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
}
|
|
}
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
@@ -1991,7 +1991,7 @@ export default {
|
|
click: '',
|
|
click: '',
|
|
parameter: '',
|
|
parameter: '',
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
- isAggregation: false,
|
|
|
|
|
|
+ isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
}
|
|
}
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
if (res.data.catalogue.eventStatusValue == 'forest_event_status_1' && res.data.catalogue.urgeCount == 0) {
|
|
@@ -2031,7 +2031,7 @@ export default {
|
|
click: 'preview',
|
|
click: 'preview',
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
parameter: {code:res.data.centermonitorTCamera.cameraCode,type:res.data.centermonitorTCamera.cameraFactory},
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
- isAggregation: false,
|
|
|
|
|
|
+ isAggregation: true,
|
|
radius: 0
|
|
radius: 0
|
|
}
|
|
}
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|