From 5d00bed1f0f33e8400a043ada4ba8ae44f260f4a Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Mon, 23 May 2022 15:35:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=9A=E5=91=98=E4=BF=A1=E6=81=AF=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/communityParty/members/index.vue  |  2 +-
 .../modules/visual/communityParty/party.vue   | 99 ++++++++++++++++---
 2 files changed, 86 insertions(+), 15 deletions(-)

diff --git a/src/views/modules/communityParty/members/index.vue b/src/views/modules/communityParty/members/index.vue
index f4493c28..7652d0fd 100644
--- a/src/views/modules/communityParty/members/index.vue
+++ b/src/views/modules/communityParty/members/index.vue
@@ -416,7 +416,7 @@ export default {
       detailInfo: {},
       partyProps: {
         label: 'partyOrgName',
-        value: 'partyOrgCode',
+        value: 'id',
         checkStrictly: true 
       }
     }
diff --git a/src/views/modules/visual/communityParty/party.vue b/src/views/modules/visual/communityParty/party.vue
index be0c958c..9b410734 100644
--- a/src/views/modules/visual/communityParty/party.vue
+++ b/src/views/modules/visual/communityParty/party.vue
@@ -5,13 +5,24 @@
         <img class="title-icon" src="../../../../assets/img/shuju/title-tip.png" />
         <div class="title-label">
           党员信息统计&nbsp;&nbsp;
-          <el-cascader 
+          <!-- <el-cascader 
             v-model="selectAgency"
             :options="propTree" 
             :props="{ checkStrictly: true }" 
             :show-all-levels="false"
             :getCheckedNodes="getCheckedNodes"
             clearable @change="handleCascader">
+          </el-cascader> -->
+          <el-cascader 
+            v-model="partyOrgs"
+            :options="partyOrgList" 
+            :props="{
+              label: 'partyOrgName',
+              value: 'id',
+              checkStrictly: true 
+            }" 
+            :show-all-levels="false"
+            clearable @change="handlePartyCascader">
           </el-cascader>
         </div> 
       </div>
@@ -124,7 +135,7 @@
 </template>
 
 <script>
-import { requestPost } from "@/js/dai/request";
+import { requestPost, requestGet } from "@/js/dai/request";
 import screenTable from "../components/screen-table/index";
 import cptCard from "@/views/modules/visual/cpts/card";
 import nextTick from "dai-js/tools/nextTick";
@@ -251,8 +262,10 @@ export default {
           color: 'rgba(255, 186, 0, 1)'
         }
       ],
+      partyOrgs: [],
       ageList: [],
       eduList: [],
+      partyOrgList: [],
       pieAgeChartS: null,
       pieEduChartSs: null,
       pieAgeOptions: null,
@@ -262,6 +275,7 @@ export default {
   async mounted() {
     await nextTick(100);
     await this.getAgencyList()
+    await this.getPartyOggList()
     this.getAgeCount(this.$store.state.user.agencyId, 'agency')
     this.getEduCount(this.$store.state.user.agencyId, 'agency')
     // this.initAgeCharts()
@@ -521,11 +535,14 @@ export default {
       // this.$refs.pieChart.hideLoading()
       this.$refs.ageChart.setOption(this.pieAgeOptions)
       if (this.noInit) {
-        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
-         console.log('zlcm---isClick', isClick)
-         this.agePageNo = 1
-        this.getAgeList(_arr[0], orgType, isClick && _code || '')
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        //  console.log('zlcm---isClick', isClick)
+        //  this.agePageNo = 1
+        // this.getAgeList(_arr[0], orgType, isClick && _code || '')
+        const i = this.partyOrgs.length - 1
+        this.agePageNo = 1
+        this.getAgeList(this.partyOrgs[i], '', isClick && _code || '')
       }
       this.noInit = true
 
@@ -578,17 +595,22 @@ export default {
       // this.$refs.pieChart.hideLoading()
       this.$refs.eduChart.setOption(this.pieEduOptions)
       if (this.noEduInit) {
-        const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
-        const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        // const _arr = this.selectAgency[this.selectAgency.length - 1].split('-')
+        // const orgType = _arr[1] !== 'grid' ? 'agency': 'grid'
+        // this.pageNo = 1
+        // this.getEduList(_arr[0], orgType, isClick && _code || '')
+        const i = this.partyOrgs.length - 1
         this.pageNo = 1
-        this.getEduList(_arr[0], orgType, isClick && _code || '')
+        this.getEduList(this.partyOrgs[i], '', isClick && _code || '')
+
       }
       this.noEduInit = true
       
 
     },
     async getAgeCount(orgId, orgType) {
-      const url = "/epmetuser/icresiuser/partymemberagestatistics";
+      // const url = "/epmetuser/icresiuser/partymemberagestatistics";
+      const url = '/resi/partymember/icPartyMember/partymemberagestatistics'
       let params = {
         orgId,
         orgType
@@ -637,7 +659,8 @@ export default {
       }
     },
     async getEduCount(orgId, orgType) {
-      const url = "/epmetuser/icresiuser/partymembereducationstatistics";
+      // const url = "/epmetuser/icresiuser/partymembereducationstatistics";
+      const url = '/resi/partymember/icPartyMember/partymembereducationstatistics'
       let params = {
         orgId,
         orgType
@@ -662,7 +685,8 @@ export default {
     async getAgeList(orgId, orgType, _code) {
       
       this.visibleAgeLoading = true
-      const url = "/epmetuser/icresiuser/partymemberagelist";
+      // const url = "/epmetuser/icresiuser/partymemberagelist";
+      const url = '/resi/partymember/icPartyMember/partymemberagelist'
       let params = {
         orgId,
         orgType,
@@ -687,7 +711,8 @@ export default {
     },
     async getEduList(orgId, orgType, _code) {
       this.visibleLoading = true
-      const url = "/epmetuser/icresiuser/partymembereducationlist";
+      // const url = "/epmetuser/icresiuser/partymembereducationlist";
+      const url = '/resi/partymember/icPartyMember/partymembereducationlist'
       let params = {
         orgId,
         orgType,
@@ -703,12 +728,39 @@ export default {
             index: index + 1
           }
         })
+        console.log('eduList----', this.eduList)
         this.total = data.total
       } else {
         this.$message.error(msg)
       }
       this.visibleLoading = false
     },
+    async getPartyOggList(node, resolve) {
+      // const url = "/gov/org/customeragency/staffinagencylist";
+      // const url = '/gov/org/customeragency/agencygridtree'
+      const url = '/resi/partymember/icPartyOrg/getTreelist'
+      let params = {
+        agencyId: this.$store.state.user.agencyId,
+      };
+      const { data, code, msg } = await requestGet(url, params);
+      console.log('data-orgparty----o', data)
+      if (code === 0) {
+        
+        this.partyOrgList = this.deepArrTOnull(data)
+
+      } else {
+      }
+    },
+    deepArrTOnull(arr) {
+      let a = []
+      a = arr.map(item => {
+        return {
+          ...item,
+          children: (item.children.length > 0 && this.deepArrTOnull(item.children) )|| null
+        }
+      })
+      return a
+    },
     async getAgencyList(node, resolve) {
       // const url = "/gov/org/customeragency/staffinagencylist";
       const url = '/gov/org/customeragency/agencygridtree'
@@ -775,6 +827,25 @@ export default {
       this.getAgeList(_arr[0], orgType)
       this.getEduList(_arr[0], orgType)
     },
+    handlePartyCascader(val) {
+      console.log('val-vvvpppppp', val)
+      this.noInit = false
+      this.noEduInit = false
+      if (val.length > 0) {
+        const i = val.length - 1
+        
+        this.getAgeCount(val[i])
+        this.getEduCount(val[i])
+        this.getAgeList(val[i])
+        this.getEduList(val[i])
+      } else {
+        this.getAgeCount('')
+        this.getEduCount('')
+        this.getAgeList('')
+        this.getEduList('')
+      }
+      
+    },
     getCheckedNodes(val) {
       console.log('val-nnn', val)
     },