|
@@ -1134,7 +1134,13 @@
|
|
markersMap.isAggregation = true
|
|
markersMap.isAggregation = true
|
|
}
|
|
}
|
|
for (let i = 0; i < res.data.eventList.length; i++) {
|
|
for (let i = 0; i < res.data.eventList.length; i++) {
|
|
-
|
|
|
|
|
|
+ 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"){
|
|
|
|
+ markersMap.click = "showEventInfo_Processed"
|
|
|
|
+ }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
|
|
|
|
+ markersMap.click = "showEventInfo_notProcessed"
|
|
|
|
+ }else{
|
|
|
|
+ markersMap.click = "showEventInfo_Processed"
|
|
|
|
+ }
|
|
markersMap.lng = res.data.eventList[i].longitude
|
|
markersMap.lng = res.data.eventList[i].longitude
|
|
markersMap.lat =res.data.eventList[i].latitude
|
|
markersMap.lat =res.data.eventList[i].latitude
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
@@ -1188,6 +1194,13 @@
|
|
that.eventList = [];
|
|
that.eventList = [];
|
|
if(res.data.eventList!=null&&res.data.eventList.length>0){
|
|
if(res.data.eventList!=null&&res.data.eventList.length>0){
|
|
for (let i = 0; i < res.data.eventList.length; i++) {
|
|
for (let i = 0; i < res.data.eventList.length; i++) {
|
|
|
|
+ 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"){
|
|
|
|
+ markersMap.click = "showEventInfo_Processed"
|
|
|
|
+ }else if(res.data.eventList[i].eventStatus=="event_event_status_4"){
|
|
|
|
+ markersMap.click = "showEventInfo_notProcessed"
|
|
|
|
+ }else{
|
|
|
|
+ markersMap.click = "showEventInfo_Processed"
|
|
|
|
+ }
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|