Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
aixianling
2022-08-17 16:58:20 +08:00

View File

@@ -26,8 +26,8 @@
<div class="title">数据统计</div> <div class="title">数据统计</div>
<div class="tab-content"> <div class="tab-content">
<div class="item" v-for="(item, index) in tabStatistics" :key="index"> <div class="item" v-for="(item, index) in tabStatistics" :key="index">
<p><span></span>{{ item.title }}</p> <p><span></span>{{ item.label }}</p>
<div>{{ girdInfo[item.key] || 0}}</div> <div>{{ item.value || 0}}</div>
</div> </div>
</div> </div>
<div class="title">消息发送情况</div> <div class="title">消息发送情况</div>
@@ -161,56 +161,10 @@ export default {
this.$http.post(`/app/appgirdmemberinfo/girdMemberOrNotStatistic`).then(res => { this.$http.post(`/app/appgirdmemberinfo/girdMemberOrNotStatistic`).then(res => {
if (res.code == 0) { if (res.code == 0) {
this.girdInfo = res.data this.girdInfo = res.data
if(res.data['网格员类型'] == 2) { //网格长 for(var i in res.data) {
this.tabStatistics= [ if(i != '加入天数' && i != '网格员类型') {
{ this.tabStatistics.push({label: i, value: res.data[i]})
title: '网格数', }
key: '网格数'
},
{
title: '网格员数',
key: '网格员'
},
{
title: '辖区户数',
key: '辖区户数'
},
{
title: '居民群数',
key: '居民群'
},
]
}else if(res.data['网格员类型'] == 1) { //网格员
this.tabStatistics= [
{
title: '居民群数',
key: '居民群'
},
{
title: '辖区户数',
key: '辖区户数'
},
{
title: '微信好友',
key: '微信好友'
},
{
title: '消息累计',
key: '消息累计'
}
]
}else {
this.tabStatistics= [
{
title: '居民群数',
key: '居民群'
},
{
title: '微信好友',
key: '微信好友'
}
]
} }
} }
}) })