diff --git a/src/project/beta/AppGridManagement/SelectGird.vue b/src/project/beta/AppGridManagement/SelectGird.vue index 8fa03c04..8392653e 100644 --- a/src/project/beta/AppGridManagement/SelectGird.vue +++ b/src/project/beta/AppGridManagement/SelectGird.vue @@ -94,7 +94,7 @@ export default { params: {girdId: last} }).then(res => { 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}) } }) diff --git a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue index edd21b98..d416a6ef 100644 --- a/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue +++ b/src/project/beta/AppSpecialPeople/AppSpecialPeople.vue @@ -126,8 +126,8 @@ export default { this.$forceUpdate() }, handleGridSelect(e) { - this.gridName = e?.[0]?.girdName - this.search.girdId = e?.[0]?.id + this.gridName = e?.girdName + this.search.girdId = e?.id this.getDatas() }, areaSelect(e) { @@ -143,13 +143,7 @@ export default { params: {...this.search, type: 0, range: 0} }).then((res) => { if (res?.data) { - for (let i in res.data) { - let obj = { - label: i, - value: res.data[i], - } - this.statisticsList.push(obj) - } + this.statisticsList = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]})) } }) }, @@ -159,13 +153,7 @@ export default { params: {...this.search, type: 0, range: 1} }).then((res) => { if (res?.data) { - for (let i in res.data) { - let obj = { - label: i, - value: res.data[i], - } - this.statisticsListMon.push(obj) - } + this.statisticsListMon = Object.keys(res.data).map((label, i, arr) => ({label, value: res.data[label]})) } }) },