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