|
@@ -678,6 +678,7 @@
|
|
return y + '-' + m + '-' + d
|
|
return y + '-' + m + '-' + d
|
|
},
|
|
},
|
|
selectDay(day) { //日历点击
|
|
selectDay(day) { //日历点击
|
|
|
|
+ this.pageNum = 1
|
|
this.getTodayEvents(day)
|
|
this.getTodayEvents(day)
|
|
this.getDeptEventCount(day)
|
|
this.getDeptEventCount(day)
|
|
this.getWeather(day)
|
|
this.getWeather(day)
|
|
@@ -1220,6 +1221,11 @@
|
|
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 == 601){
|
|
|
|
+ res.data.picturePath = "../assets/images/大气监测.png"
|
|
|
|
+ }els if(res.data.eventType == 602){
|
|
|
|
+ res.data.picturePath = "../assets/images/水质监测.png"
|
|
|
|
+ }
|
|
//插入到第一条
|
|
//插入到第一条
|
|
this.eventList.unshift(res.data)
|
|
this.eventList.unshift(res.data)
|
|
// 插入后删除最后一条 保证列表中为10条数据
|
|
// 插入后删除最后一条 保证列表中为10条数据
|