Merge branch 'dev' into jw_feature_dev

src/views/dataBoard/renfang/resi/classNew.vue

@@ -14,8 +14,10 @@
 
       <div class="second-select" v-if="type == 'old'">
         <el-select
-          v-model="oldVal"
+          @change="changeOld"
+          v-model="oldValsss"
           :popper-append-to-body="false"
+          :clearable="true"
           placeholder="请选择年龄"
         >
           <el-option
@@ -29,6 +31,7 @@
         <el-select
           v-model="searchParams.resideSituation"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择居住情况"
         >
@@ -44,6 +47,7 @@
         <el-select
           v-model="searchParams.lowIncomeType"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择低保类型"
         >
@@ -58,6 +62,7 @@
         <el-select
           v-model="searchParams.lowIncomeReason"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择低保原因"
         >
@@ -71,12 +76,14 @@
       </div>
       <div class="second-select" v-if="type == 'zhiyuanzhe'">
         <el-select
-          v-model="oldVal"
+          @change="changeOld"
+          v-model="oldValsss"
           :popper-append-to-body="false"
+          :clearable="true"
           placeholder="请选择年龄"
         >
           <el-option
-            v-for="item in oldAllList"
+            v-for="item in oldAllList1"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -86,6 +93,7 @@
         <el-select
           v-model="searchParams.gategoryCode"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择志愿者类型"
         >
@@ -99,12 +107,14 @@
       </div>
       <div class="second-select" v-if="type == 'dangyuan'">
         <el-select
-          v-model="oldVal"
+          @change="changeOld"
+          v-model="oldValsss"
           :popper-append-to-body="false"
+          :clearable="true"
           placeholder="请选择年龄"
         >
           <el-option
-            v-for="item in oldAllList"
+            v-for="item in oldAllList1"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -114,6 +124,7 @@
         <el-select
           v-model="searchParams.cultureLevel"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择学历"
         >
@@ -127,13 +138,14 @@
       </div>
       <div class="second-select" v-if="type == 'shiye'">
         <el-select
-          v-model="oldVal"
+          @change="changeOld"
+          v-model="oldValsss"
           :popper-append-to-body="false"
-          @change="changeSearch"
+          :clearable="true"
           placeholder="请选择年龄"
         >
           <el-option
-            v-for="item in oldAllList"
+            v-for="item in oldAllList1"
             :key="item.value"
             :label="item.label"
             :value="item.value"
@@ -143,6 +155,7 @@
         <el-select
           v-model="searchParams.employmentWish"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择就业愿望"
         >
@@ -157,6 +170,7 @@
         <el-select
           v-model="searchParams.unemploymentReason"
           :popper-append-to-body="false"
+          :clearable="true"
           @change="changeSearch"
           placeholder="请选择失业原因"
         >
@@ -180,6 +194,7 @@
         <el-input
           type="text"
           v-model="searchParams.serviceOrgName"
+          :clearable="true"
           placeholder="请输入服务方名称"
           @blur="changeFwfmc"
         />
@@ -266,7 +281,7 @@ export default {
           value: ["80", "89"],
         },
         {
-          label: "90岁以上",
+          label: "90岁及以上",
           value: ["90", "139"],
         },
       ],
@@ -312,10 +327,32 @@ export default {
           value: ["80", "89"],
         },
         {
-          label: "90岁以上",
+          label: "90岁及以上",
           value: ["90", "139"],
         },
       ],
+      oldAllList1: [
+        {
+          label: "49岁及以下",
+          value: ["0", "49"],
+        },
+        {
+          label: "50-59岁",
+          value: ["50", "59"],
+        },
+        {
+          label: "60-69岁",
+          value: ["60", "69"],
+        },
+        {
+          label: "70-79岁",
+          value: ["70", "79"],
+        },
+        {
+          label: "80岁及以上",
+          value: ["80", "139"],
+        },
+      ],
       colList: [
         {
           align: "left",
@@ -413,7 +450,7 @@ export default {
           url: "/actual/base/peopleRoomOverview/postPageList",
         },
       ],
-      oldVal: ["60", "69"],
+      oldValsss: ["60", "69"],
       jzVal: "",
       searchParams: {},
       unemploymentArr: [],
@@ -424,9 +461,9 @@ export default {
       lowIncomeTypeArr: [],
     };
   },
-
   activated() {
     const query = this.$route.query;
+    this.query = this.$route.query;
     this.org_id = query.org_id;
     this.type = query.type;
     this.type_id = query.type_id;
@@ -445,33 +482,98 @@ export default {
     this.tableTitle = type_name + "居民列表";
     this.pageNo = 1;
     const type = this.type;
+    if (type == "old") {
+      if (query.olds) {
+        const olds = this.oldList.filter((item) => query.olds == item.label)[0];
+        this.changeOld(olds.value);
+        setTimeout(() => {
+          this.oldValsss = olds.value;
+        }, 200);
+        this.searchParams = {
+          resideSituation: null,
+        };
+      }
+      if (query.qingk) {
+        this.searchParams = {
+          resideSituation: query.qingk,
+        };
+        this.oldValsss = undefined;
+      }
+    }
     if (type == "dibao") {
-      this.searchParams = {
-        lowIncomeType: null, // 低保类型
-        lowIncomeReason: null, // 低保原因
-      };
+      if (query.lowIncomeType) {
+        this.searchParams = {
+          lowIncomeType: query.lowIncomeType, // 低保类型
+          lowIncomeReason: null, // 低保原因
+        };
+      }
+      if (query.lowIncomeReason) {
+        this.searchParams = {
+          lowIncomeType: null, // 低保类型
+          lowIncomeReason: query.lowIncomeReason, // 低保原因
+        };
+      }
     }
     if (type == "shiye") {
-      this.searchParams = {
-        employmentWish: null, // 就业愿望
-        unemploymentReason: null, // 失业原因
-        startAge: null,
-        endAge: null,
-      };
+      if (query.olds) {
+        const olds = this.oldAllList1.filter((item) => query.olds == item.label)[0];
+        this.changeOld(olds.value);
+        setTimeout(() => {
+          this.oldValsss = olds.value;
+        }, 200);
+        this.searchParams = {
+          employmentWish: null, // 就业愿望
+          unemploymentReason: null, // 失业原因
+        };
+      }
+      if (query.employmentWish) {
+        this.searchParams = {
+          employmentWish: query.employmentWish, // 就业愿望
+          unemploymentReason: null, // 失业原因
+          startAge: null,
+          endAge: null,
+        };
+      }
+      if (query.unemploymentReason) {
+        this.searchParams = {
+          employmentWish: null, // 就业愿望
+          unemploymentReason: query.unemploymentReason, // 失业原因
+          startAge: null,
+          endAge: null,
+        };
+      }
     }
     if (type == "dangyuan") {
-      this.searchParams = {
-        cultureLevel: null, // 学历
-        startAge: null,
-        endAge: null,
-      };
+      if (query.olds) {
+        const olds = this.oldAllList1.filter(
+          (item) => query.olds == item.label
+        )[0];
+        this.changeOld(olds.value);
+        setTimeout(() => {
+          this.oldValsss = olds.value;
+        }, 200);
+      }
+      if (query.cultureLevel) {
+        this.searchParams = {
+          cultureLevel: query.cultureLevel, // 志愿者类型
+        };
+      }
     }
-    if (type == "zhiyuan") {
-      this.searchParams = {
-        gategoryCode: null, // 志愿者类型
-        startAge: null,
-        endAge: null,
-      };
+    if (type == "zhiyuanzhe") {
+      if (query.olds) {
+        const olds = this.oldAllList1.filter(
+          (item) => query.olds == item.label
+        )[0];
+        this.changeOld(olds.value);
+        setTimeout(() => {
+          this.oldValsss = olds.value;
+        }, 200);
+      }
+      if (query.gategoryCode) {
+        this.searchParams = {
+          gategoryCode: query.gategoryCode, // 志愿者类型
+        };
+      }
     }
     if (
       type == "fuwu" ||
@@ -483,7 +585,9 @@ export default {
         serviceOrgName: null, // 服务方名称
       };
     }
-    this.getList();
+    if (!query.olds) {
+      this.getList();
+    }
     if (this.pageType != "normal") {
       this.colList = [
         {
@@ -544,25 +648,39 @@ export default {
     this.pageNo = 1;
   },
   watch: {
-    // $route(to, from) {
-    //   this.$router.go(0);
+    // oldValsss: {
+    //   handler(newVal) {
+    //     // this.pageNo = 1;
+    //     // const searchParams = {
+    //     //   startAge: newVal[0],
+    //     //   endAge: newVal[1],
+    //     // };
+    //     // this.getList(searchParams);
+    //   },
     // },
-    oldVal: {
-      handler(newVal, oldVal) {
-        this.pageNo = 1;
-        const searchParams = {
-          startAge: newVal[0],
-          endAge: newVal[1],
-        };
-        this.getList(searchParams);
-      },
-    },
-    searchParams(newVal, oldVal) {
+    searchParams(newVal) {
+      this.pageNo = 1;
       this.getList();
     },
   },
-
   methods: {
+    changeOld(e) {
+      if (!e) {
+        this.oldValsss = undefined;
+        const searchParams = {
+          startAge: null,
+          endAge: null,
+        };
+        this.getList(searchParams);
+        return;
+      }
+      const searchParams = {
+        startAge: e[0],
+        endAge: e[1],
+      };
+      this.oldValsss = e;
+      this.getList(searchParams);
+    },
     handleClickBreadItem({ item }) {
       this.$router.push({
         path: item.path,
@@ -613,17 +731,33 @@ export default {
       this.getList();
     },
     async getList(item) {
-      const { url } = this.typeList.filter((item) => item.type == this.type)[0];
+      const { url } = this.typeList.filter((d) => d.type == this.type)[0];
       const sourceType = ["公共服务", "共性需求", "政策找人", "服务找人"];
       this.loading = true;
+      let params = {};
+      if (this.oldValsss && this.oldValsss != "" && this.oldValsss.length != 0) {
+        params = {
+          startAge: this.oldValsss[0],
+          endAge: this.oldValsss[1],
+        };
+      } else {
+        params = {
+          startAge: null,
+          endAge: null,
+        };
+      }
       let queryParam = {
         pageNo: this.pageNo,
         pageSize: this.pageSize,
         ...this.searchParams,
-        ...item,
+        ...params,
       };
       for (let key in queryParam) {
-        if (queryParam[key] == "ALL") {
+        if (
+          queryParam[key] == "ALL" ||
+          queryParam[key] == "" ||
+          queryParam[key] == null
+        ) {
           queryParam[key] = undefined;
         }
       }
@@ -641,8 +775,8 @@ export default {
                 item.name ? item.name : "--",
                 item.gridName ? item.gridName : "--",
                 item.fullName ? item.fullName : "--",
-                item.mobile ? $sensitive(item.mobile, 3, 7) : "--",
-                item.idNum ? $sensitive(item.idNum, 0, 14) : "--",
+                item.mobile ? this.$sensitive(item.mobile, 3, 7) : "--",
+                item.idNum ? this.$sensitive(item.idNum, 0, 14) : "--",
                 item.gender ? gender[item.gender] : "--",
                 item.birthday ? item.birthday : "--",
                 { type: "operate", list: ["查看"] },
@@ -680,9 +814,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取居住情况字典");
-      }
+      } catch (error) {}
     },
     // async getPostNation() {
     //   try {
@@ -691,7 +823,6 @@ export default {
     //     });
     //     this.PostDictonArr = data.data;
     //   } catch (error) {
-    //     console.log(error, "获取学历字典");
     //   }
     // },
     async getUnemployment() {
@@ -706,9 +837,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取失业原因字典");
-      }
+      } catch (error) {}
     },
     async getCareer() {
       try {
@@ -722,9 +851,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取就业愿望字典");
-      }
+      } catch (error) {}
     },
     async getVolunteer() {
       try {
@@ -738,9 +865,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取志愿者类别字典");
-      }
+      } catch (error) {}
     },
     async getLowIncomeReason() {
       try {
@@ -754,9 +879,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取低保原因字典");
-      }
+      } catch (error) {}
     },
     async getLowIncomeType() {
       try {
@@ -770,9 +893,7 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取低保类型字典");
-      }
+      } catch (error) {}
     },
     async getPostNation() {
       try {
@@ -786,14 +907,10 @@ export default {
           },
           ...data.data,
         ];
-      } catch (error) {
-        console.log(error, "获取学历字典");
-      }
+      } catch (error) {}
     },
   },
-  destroyed() {
-    console.log("我已经离开了！");
-  },
+  destroyed() {},
 };
 </script>
 

src/views/dataBoard/renfang/visualizing/components/dangyuan.vue

@@ -157,7 +157,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius: this.dyLeft && this.dyLeft.length > 0 ? [30, 130] : [0, 0],
             center: ["50%", "50%"],
@@ -180,7 +179,7 @@ export default {
         ],
       };
       this.myChart1.setOption(option);
-      this.myChart1.on("click", (a, b) => {
+      this.myChart1.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -189,6 +188,7 @@ export default {
             type_name: "党员",
             pageType: "normal",
             type: "dangyuan",
+            olds: e.data.name,
           },
         });
       });
@@ -273,7 +273,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.dyRight && this.dyRight.length > 0 ? [30, 130] : [0, 0],
@@ -296,7 +295,7 @@ export default {
           },
         ],
       };
-      this.myChart2.on("click", (a, b) => {
+      this.myChart2.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -305,6 +304,7 @@ export default {
             type_name: "党员",
             pageType: "normal",
             type: "dangyuan",
+            cultureLevel: e.data.name,
           },
         });
       });

src/views/dataBoard/renfang/visualizing/components/dibaorenyuan.vue

@@ -226,7 +226,7 @@ export default {
         ],
       };
       this.myChart1.setOption(option);
-      this.myChart1.on("click", (a, b) => {
+      this.myChart1.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -235,6 +235,7 @@ export default {
             type_name: "低保人员",
             pageType: "normal",
             type: "dibao",
+            lowIncomeType: e.node.name,
           },
         });
       });
@@ -363,6 +364,7 @@ export default {
             type_name: "低保人员",
             pageType: "normal",
             type: "dibao",
+            lowIncomeReason: e.node.name,
           },
         });
       });

src/views/dataBoard/renfang/visualizing/components/laonianren.vue

@@ -157,7 +157,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.lnrLeft && this.lnrLeft.length > 0 ? [30, 130] : [0, 0],
@@ -181,7 +180,7 @@ export default {
         ],
       };
       this.myChart1.setOption(option);
-      this.myChart1.on("click", (a, b) => {
+      this.myChart1.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -190,6 +189,7 @@ export default {
             type_name: "老年人",
             pageType: "normal",
             type: "old",
+            olds: e.data.name,
           },
         });
       });
@@ -276,7 +276,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.lnrRight && this.lnrRight.length > 0 ? [30, 130] : [0, 0],
@@ -299,7 +298,8 @@ export default {
           },
         ],
       };
-      this.myChart2.on("click", (a, b) => {
+      this.myChart2.on("click", (e) => {
+        console.log('a, b::', e);
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -308,6 +308,7 @@ export default {
             type_name: "老年人",
             pageType: "normal",
             type: "old",
+            qingk: e.data.name,
           },
         });
       });

src/views/dataBoard/renfang/visualizing/components/shiyerenyuan.vue

@@ -222,7 +222,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.syryData1 && this.syryData1.length > 0 ? [30, 130] : [0, 0],
@@ -246,7 +245,7 @@ export default {
         ],
       };
       this.myChart1.setOption(option);
-      this.myChart1.on("click", (a, b) => {
+      this.myChart1.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -255,6 +254,7 @@ export default {
             type_name: "失业人员",
             pageType: "normal",
             type: "shiye",
+            unemploymentReason: e.name,
           },
         });
       });
@@ -352,7 +352,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.syryData2 && this.syryData2.length > 0 ? [30, 130] : [0, 0],
@@ -376,7 +375,7 @@ export default {
         ],
       };
       this.myChart2.setOption(option);
-      this.myChart2.on("click", (a, b) => {
+      this.myChart2.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -385,6 +384,7 @@ export default {
             type_name: "失业人员",
             pageType: "normal",
             type: "shiye",
+            employmentWish: e.name,
           },
         });
       });
@@ -484,7 +484,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.syryData3 && this.syryData3.length > 0 ? [30, 130] : [0, 0],
@@ -508,7 +507,7 @@ export default {
         ],
       };
       this.myChart3.setOption(option);
-      this.myChart3.on("click", (a, b) => {
+      this.myChart3.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -517,6 +516,7 @@ export default {
             type_name: "失业人员",
             pageType: "normal",
             type: "shiye",
+            olds: e.name,
           },
         });
       });
@@ -615,7 +615,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.syryData4 && this.syryData4.length > 0 ? [30, 130] : [0, 0],
@@ -639,7 +638,7 @@ export default {
         ],
       };
       this.myChart4.setOption(option);
-      this.myChart4.on("click", (a, b) => {
+      this.myChart4.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -746,7 +745,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.syryData5 && this.syryData5.length > 0 ? [30, 130] : [0, 0],
@@ -770,7 +768,7 @@ export default {
         ],
       };
       this.myChart5.setOption(option);
-      this.myChart5.on("click", (a, b) => {
+      this.myChart5.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {

src/views/dataBoard/renfang/visualizing/components/zhiyuanzhe.vue

@@ -157,7 +157,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.zyzLeft && this.zyzLeft.length > 0 ? [30, 130] : [0, 0],
@@ -181,7 +180,7 @@ export default {
         ],
       };
       this.myChart1.setOption(option);
-      this.myChart1.on("click", (a, b) => {
+      this.myChart1.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -190,6 +189,7 @@ export default {
             type_name: "志愿者",
             pageType: "normal",
             type: "zhiyuanzhe",
+            olds: e.data.name,
           },
         });
       });
@@ -276,7 +276,6 @@ export default {
         },
         series: [
           {
-            name: "Nightingale Chart",
             type: "pie",
             radius:
               this.zyzRight && this.zyzRight.length > 0 ? [30, 130] : [0, 0],
@@ -299,7 +298,7 @@ export default {
           },
         ],
       };
-      this.myChart2.on("click", (a, b) => {
+      this.myChart2.on("click", (e) => {
         this.$router.push({
           path: "/dataBoard/renfang/resi-class-new",
           query: {
@@ -308,6 +307,7 @@ export default {
             type_name: "志愿者",
             pageType: "normal",
             type: "zhiyuanzhe",
+            gategoryCode: e.data.name,
           },
         });
       });

src/views/modules/home/index.vue

@@ -274,7 +274,7 @@ export default {
           },
           legend: {
             data: data.series.map((item) => item.name),
-            bottom: "10%",
+            bottom: "5%",
             icon: "rect",
             itemWidth: 20,
             itemHeight: 5,
@@ -283,7 +283,7 @@ export default {
           grid: {
             left: "3%",
             right: "4%",
-            bottom: "25%",
+            bottom: "30%",
             containLabel: true,
           },
           toolbox: {

src/views/modules/satisfaction/communitySelfInsp/index.vue

@@ -295,7 +295,9 @@ export default {
             this.myChart.on("click", function (params) {
                 than.handelClickChart(params.name,params.seriesName);
             });
-            window.addEventListener("resize", this.handleWindowResize);
+            this.$nextTick(()=>{
+                window.addEventListener("resize", this.handleWindowResize);
+            })
         },
         handleWindowResize() {
             if (this.myChart) {

src/views/modules/satisfaction/satisfactionProvince/formList.vue

@@ -194,6 +194,7 @@ export default {
                     ...this.formData,
                     pageNo: this.pageNo,
                     pageSize: this.pageSize,
+                    communityId:this.communityId
                 };
                 let url = '/governance/provinceEvaluationRecord/pageInfo'
                 const { data, code, msg } = await requestPost(url, params)
@@ -217,6 +218,10 @@ export default {
         formObj: {
             type: Object,
             default: () => {}
+        },
+        communityId:{
+            type:String,
+            default:''
         }
     },
     //监听