|
@@ -1236,17 +1236,18 @@ export default {
|
|
if (data.tag == "eventPush" && that.markersList.filter(item => data.eventCode == item.parameter).length == 0) {
|
|
if (data.tag == "eventPush" && that.markersList.filter(item => data.eventCode == item.parameter).length == 0) {
|
|
getEventPush({ eventCode: data.eventCode }).then((res) => {
|
|
getEventPush({ eventCode: data.eventCode }).then((res) => {
|
|
if (res.data != undefined) {
|
|
if (res.data != undefined) {
|
|
- if(res.data.eventType == 510){
|
|
|
|
|
|
+ if (res.data.eventTypeXl == 510) {
|
|
res.data.picturePath = "../assets/images/水压.png"
|
|
res.data.picturePath = "../assets/images/水压.png"
|
|
}
|
|
}
|
|
-
|
|
|
|
- //插入到第一条
|
|
|
|
- this.eventList.unshift(res.data)
|
|
|
|
- // 插入后删除最后一条 保证列表中为10条数据
|
|
|
|
- if (this.eventList.length > 9)
|
|
|
|
- this.eventList.splice(10, 1)
|
|
|
|
- // 将收到的数据在地图上添加
|
|
|
|
- this.getWebSocketEvent(res.data)
|
|
|
|
|
|
+ if (res.data.eventStatusValue !== "forest_event_status_1") {
|
|
|
|
+ //插入到第一条
|
|
|
|
+ this.eventList.unshift(res.data)
|
|
|
|
+ // 插入后删除最后一条 保证列表中为10条数据
|
|
|
|
+ if (this.eventList.length > 9)
|
|
|
|
+ this.eventList.splice(10, 1)
|
|
|
|
+ // 将收到的数据在地图上添加
|
|
|
|
+ this.getWebSocketEvent(res.data)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|