From 7022eaf8b8e4d63ca657845867303b980531e1fb Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 10 Jun 2022 18:47:17 +0800
Subject: [PATCH 1/2] BUG 30142

---
 .../AppSpecialPeople/AppSpecialPeople.vue     | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

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]}))
         }
       })
     },

From 1ab2db62a95f2c0175363d78cd66e39e30d7473c Mon Sep 17 00:00:00 2001
From: aixianling <aixianling@sinoecare.com>
Date: Fri, 10 Jun 2022 18:51:41 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=99=88=E8=80=81=E6=9D=BF=E5=9D=91?=
 =?UTF-8?q?=E6=88=91=E6=9F=A5=E8=AF=A2=E6=B2=A1=E7=AD=9B=E9=80=89=E6=98=AF?=
 =?UTF-8?q?=E5=90=A6=E5=9C=A8=E6=8E=88=E6=9D=83=E8=8C=83=E5=9B=B4=E5=86=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/project/beta/AppGridManagement/SelectGird.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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})
           }
         })