|
|
@@ -14,11 +14,14 @@
|
|
|
<div class="d-l-con-icon">
|
|
|
<div class="icon-con" :class="{on:iconCurrentIndex==item.resourceTable}"
|
|
|
v-for="(item,index) in resourcesList"
|
|
|
- v-on:click="indentleftSetMarkers(item.resourceTable)">
|
|
|
+ v-on:click="indentleftSetMarkers(item.type)">
|
|
|
+ <!--v-on:click="indentleftSetMarkers(item.resourceTable)">-->
|
|
|
<div class="iconfont icon icon-normal" :class="item.icon"></div>
|
|
|
<div class="icon-text">
|
|
|
- <h6>{{ item.count }}</h6>
|
|
|
- <h5>{{ item.resourceName }}</h5>
|
|
|
+ <h6>{{ item.num }}</h6>
|
|
|
+ <!--<h6>{{ item.count }}</h6>-->
|
|
|
+ <h5>{{ item.name }}</h5>
|
|
|
+ <!--<h5>{{ item.resourceName }}</h5>-->
|
|
|
</div>
|
|
|
</div>
|
|
|
</div>
|
|
|
@@ -201,6 +204,7 @@ export default {
|
|
|
let that = this
|
|
|
//获取左侧菜单列表
|
|
|
getResource().then(res => {
|
|
|
+ console.log("res.data=", res.data)
|
|
|
that.resourcesList = res.data
|
|
|
//截取data.resourceTable字段中“_”分隔符最后一个作为关键字,重新拼接成前端需要的图标:class,格式sj-icon-xxxx,将其set回原数组
|
|
|
res.data.forEach(function(data, index) {
|
|
|
@@ -236,7 +240,9 @@ export default {
|
|
|
keepBindPopup: false,
|
|
|
isAggregation: false
|
|
|
}
|
|
|
+ console.log("res.data.resourceList[i]=", res.data.resourceList[i])
|
|
|
if (resourceTable == 'centerdata_t_emergency_warehouse') { //仓库
|
|
|
+ // alert("仓库")
|
|
|
markersMap.icon = 'marker'
|
|
|
markersMap.lng = res.data.resourceList[i].longitude
|
|
|
markersMap.lat = res.data.resourceList[i].latitude
|
|
|
@@ -252,13 +258,14 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>仓库名称：' + res.data.resourceList[i].warehouseName +
|
|
|
+ ' <h4>仓库名称：' + res.data.resourceList[i].name +
|
|
|
'</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'</div>'
|
|
|
} else if (resourceTable == 'centerdata_t_emergency_team') { //队伍
|
|
|
+ // alert("队伍")
|
|
|
markersMap.icon = 'marker'
|
|
|
markersMap.lng = res.data.resourceList[i].longitude
|
|
|
markersMap.lat = res.data.resourceList[i].latitude
|
|
|
@@ -274,35 +281,37 @@ export default {
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>队伍名称：' + res.data.resourceList[i].teamName + '</h4>' +
|
|
|
+ ' <h4>队伍名称：' + res.data.resourceList[i].name + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
+ (res.data.resourceList[i].expertise_areas?
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>擅长领域：' + res.data.resourceList[i].expertise_areas + '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>':'') +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>擅长领域：' + res.data.resourceList[i].expertiseAreas + '</h4>' +
|
|
|
+ ' <h4>队伍人数(正式)：' + res.data.resourceList[i].personnumber_z + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'<span>' +
|
|
|
' <div class="d-l-con">' +
|
|
|
' <div class="d-l-l-text">' +
|
|
|
- ' <h4>队伍人数(正式)：' + res.data.resourceList[i].personnumberZ + '</h4>' +
|
|
|
- ' </div>' +
|
|
|
- ' </div>' +
|
|
|
- ' </span>' +
|
|
|
- '<span>' +
|
|
|
- ' <div class="d-l-con">' +
|
|
|
- ' <div class="d-l-l-text">' +
|
|
|
- ' <h4>队伍人数(合同)：' + res.data.resourceList[i].personnumberH + '</h4>' +
|
|
|
+ ' <h4>队伍人数(合同)：' + res.data.resourceList[i].personnumber_h + '</h4>' +
|
|
|
' </div>' +
|
|
|
' </div>' +
|
|
|
' </span>'+
|
|
|
'</div>'
|
|
|
} else if (resourceTable == 'centerdata_t_emergency_patrolpoint') { //巡更点
|
|
|
+ // alert("巡更点")
|
|
|
markersMap.icon = 'marker'
|
|
|
- markersMap.isAggregation = true
|
|
|
+ // markersMap.isAggregation = true
|
|
|
markersMap.lng = res.data.resourceList[i].longitude
|
|
|
markersMap.lat = res.data.resourceList[i].latitude
|
|
|
markersMap.bindPopupHtml = '<div class="map-tip">' +
|
|
|
@@ -345,6 +354,68 @@ export default {
|
|
|
' </div>' +
|
|
|
' </span>' +
|
|
|
'</div>'
|
|
|
+ } else if (resourceTable == 'centerdata_t_emergency_enterprise') { //企业
|
|
|
+ // alert("企业")
|
|
|
+ markersMap.icon = 'marker'
|
|
|
+ // markersMap.isAggregation = true
|
|
|
+ markersMap.lng = res.data.resourceList[i].longitude
|
|
|
+ markersMap.lat = res.data.resourceList[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>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>企业名称：' + res.data.resourceList[i].management +
|
|
|
+ '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>社会组织代码：' + res.data.resourceList[i].organization_code +
|
|
|
+ '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>负责人：' + res.data.resourceList[i].charger +
|
|
|
+ '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>负责人电话：' + res.data.resourceList[i].charger_phone +
|
|
|
+ '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>副负责人：' + res.data.resourceList[i].sec_charger + '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '<span>' +
|
|
|
+ ' <div class="d-l-con">' +
|
|
|
+ ' <div class="d-l-l-text">' +
|
|
|
+ ' <h4>副负责人电话：' + res.data.resourceList[i].sec_charger_phone + '</h4>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </div>' +
|
|
|
+ ' </span>' +
|
|
|
+ '</div>'
|
|
|
}
|
|
|
that.markersList.push(markersMap)
|
|
|
}
|
wangzhe