From 623eb4fe0d07f63ea3f0aafc5a92e873f4e4f771 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Tue, 10 Oct 2023 17:46:09 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=80=9A=E8=AE=AF=E5=BD=95=E8=81=8C?=
 =?UTF-8?q?=E8=B4=A3=E5=9B=9E=E5=A1=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/base/organization/organization.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/views/modules/base/organization/organization.vue b/src/views/modules/base/organization/organization.vue
index d7e4ae245..c564b76a8 100644
--- a/src/views/modules/base/organization/organization.vue
+++ b/src/views/modules/base/organization/organization.vue
@@ -2002,7 +2002,7 @@ export default {
         this.peoForm.gender = data.gender;
         this.peoForm.post = data.workType;
         this.peoForm.idCard = data.idCard;
-        this.peoForm.duty = data.roleList.map(item=>item.roleId);
+        this.peoForm.duty = data.roleList.filter(item => item.selected).map(item => item.roleId);
         // 已有的权限（职责）
         let existedDutyArr = [];
         data.roleList.forEach(function (sysDuty) {

From 4f6a8b5e74756a95c19a4a1410aa7bdf1f368f04 Mon Sep 17 00:00:00 2001
From: mk <2403457699@qq.com>
Date: Wed, 11 Oct 2023 10:26:50 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=A6=96=E9=A1=B5=E6=99=BA=E8=83=BD?=
 =?UTF-8?q?=E9=A2=84=E6=B5=8B=E6=8E=A5=E5=8F=A3=E6=94=B9=E5=8A=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/modules/home/index.vue | 38 +++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/src/views/modules/home/index.vue b/src/views/modules/home/index.vue
index 540d4a93e..5c7f9240a 100644
--- a/src/views/modules/home/index.vue
+++ b/src/views/modules/home/index.vue
@@ -226,7 +226,7 @@ import {mapGetters} from "vuex";
 import nextTick from "dai-js/tools/nextTick";
 import fastcall from "@/views/modules/cpts/fastcall";
 import * as echarts from 'echarts';
-
+import { requestPostBi } from "@/js/dai/request-bipass";
 export default {
   components: {fastcall},
 
@@ -274,7 +274,9 @@ export default {
 
       activeName: 'resi',
 
-      myChart: {}
+      myChart: {},
+
+      resiCategoryData:[]
     }
   },
   computed: {
@@ -358,6 +360,35 @@ export default {
       })
 
     },
+    async getResiCategoryData() {
+      const url = "resident_class_statics";
+
+      const { data, code, msg } = await requestPostBi(
+        url,
+        {
+          queryParam: {
+            org_id: this.$store.state.user.agencyId,
+          },
+        },
+        {
+          // mockId: 60031937,
+        }
+      );
+
+      if (code === 0) {
+          this.znycCategory.list = data.map((item) => {
+            return {
+              name: item.label,
+              count: item.count,
+              per: item.ratio,
+              const: "const",
+            };
+          });
+        console.log(this.resiCategoryData);
+      } else {
+        this.$message.error(msg);
+      }
+    },
     handleWindowResize() {
       if (this.myChart) {
         this.myChart.resize();
@@ -424,7 +455,8 @@ export default {
     async getApiData() {
       await this.getOrgData();
       this.getWarningList();
-      this.getZnycList();
+      // this.getZnycList();
+      this.getResiCategoryData()
       this.getPandectData();
       this.getNoticeData();
     },