|
|
@@ -73,7 +73,7 @@ import {
|
|
|
fireControlViewList,
|
|
|
getResourcePoint,
|
|
|
fireControlViewPoint,
|
|
|
- getResourcePointByDeptId
|
|
|
+ getResourcePointByDeptId, getPointByDeptId
|
|
|
} from '@/api/datacenter'
|
|
|
|
|
|
import supermap from '@/components/supermap' //超图
|
|
|
@@ -717,10 +717,10 @@ export default {
|
|
|
this.listCurrentIndex = deptId
|
|
|
let that = this
|
|
|
//点击左侧地图落点
|
|
|
- getResourcePointByDeptId(that.resourceTable, deptId).then(res => {
|
|
|
+ getPointByDeptId(that.resourceTable, deptId).then(res => {
|
|
|
that.markersList = []
|
|
|
- if (res.data.resourceList != null && res.data.resourceList.length > 0) {
|
|
|
- for (let i = 0; i < res.data.resourceList.length; i++) {
|
|
|
+ if (res.data != null && res.data.length > 0) {
|
|
|
+ for (let i = 0; i < res.data.length; i++) {
|
|
|
let markersMap = {
|
|
|
lng: 124.59,
|
|
|
lat: 43.02,
|
|
|
@@ -732,21 +732,21 @@ export default {
|
|
|
}
|
|
|
if (that.resourceTable == 'centerdata_t_firecontrol_basic_linkage_force') { //基本联动力量
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-basic-linkage-force'
|
|
|
- markersMap.lng = res.data.resourceList[i].longitude
|
|
|
- markersMap.lat = res.data.resourceList[i].latitude
|
|
|
+ markersMap.lng = res.data[i].longitude
|
|
|
+ markersMap.lat = res.data[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
|
|
|
- .data.resourceList[i].latitude + '</h4>' +
|
|
|
+ ' <h4>经纬度：' + res.data[i].longitude + ',' + res
|
|
|
+ .data[i].latitude + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>单位名称：' + res.data.resourceList[i].company +
|
|
|
+ ' <h4>单位名称：' + res.data[i].company +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -754,55 +754,55 @@ export default {
|
|
|
'</div>'
|
|
|
} else if (that.resourceTable == 'centerdata_t_firecontrol_fire_force') { //消防力量
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fire-force'
|
|
|
- markersMap.lng = res.data.resourceList[i].longitude
|
|
|
- markersMap.lat = res.data.resourceList[i].latitude
|
|
|
+ markersMap.lng = res.data[i].longitude
|
|
|
+ markersMap.lat = res.data[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
|
|
|
- .data.resourceList[i].latitude + '</h4>' +
|
|
|
+ ' <h4>经纬度：' + res.data[i].longitude + ',' + res
|
|
|
+ .data[i].latitude + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>地址：' + res.data.resourceList[i].address + '</h4>' +
|
|
|
+ ' <h4>地址：' + res.data[i].address + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>负责人：' + res.data.resourceList[i].principal + '</h4>' +
|
|
|
+ ' <h4>负责人：' + res.data[i].principal + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系电话：' + res.data.resourceList[i].contact + '</h4>' +
|
|
|
+ ' <h4>联系电话：' + res.data[i].contact + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span></div>'
|
|
|
} else if (that.resourceTable == 'centerdata_t_firecontrol_foam_liquid') { //泡沫液
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-foam-liquid'
|
|
|
- markersMap.lng = res.data.resourceList[i].longitude
|
|
|
- markersMap.lat = res.data.resourceList[i].latitude
|
|
|
+ markersMap.lng = res.data[i].longitude
|
|
|
+ markersMap.lat = res.data[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
|
|
|
- .data.resourceList[i].latitude + '</h4>' +
|
|
|
+ ' <h4>经纬度：' + res.data[i].longitude + ',' + res
|
|
|
+ .data[i].latitude + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>单位名称：' + res.data.resourceList[i].company +
|
|
|
+ ' <h4>单位名称：' + res.data[i].company +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -810,7 +810,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系人：' + res.data.resourceList[i].contacts +
|
|
|
+ ' <h4>联系人：' + res.data[i].contacts +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -818,27 +818,27 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系电话：' + res.data.resourceList[i].contactsPhone + '</h4>' +
|
|
|
+ ' <h4>联系电话：' + res.data[i].contactsPhone + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span></div>'
|
|
|
} else if (that.resourceTable == 'centerdata_t_firecontrol_fulltime_station') { //专职站
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-fulltime-station'
|
|
|
- markersMap.lng = res.data.resourceList[i].longitude
|
|
|
- markersMap.lat = res.data.resourceList[i].latitude
|
|
|
+ markersMap.lng = res.data[i].longitude
|
|
|
+ markersMap.lat = res.data[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
|
|
|
- .data.resourceList[i].latitude + '</h4>' +
|
|
|
+ ' <h4>经纬度：' + res.data[i].longitude + ',' + res
|
|
|
+ .data[i].latitude + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>地址：' + res.data.resourceList[i].address +
|
|
|
+ ' <h4>地址：' + res.data[i].address +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -846,35 +846,35 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>负责人：' + res.data.resourceList[i].principal + '</h4>' +
|
|
|
+ ' <h4>负责人：' + res.data[i].principal + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>电话：' + res.data.resourceList[i].contactsPhone + '</h4>' +
|
|
|
+ ' <h4>电话：' + res.data[i].contactsPhone + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'</div>'
|
|
|
} else if (that.resourceTable == 'centerdata_t_firecontrol_other_linkage_force') { //其他联动力量
|
|
|
markersMap.icon = 'sj-icon-map-centerdata-t-firecontrol-other-linkage-force'
|
|
|
- markersMap.lng = res.data.resourceList[i].longitude
|
|
|
- markersMap.lat = res.data.resourceList[i].latitude
|
|
|
+ markersMap.lng = res.data[i].longitude
|
|
|
+ markersMap.lat = res.data[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>经纬度：' + res.data.resourceList[i].longitude + ',' + res
|
|
|
- .data.resourceList[i].latitude + '</h4>' +
|
|
|
+ ' <h4>经纬度：' + res.data[i].longitude + ',' + res
|
|
|
+ .data[i].latitude + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>单位名称：' + res.data.resourceList[i].company +
|
|
|
+ ' <h4>单位名称：' + res.data[i].company +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -882,7 +882,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>单位电话：' + res.data.resourceList[i].companyPhone +
|
|
|
+ ' <h4>单位电话：' + res.data[i].companyPhone +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -890,7 +890,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系人：' + res.data.resourceList[i].contacts +
|
|
|
+ ' <h4>联系人：' + res.data[i].contacts +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
@@ -898,7 +898,7 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>联系电话：' + res.data.resourceList[i].contactsPhone +
|
|
|
+ ' <h4>联系电话：' + res.data[i].contactsPhone +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
JX.LI