|
@@ -502,7 +502,7 @@ import {getUserProfile} from "@/api/system/user";
|
|
/** ----------------------------------底部按钮公用组件结束------------------------------------- */
|
|
/** ----------------------------------底部按钮公用组件结束------------------------------------- */
|
|
},
|
|
},
|
|
mounted() {
|
|
mounted() {
|
|
-
|
|
|
|
|
|
+
|
|
// 初始化地图数据
|
|
// 初始化地图数据
|
|
this.getSuperMapUrl();
|
|
this.getSuperMapUrl();
|
|
this.getBaseInfo()
|
|
this.getBaseInfo()
|
|
@@ -616,7 +616,7 @@ import {getUserProfile} from "@/api/system/user";
|
|
},
|
|
},
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
/** ----------------------------------weosocket结束------------------------------------- */
|
|
methods: {
|
|
methods: {
|
|
-
|
|
|
|
|
|
+
|
|
//初始化地图数据
|
|
//初始化地图数据
|
|
getSuperMapUrl(){
|
|
getSuperMapUrl(){
|
|
getUserProfile().then(response => {
|
|
getUserProfile().then(response => {
|
|
@@ -1475,13 +1475,15 @@ import {getUserProfile} from "@/api/system/user";
|
|
eventCode: data.eventCode
|
|
eventCode: data.eventCode
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
if (res.data != undefined) {
|
|
if (res.data != undefined) {
|
|
- //插入到第一条
|
|
|
|
- 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)
|
|
|
|
+ }
|
|
}
|
|
}
|
|
})
|
|
})
|
|
}
|
|
}
|
|
@@ -1718,4 +1720,4 @@ import {getUserProfile} from "@/api/system/user";
|
|
background-color: #0f3655;
|
|
background-color: #0f3655;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
-</style>
|
|
|
|
|
|
+</style>
|