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:
liuye
2022-06-10 19:19:09 +08:00
parent 17d6a34ef3 1ab2db62a9
commit 575f9a1b57
2 changed files with 5 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/project/beta/AppGridManagement/SelectGird.vue
View File

@@ -94,7 +94,7 @@ export default {
params: {girdId: last} params: {girdId: last}
}).then(res => { }).then(res => {
if (res?.data) { if (res?.data) {
this.slectList = [{girdName: '可选范围', id: ''}, res.data].flat() this.slectList = [{girdName: '可选范围', id: ''}, res.data.filter(e => !!this.allData.find(a => a.id == e.id))].flat()
this.getGridsByGridMemberAndParent({id: last}) this.getGridsByGridMemberAndParent({id: last})
} }
}) })

20
src/project/beta/AppSpecialPeople/AppSpecialPeople.vue
View File

@@ -126,8 +126,8 @@ export default {
this.$forceUpdate() this.$forceUpdate()
}, },
handleGridSelect(e) { handleGridSelect(e) {
this.gridName = e?.[0]?.girdName this.gridName = e?.girdName
this.search.girdId = e?.[0]?.id this.search.girdId = e?.id
this.getDatas() this.getDatas()
}, },
areaSelect(e) { areaSelect(e) {
@@ -143,13 +143,7 @@ export default {
params: {...this.search, type: 0, range: 0} params: {...this.search, type: 0, range: 0}
}).then((res) => { }).then((res) => {
if (res?.data) { if (res?.data) {
for (let i in res.data) { this.statisticsList = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]}))
let obj = {
label: i,
value: res.data[i],
}
this.statisticsList.push(obj)
}
} }
}) })
}, },
@@ -159,13 +153,7 @@ export default {
params: {...this.search, type: 0, range: 1} params: {...this.search, type: 0, range: 1}
}).then((res) => { }).then((res) => {
if (res?.data) { if (res?.data) {
for (let i in res.data) { this.statisticsListMon = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]}))
let obj = {
label: i,
value: res.data[i],
}
this.statisticsListMon.push(obj)
}
} }
}) })
}, },