From acaa5819a72bc919c81af1f58201ed866f06cb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=88=98=E7=AB=8B=E6=A0=87?= <2658037827@qq.com>
Date: Mon, 25 Dec 2023 16:41:43 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=A6=85=E9=81=93=E4=B8=80?=
 =?UTF-8?q?=E4=BA=9Bbug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/dataBoard/renfang/index.vue              |  2 +-
 src/views/dataBoard/renfang/resi/classNew.vue      | 14 ++++++++++----
 .../renfang/visualizing/components/laonianren.vue  | 12 ++++++++----
 .../visualizing/components/shiyerenyuan.vue        |  1 +
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/src/views/dataBoard/renfang/index.vue b/src/views/dataBoard/renfang/index.vue
index 06e2910cc..25327804c 100644
--- a/src/views/dataBoard/renfang/index.vue
+++ b/src/views/dataBoard/renfang/index.vue
@@ -50,7 +50,7 @@
                 </div>
               </div>
             </div>
-            <div class="item" @click="jumpPath('normal', 'aged', '志愿者')">
+            <div class="item" @click="jumpPath('normal', 'aged', '失业人员')">
               <div class="item-info">
                 <div>
                   <img
diff --git a/src/views/dataBoard/renfang/resi/classNew.vue b/src/views/dataBoard/renfang/resi/classNew.vue
index 6fb0639db..77b410ea2 100644
--- a/src/views/dataBoard/renfang/resi/classNew.vue
+++ b/src/views/dataBoard/renfang/resi/classNew.vue
@@ -449,10 +449,10 @@ export default {
         },
       ],
       serviceList: [
-        {
+    /*    {
           label: "政策找人",
           value: "policy",
-        },
+        },*/
         {
           label: "服务找人",
           value: "service",
@@ -469,6 +469,10 @@ export default {
           label: "岗位找人",
           value: "position",
         },
+        {
+          label: "未享受服务",
+          value: "nonService",
+        },
       ],
       colList: [
         {
@@ -843,9 +847,9 @@ export default {
         this.oldValsss = null;
       }, 200);
     }
-    if (!query.olds) {
+   /* if (!query.olds) {
       this.getList();
-    }
+    }*/
     if (this.pageType != "normal") {
       this.colList = [
         {
@@ -930,8 +934,10 @@ export default {
           endAge: null,
         };
         this.getList(searchParams);
+        console.log('changeOld1')
         return;
       }
+      console.log('changeOld2')
       const searchParams = {
         startAge: e[0],
         endAge: e[1],
diff --git a/src/views/dataBoard/renfang/visualizing/components/laonianren.vue b/src/views/dataBoard/renfang/visualizing/components/laonianren.vue
index 21d2ac70d..4f945db91 100644
--- a/src/views/dataBoard/renfang/visualizing/components/laonianren.vue
+++ b/src/views/dataBoard/renfang/visualizing/components/laonianren.vue
@@ -57,6 +57,7 @@ export default {
       lnrLeft: [],
       lnrRight: [],
       lnrService: [],
+      level: this.$store.state.user.level === 'grid'?'grid':'agency'
     };
   },
   created() {
@@ -67,9 +68,12 @@ export default {
   methods: {
     getData() {
       const { user } = this.$store.state
+      this.level = this.$store.state.user.level === 'grid'?'grid':'agency'
+
       console.log(user);
+      let param = {  agencyId:user.agencyId,level:this.level}
       this.$http
-        .get("/actual/base/peopleRoomOverview/oldPeopleAgePie")
+        .get("/actual/base/peopleRoomOverview/oldPeopleAgePie?"+this.$paramsFormat(param))
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -79,7 +83,7 @@ export default {
         })
         .catch(() => {});
       this.$http
-        .get("/actual/base/peopleRoomOverview/oldPeopleResidePie")
+        .get("/actual/base/peopleRoomOverview/oldPeopleResidePie?"+this.$paramsFormat(param))
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -89,7 +93,7 @@ export default {
         })
         .catch(() => {});
         this.$http
-        .post(`/actual/base/peopleRoomOverview/findPeoplePie`,{  agencyId:user.agencyId,level:user.level,category:'OLD_PEOPLE_FLAG'})
+        .post(`/actual/base/peopleRoomOverview/findPeoplePie`,{  agencyId:user.agencyId,level:this.level,category:'OLD_PEOPLE_FLAG'})
         .then(({ data: res }) => {
           if (res.code !== 0) {
             return this.$message.error(res.msg);
@@ -102,7 +106,7 @@ export default {
         let url = '/actual/base/peopleRoomOverview/findPeoplePie'
         let params = {
           agencyId:user.agencyId,
-          level:user.level,
+          level:this.level,
           category:'OLD_PEOPLE_FLAG'
         }
     },
diff --git a/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue b/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue
index 89aece234..f79313bb6 100644
--- a/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue
+++ b/src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue
@@ -308,6 +308,7 @@ export default {
       };
       this.resiChart.setOption(option);
       this.resiChart.on("click", (e) => {
+        console.log(e)
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {