kubbo/dvcp_v2_wxcp_app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' of http://git.sinoecare.com/sinoecare/digital_village_v2/dvcp_v2_wxcp_app into dev

Browse Source
This commit is contained in:
花有清香月有阴
2022-02-11 16:59:47 +08:00
parent 1e35d4e3ce 73f9950921
commit 4573cb3364
2 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/saas/AppBuilding/components/searchMap.vue
View File

@@ -47,13 +47,13 @@
</div> </div>
<div class="info-flex"> <div class="info-flex">
<span class="label">所属网格</span> <span class="label">所属网格</span>
<span class="value" v-if="detailInfo.gird && detailInfo.gird.girdName">{{ detailInfo.gird.girdName || '' }}</span> <span class="value" v-if="detailInfo.build && detailInfo.build.appGirdInfo">{{ detailInfo.build.appGirdInfo.girdName || '' }}</span>
</div> </div>
<div class="info-flex"> <div class="info-flex">
<span class="label">网格管理员</span> <span class="label">网格管理员</span>
<span class="value" v-if="detailInfo.gird && detailInfo.gird.girdMemberNames && detailInfo.gird.girdMemberNames.length"> <span class="value" v-if="detailInfo.build.appGirdInfo && detailInfo.build.appGirdInfo.girdMemberNames && detailInfo.build.appGirdInfo.girdMemberNames.length">
<span v-for="(item, index) in detailInfo.gird.girdMemberNames" :key="index"> <span v-for="(item, index) in detailInfo.build.appGirdInfo.girdMemberNames" :key="index">
<AiOpenData v-if="item" type="userName" :openid="item" style="display:inline-block;" /><span v-if="index<detailInfo.gird.girdMemberNames.length-1">,</span> <AiOpenData v-if="item" type="userName" :openid="item" style="display:inline-block;" /><span v-if="index<detailInfo.build.appGirdInfo.girdMemberNames.length-1">,</span>
</span> </span>
</span> </span>
</div> </div>
@@ -337,12 +337,15 @@ export default {
getBuildingInfo(item) { getBuildingInfo(item) {
this.$http.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding?buildId=${item.buildingId}&houseId=${item.id}`).then(res => { this.$http.post(`/app/appcommunityhouseinfo/queryDetailByIdWithBuilding?buildId=${item.buildingId}&houseId=${item.id}`).then(res => {
if (res?.data) { if (res?.data) {
this.detailInfo = {...res.data}
console.log(this.detailInfo)
if(this.detailInfo.build.appGirdInfo.girdMemberNames && this.detailInfo.build.appGirdInfo.girdMemberNames) {
this.detailInfo.build.appGirdInfo.girdMemberNames = this.detailInfo.build.appGirdInfo.girdMemberNames.split(',')
}
this.show = false this.show = false
this.showPop = true this.showPop = true
this.detailInfo = {...res.data}
if(this.detailInfo.gird && this.detailInfo.gird.girdMemberNames) {
this.detailInfo.gird.girdMemberNames = this.detailInfo.gird.girdMemberNames.split(',')
}
} }
}) })
}, },

6
src/saas/AppHealthUp/OtherStatistics.vue
View File

@@ -113,7 +113,11 @@ export default {
}, },
getStatis() { getStatis() {
this.dayList = [] this.dayList = []
this.$http.post(`/app/appepidemichealthreport/statistic?userId=${this.userId}`).then((res) => { this.$http.post(`/app/appepidemichealthreport/statistic`, this.userId, {
headers: {
'Content-Type': 'text/plain'
}
}).then((res) => {
if (res.code == 0) { if (res.code == 0) {
Object.keys(res.data).forEach((key) => { Object.keys(res.data).forEach((key) => {
var info = { var info = {