From a41dac81f664f9b9be2a92eca11d4cc817818165 Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Tue, 12 Mar 2024 18:15:40 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BA=A2=E8=89=B2=E9=81=97=E9=A3=8E=E5=85=9A?=
 =?UTF-8?q?=E5=91=98=E6=95=B0=E6=8E=A5=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/hsyf.js                               |  18 +++
 .../hsyf-left/partyCommittee/dangyuan.vue     | 116 +++++++++---------
 2 files changed, 79 insertions(+), 55 deletions(-)

diff --git a/src/api/hsyf.js b/src/api/hsyf.js
index f13139e..187080a 100644
--- a/src/api/hsyf.js
+++ b/src/api/hsyf.js
@@ -36,6 +36,24 @@ export function partyOrgCensusList (params) {
   })
 }
 
+// 党员年龄统计
+export function selectYearPartyMemberCensus (params) {
+  return request({
+    url: '/api/resi/partymember/yifengScreen/selectYearPartyMemberCensus',
+    method: 'GET',
+    params
+  })
+}
+
+// 党员单位统计
+export function selectOrgPartyMemberCensus (params) {
+  return request({
+    url: '/api/resi/partymember/yifengScreen/selectOrgPartyMemberCensus',
+    method: 'GET',
+    params
+  })
+}
+
 // 移风党建-列表
 export function partyPlacePage (params) {
   return request({
diff --git a/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue b/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue
index 96ce239..696275f 100644
--- a/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue
+++ b/src/views/next/dialog-module/hsyf-left/partyCommittee/dangyuan.vue
@@ -45,20 +45,20 @@
                     <div
                       class="content-bottom-list-row"
                       v-for="item in dataList"
-                      :key="item.label"
+                      :key="item.orgName"
                     >
                       <div class="content-bottom-list-row-item">
-                        {{ item.label }}
+                        {{ item.orgName }}
                       </div>
                       <div class="content-bottom-list-row-item">
                         <div
                           class="content-bottom-list-row-item-jd"
-                          :style="`width:${getWidth(dataList, item.zrcNum)}%`"
+                          :style="`width:${getWidth(dataList, item.count)}%`"
                         ></div>
                         <div class="content-bottom-list-row-item-jd1"></div>
                       </div>
                       <div class="content-bottom-list-row-item">
-                        {{ item.zrcNum }}
+                        {{ item.count }}
                       </div>
                     </div>
                   </div>
@@ -74,6 +74,10 @@
 
 <script>
 import { mapGetters, mapActions } from 'vuex'
+import {
+  selectYearPartyMemberCensus,
+  selectOrgPartyMemberCensus
+} from '@/api/hsyf'
 export default {
   name: '',
   data () {
@@ -81,76 +85,57 @@ export default {
       dialogTitle: '党员分析',
       dataList: [
         {
-          label: '上泊新村',
-          zrcNum: 314,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '上泊新村',
+          count: 314,
           id: '1697533359860244481'
         },
         {
-          label: '滨河村',
-          zrcNum: 344,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '滨河村',
+          count: 344,
           id: '1704030137514287105'
         },
         {
-          label: '湍湾新村',
-          zrcNum: 295,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '湍湾新村',
+          count: 295,
           id: '1704036500462198786'
         },
         {
-          label: '七级村',
-          zrcNum: 338,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '七级村',
+          count: 338,
           id: '1704313950756757506'
         },
         {
-          label: '沽河村',
-          zrcNum: 346,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '沽河村',
+          count: 346,
           id: '1704324481563582466'
         },
         {
-          label: '太祉庄村',
-          zrcNum: 310,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '太祉庄村',
+          count: 310,
           id: '1704327114084933633'
         },
         {
-          label: '河流新村',
-          zrcNum: 268,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '河流新村',
+          count: 268,
           id: '1704331366425518081'
         },
         {
-          label: '大坝新村',
-          zrcNum: 321,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '大坝新村',
+          count: 321,
           id: '1704396342955696130'
         },
         {
-          label: '双塔村',
-          zrcNum: 469,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '双塔村',
+          count: 469,
           id: '1704331366425518081'
         },
         {
-          label: '移风村',
-          zrcNum: 446,
-          wanggeNum: 26,
-          dangyuanNum: 26,
+          orgName: '移风村',
+          count: 446,
           id: '1704331366425518081'
         }
       ],
+      barData: [138, 387, 516, 650, 635, 656],
       loading: false
     }
   },
@@ -160,7 +145,7 @@ export default {
   components: {},
   mounted () {
     this.$nextTick(() => {
-      this.initChartBar()
+      this.getData()
     })
   },
   created () {},
@@ -168,10 +153,28 @@ export default {
     ...mapActions({
       showGlobalDialog: 'showGlobalDialog'
     }),
+    async getData () {
+      await selectYearPartyMemberCensus().then((res) => {
+        console.log('res111:', res)
+        // [138, 387, 516, 650, 635, 656]
+        const data = res.data
+        this.barData = [
+          data.sanshiyixia,
+          data.sishi,
+          data.wushi,
+          data.liushi,
+          data.qishi,
+          data.qishiyishang
+        ]
+      })
+      await selectOrgPartyMemberCensus().then((res) => {
+        this.dataList = res.data;
+        console.log('res222:', res)
+      })
+      await this.initChartBar()
+    },
     initChartBar () {
       const myChart = this.$echarts.init(document.getElementById('chartBar'))
-      var data = [138, 387, 516, 650, 635, 656]
-
       var option = {
         tooltip: {},
         width: 420,
@@ -179,14 +182,14 @@ export default {
           type: 'category',
           data: [
             // "20岁以下",
-            '20-30岁',
+            '18-30岁',
             '30-40岁',
             '40-50岁',
             '50-60岁',
             '60-70岁',
             '70岁以上'
           ],
-          axisLabel: {
+          axisorgName: {
             textStyle: {
               color: '#F59969' // 将x轴文字颜色设为红色
             }
@@ -219,9 +222,9 @@ export default {
           {
             name: '人数',
             type: 'bar',
-            data: data,
+            data: this.barData,
             barWidth: 20,
-            label: {
+            orgName: {
               show: true,
               position: 'top',
               textStyle: {
@@ -270,10 +273,13 @@ export default {
     getWidth (arr, val) {
       let num = 0
       arr.forEach((item) => {
-        if (item.zrcNum > num) {
-          num = item.zrcNum
+        if (item.count > num) {
+          num = item.count
         }
       })
+      if (num === 0) {
+        return 0
+      }
       return (val / num) * 100 - 5
     },
     closeDialog () {
@@ -454,7 +460,7 @@ export default {
             }
           }
           &-item:nth-child(1) {
-            width: 73px;
+            width: 123px;
             font-weight: 500;
             font-size: 16px;
             color: #fbe9c5;
@@ -462,7 +468,7 @@ export default {
           }
           &-item:nth-child(2) {
             height: 24px;
-            width: calc(100% - 113px);
+            width: calc(100% - 163px);
           }
           &-item:nth-child(3) {
             width: 40px;