|
|
@ -74,8 +74,10 @@ |
|
|
<div class="card-map"> |
|
|
<div class="card-map"> |
|
|
<screen-map class="map" |
|
|
<screen-map class="map" |
|
|
ref="map" |
|
|
ref="map" |
|
|
@clickFeature="clickProject" |
|
|
@clickFeature="clickMapVolunteer" |
|
|
:showIconLayer="true"></screen-map> |
|
|
:showIconLayer="true" |
|
|
|
|
|
:clickType="'popup'" |
|
|
|
|
|
:isAddOpenlay="true"></screen-map> |
|
|
</div> |
|
|
</div> |
|
|
<div class="map-tips"> |
|
|
<div class="map-tips"> |
|
|
|
|
|
|
|
|
@ -293,34 +295,34 @@ export default { |
|
|
if (code === 0) { |
|
|
if (code === 0) { |
|
|
console.log('data-ddd', data) |
|
|
console.log('data-ddd', data) |
|
|
this.vInfo = data |
|
|
this.vInfo = data |
|
|
const arr = [{ |
|
|
const arr = [{ |
|
|
name: '党员数量', |
|
|
name: '党员数量', |
|
|
value: data.partyTotal, |
|
|
value: data.partyTotal, |
|
|
itemStyle: { |
|
|
itemStyle: { |
|
|
color: 'rgba(26, 178, 255, 1)' |
|
|
color: 'rgba(26, 178, 255, 1)' |
|
|
} |
|
|
} |
|
|
}, { |
|
|
}, { |
|
|
name: '居民数量', |
|
|
name: '居民数量', |
|
|
value: data.resiTotal, |
|
|
value: data.resiTotal, |
|
|
itemStyle: { |
|
|
itemStyle: { |
|
|
color: 'rgba(250, 193, 38, 1)' |
|
|
color: 'rgba(250, 193, 38, 1)' |
|
|
} |
|
|
} |
|
|
}] |
|
|
}] |
|
|
const arr1 = [{ |
|
|
const arr1 = [{ |
|
|
name: '党员数量', |
|
|
name: '党员数量', |
|
|
value: data.partyServiceTotal, |
|
|
value: data.partyServiceTotal, |
|
|
itemStyle: { |
|
|
itemStyle: { |
|
|
color: 'rgba(26, 178, 255, 1)' |
|
|
color: 'rgba(26, 178, 255, 1)' |
|
|
} |
|
|
} |
|
|
}, { |
|
|
}, { |
|
|
name: '居民数量', |
|
|
name: '居民数量', |
|
|
value: data.resiServiceTotal, |
|
|
value: data.resiServiceTotal, |
|
|
temStyle: { |
|
|
temStyle: { |
|
|
color: 'rgba(250, 193, 38, 1)' |
|
|
color: 'rgba(250, 193, 38, 1)' |
|
|
} |
|
|
} |
|
|
}] |
|
|
}] |
|
|
this.vPersonal = [ ...arr ] |
|
|
this.vPersonal = [...arr] |
|
|
this.vCount = [ ...arr1 ] |
|
|
this.vCount = [...arr1] |
|
|
this.vpTotal = data.volunteerTotal |
|
|
this.vpTotal = data.volunteerTotal |
|
|
this.vcTotal = data.serviceTotal |
|
|
this.vcTotal = data.serviceTotal |
|
|
this.initCharts(data.volunteerTotal, arr) |
|
|
this.initCharts(data.volunteerTotal, arr) |
|
|
@ -438,8 +440,88 @@ export default { |
|
|
}, |
|
|
}, |
|
|
|
|
|
|
|
|
//点击项目 |
|
|
//点击项目 |
|
|
clickProject (feature) { |
|
|
async clickMapVolunteer (feature) { |
|
|
console.log('标注信息', feature.values_.properties) |
|
|
console.log('标注信息', feature.values_.properties) |
|
|
|
|
|
if (!feature.values_.properties.info.icResiUserId) { |
|
|
|
|
|
return false |
|
|
|
|
|
} |
|
|
|
|
|
const info = feature.values_.properties.info |
|
|
|
|
|
const url = "/epmetuser/icresiuser/resi-brief/" + info.icResiUserId |
|
|
|
|
|
// const url = "http://yapi.elinkservice.cn/mock/245/heart/icpartyunit/distribution" |
|
|
|
|
|
|
|
|
|
|
|
let params = {} |
|
|
|
|
|
|
|
|
|
|
|
const { data, code, msg } = await requestPost(url, params) |
|
|
|
|
|
|
|
|
|
|
|
if (code === 0) { |
|
|
|
|
|
let coordinate = [info.longitude, info.latitude] |
|
|
|
|
|
data.gridName = data.gridName ? data.gridName : '--' |
|
|
|
|
|
data.villageName = data.villageName ? data.villageName : '--' |
|
|
|
|
|
data.icUserName = data.icUserName ? data.icUserName : '--' |
|
|
|
|
|
data.mobile = data.mobile ? data.mobile : '--' |
|
|
|
|
|
data.idCard = data.idCard ? data.idCard : '--' |
|
|
|
|
|
data.birthday = data.birthday ? data.birthday : '--' |
|
|
|
|
|
data.contacts = data.contacts ? data.contacts : '--' |
|
|
|
|
|
data.contactsMobile = data.contactsMobile ? data.contactsMobile : '--' |
|
|
|
|
|
|
|
|
|
|
|
data.isBdhjShow = data.isBdhj ? data.isBdhj === '0' ? '否' : '是' : '--' |
|
|
|
|
|
data.genderShow = data.gender ? data.gender === '0' ? '女' : '男' : '--' |
|
|
|
|
|
let categoriesArray = [] |
|
|
|
|
|
|
|
|
|
|
|
for (let key in data.volunteerCategories) { |
|
|
|
|
|
categoriesArray.push(data.volunteerCategories[key]) |
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
if (categoriesArray.length > 0) { |
|
|
|
|
|
data.categories = categoriesArray.join(',') |
|
|
|
|
|
} else { |
|
|
|
|
|
data.categories = '--' |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
let showData = ` |
|
|
|
|
|
<div style='font-size:16px; color:#FFFFFF;'>居民信息</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:10px'>所属网格： |
|
|
|
|
|
<span>`+ data.gridName + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>所属小区： |
|
|
|
|
|
<span>`+ data.villageName + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>本地户籍： |
|
|
|
|
|
<span>`+ data.isBdhjShow + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>姓名： |
|
|
|
|
|
<span>`+ data.icUserName + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>手机： |
|
|
|
|
|
<span>`+ data.mobile + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>性别： |
|
|
|
|
|
<span>`+ data.genderShow + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>身份证号： |
|
|
|
|
|
<span>`+ data.idCard + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>出生日期： |
|
|
|
|
|
<span>`+ data.birthday + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>联系人： |
|
|
|
|
|
<span>`+ data.contacts + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>联系人手机： |
|
|
|
|
|
<span>`+ data.contactsMobile + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
<div style='font-size:12px; color:#FFFFFF;margin-top:5px'>志愿者类别： |
|
|
|
|
|
<span>`+ data.categories + `</span> |
|
|
|
|
|
</div> |
|
|
|
|
|
` |
|
|
|
|
|
// console.log(showData) |
|
|
|
|
|
this.$refs.map.handleShowPopup(showData, coordinate) |
|
|
|
|
|
|
|
|
|
|
|
} else { |
|
|
|
|
|
this.$message.error(msg) |
|
|
|
|
|
} |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}, |
|
|
}; |
|
|
}; |
|
|
@ -566,12 +648,15 @@ export default { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.map-tips { |
|
|
.map-tips { |
|
|
width: 700px; |
|
|
width: 100%; |
|
|
display: flex; |
|
|
display: flex; |
|
|
// justify-content: start; |
|
|
// justify-content: center; |
|
|
|
|
|
align-items: center; |
|
|
flex-wrap: wrap; |
|
|
flex-wrap: wrap; |
|
|
padding-top: 10px; |
|
|
box-sizing: border-box; |
|
|
padding-bottom: 20px; |
|
|
padding: 6px 0 0 100px; |
|
|
|
|
|
// padding-top: 10px; |
|
|
|
|
|
// padding-bottom: 10px; |
|
|
|
|
|
|
|
|
.map-tips-item { |
|
|
.map-tips-item { |
|
|
display: flex; |
|
|
display: flex; |
|
|
@ -596,7 +681,7 @@ export default { |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
.card-wr-map { |
|
|
.card-wr-map { |
|
|
height: calc(100vh - 150px); |
|
|
// height: calc(100vh - 120px); |
|
|
text-align: center; |
|
|
text-align: center; |
|
|
|
|
|
|
|
|
.card-map { |
|
|
.card-map { |
|
|
|
13176889840
4 years ago