|
@@ -227,11 +227,12 @@
|
|
let that = this
|
|
let that = this
|
|
//获取左侧菜单列表
|
|
//获取左侧菜单列表
|
|
selectForestAnimalListByType(type).then(res => {
|
|
selectForestAnimalListByType(type).then(res => {
|
|
|
|
+ console.log(res)
|
|
this.animalSjfb = res.data.visuForestAnimalBOList
|
|
this.animalSjfb = res.data.visuForestAnimalBOList
|
|
- this.animalSjlb = res.data.visuForestAnimalBOList
|
|
|
|
|
|
+ this.animalSjlb = res.data.visuForestVgdEventBOList
|
|
that.markersList = [];
|
|
that.markersList = [];
|
|
- if (res.data.visuForestAnimalBOList != null && res.data.visuForestAnimalBOList.length > 0) {
|
|
|
|
- for (let i = 0; i < res.data.visuForestAnimalBOList.length; i++) {
|
|
|
|
|
|
+ if (res.data.visuForestVgdEventBOList != null && res.data.visuForestVgdEventBOList.length > 0) {
|
|
|
|
+ for (let i = 0; i < res.data.visuForestVgdEventBOList.length; i++) {
|
|
let markersMap = {
|
|
let markersMap = {
|
|
lng: 124.59,
|
|
lng: 124.59,
|
|
lat: 43.02,
|
|
lat: 43.02,
|
|
@@ -242,16 +243,16 @@
|
|
keepBindPopup: false,
|
|
keepBindPopup: false,
|
|
isAggregation: false
|
|
isAggregation: false
|
|
}
|
|
}
|
|
- if (res.data.visuForestAnimalBOList.length > 50) {
|
|
|
|
|
|
+ if (res.data.visuForestVgdEventBOList.length > 50) {
|
|
markersMap.isAggregation = true
|
|
markersMap.isAggregation = true
|
|
}
|
|
}
|
|
- markersMap.lng = res.data.visuForestAnimalBOList[i].longitude
|
|
|
|
- markersMap.lat = res.data.visuForestAnimalBOList[i].latitude
|
|
|
|
|
|
+ markersMap.lng = res.data.visuForestVgdEventBOList[i].longitude
|
|
|
|
+ markersMap.lat = res.data.visuForestVgdEventBOList[i].latitude
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
'<span>' +
|
|
'<span>' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
- ' <h4>经纬度:' + res.data.visuForestAnimalBOList[i].longitude + ',' + res.data.visuForestAnimalBOList[i]
|
|
|
|
|
|
+ ' <h4>经纬度:' + res.data.visuForestVgdEventBOList[i].longitude + ',' + res.data.visuForestVgdEventBOList[i]
|
|
.latitude + '</h4>' +
|
|
.latitude + '</h4>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
@@ -259,14 +260,14 @@
|
|
'<span>' +
|
|
'<span>' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
- ' <h4>事件名称:' + res.data.visuForestAnimalBOList[i].eventTitle + '</h4>' +
|
|
|
|
|
|
+ ' <h4>事件名称:' + res.data.visuForestVgdEventBOList[i].eventTitle + '</h4>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </span>' +
|
|
' </span>' +
|
|
'<span>' +
|
|
'<span>' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-con">' +
|
|
' <div class="d-l-l-text">' +
|
|
' <div class="d-l-l-text">' +
|
|
- ' <h4>事件时间:' + res.data.visuForestAnimalBOList[i].reportTime + '</h4>' +
|
|
|
|
|
|
+ ' <h4>事件时间:' + res.data.visuForestVgdEventBOList[i].reportTime + '</h4>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </div>' +
|
|
' </span>' +
|
|
' </span>' +
|