From 07fa241cdaeb92c0b6f00eaebb2ae1887761c17d Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Mon, 18 Mar 2024 10:14:46 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../hsyf-left/partyCommittee/dyzxh.vue        | 130 +++++++++---------
 .../hsyf-left/partyCommittee/wangge.vue       |  26 ++--
 .../dialog-module/hsyf-right/djhdModal.vue    |  69 +++++-----
 .../screen-content-left/hsyf-left/index.vue   |   2 +-
 4 files changed, 111 insertions(+), 116 deletions(-)

diff --git a/src/views/next/dialog-module/hsyf-left/partyCommittee/dyzxh.vue b/src/views/next/dialog-module/hsyf-left/partyCommittee/dyzxh.vue
index 77fbfee..7757a63 100644
--- a/src/views/next/dialog-module/hsyf-left/partyCommittee/dyzxh.vue
+++ b/src/views/next/dialog-module/hsyf-left/partyCommittee/dyzxh.vue
@@ -23,7 +23,7 @@
                   </div>
                   <div class="title_hrader_item">
                     网格（村民小组）:
-                    <span class="numberTotal">{{ wgNum }}</span> 家
+                    <span class="numberTotal">{{ gridCount }}</span> 家
                   </div>
                   <div class="title_hrader_item">
                     党员中心户:
@@ -56,126 +56,126 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
-import { partyOrgCensusList } from "@/api/hsyf";
+import { mapGetters, mapActions } from 'vuex'
+import { partyOrgCensusList } from '@/api/hsyf'
 export default {
-  name: "",
-  data() {
+  name: '',
+  data () {
     return {
-      dialogTitle: "移风店镇党员中心户",
+      dialogTitle: '移风店镇党员中心户',
       loading: false,
       dataList: [
         {
-          orgName: "上泊新村",
+          orgName: '上泊新村',
           naturalVillageCount: 10,
-          wanggeNum: 37,
+          gridCount: 37,
           partyMemberCenterCount: 64,
-          id: "1697533359860244481",
+          id: '1697533359860244481'
         },
         {
-          orgName: "滨河村",
+          orgName: '滨河村',
           naturalVillageCount: 10,
-          wanggeNum: 49,
+          gridCount: 49,
           partyMemberCenterCount: 69,
-          id: "1704030137514287105",
+          id: '1704030137514287105'
         },
         {
-          orgName: "湍湾新村",
+          orgName: '湍湾新村',
           naturalVillageCount: 9,
-          wanggeNum: 29,
+          gridCount: 29,
           partyMemberCenterCount: 59,
-          id: "1704036500462198786",
+          id: '1704036500462198786'
         },
         {
-          orgName: "七级村",
+          orgName: '七级村',
           naturalVillageCount: 10,
-          wanggeNum: 39,
+          gridCount: 39,
           partyMemberCenterCount: 66,
-          id: "1704313950756757506",
+          id: '1704313950756757506'
         },
         {
-          orgName: "沽河村",
+          orgName: '沽河村',
           naturalVillageCount: 10,
-          wanggeNum: 37,
+          gridCount: 37,
           partyMemberCenterCount: 68,
-          id: "1704324481563582466",
+          id: '1704324481563582466'
         },
         {
-          orgName: "太祉庄村",
+          orgName: '太祉庄村',
           naturalVillageCount: 10,
-          wanggeNum: 35,
+          gridCount: 35,
           partyMemberCenterCount: 60,
-          id: "1704327114084933633",
+          id: '1704327114084933633'
         },
         {
-          orgName: "河流新村",
+          orgName: '河流新村',
           naturalVillageCount: 10,
-          wanggeNum: 33,
+          gridCount: 33,
           partyMemberCenterCount: 54,
-          id: "1704331366425518081",
+          id: '1704331366425518081'
         },
         {
-          orgName: "大坝新村",
+          orgName: '大坝新村',
           naturalVillageCount: 10,
-          wanggeNum: 26,
+          gridCount: 26,
           partyMemberCenterCount: 72,
-          id: "1704396342955696130",
+          id: '1704396342955696130'
         },
         {
-          orgName: "双塔村",
+          orgName: '双塔村',
           naturalVillageCount: 11,
-          wanggeNum: 49,
+          gridCount: 49,
           partyMemberCenterCount: 106,
-          id: "1704331366425518081",
+          id: '1704331366425518081'
         },
         {
-          orgName: "移风村",
+          orgName: '移风村',
           naturalVillageCount: 10,
-          wanggeNum: 35,
+          gridCount: 35,
           partyMemberCenterCount: 74,
-          id: "1704331366425518081",
-        },
+          id: '1704331366425518081'
+        }
       ],
       cunNum: 10,
       zrcunNum: 100,
-      wgNum: 370,
-      dyzxhNum: 692,
-    };
+      gridCount: 370,
+      dyzxhNum: 692
+    }
   },
   computed: {
-    ...mapGetters(["dyzxhCommittee"]),
+    ...mapGetters(['dyzxhCommittee'])
   },
   components: {},
-  mounted() {
+  mounted () {
     // console.log(wangge, dangyuan)
   },
-  created() {
-    partyOrgCensusList({ type: 2 }).then((res) => {
-      const cunNum = res.data.length;
-      let zrcunNum = 0;
-      let wgNum = 0;
-      let dyzxhNum = 0;
-      res.data.forEach((item) => {
-        zrcunNum = zrcunNum + item.naturalVillageCount;
-        wgNum = wgNum + item.gridCount;
-        dyzxhNum = dyzxhNum + item.partyMemberCenterCount;
-      });
-      this.dataList = res.data;
-      this.cunNum = cunNum;
-      this.zrcunNum = zrcunNum;
-      this.wgNum = wgNum;
-      this.dyzxhNum = dyzxhNum;
-    });
+  created () {
+    // partyOrgCensusList({ type: 2 }).then((res) => {
+    //   const cunNum = res.data.length
+    //   let zrcunNum = 0
+    //   let gridCount = 0
+    //   let dyzxhNum = 0
+    //   res.data.forEach((item) => {
+    //     zrcunNum = zrcunNum + item.naturalVillageCount
+    //     gridCount = gridCount + item.gridCount
+    //     dyzxhNum = dyzxhNum + item.partyMemberCenterCount
+    //   })
+    //   this.dataList = res.data
+    //   this.cunNum = cunNum
+    //   this.zrcunNum = zrcunNum
+    //   this.gridCount = gridCount
+    //   this.dyzxhNum = dyzxhNum
+    // })
   },
   methods: {
     ...mapActions({
-      showGlobalDialog: "showGlobalDialog",
+      showGlobalDialog: 'showGlobalDialog'
     }),
-    closeDialog() {
-      this.showGlobalDialog("");
-    },
-  },
-};
+    closeDialog () {
+      this.showGlobalDialog('')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/next/dialog-module/hsyf-left/partyCommittee/wangge.vue b/src/views/next/dialog-module/hsyf-left/partyCommittee/wangge.vue
index f0ad7a0..671785b 100644
--- a/src/views/next/dialog-module/hsyf-left/partyCommittee/wangge.vue
+++ b/src/views/next/dialog-module/hsyf-left/partyCommittee/wangge.vue
@@ -140,19 +140,19 @@ export default {
   components: {},
   mounted () {},
   created () {
-    partyOrgCensusList({ type: 1 }).then((res) => {
-      const cunNum = res.data.length
-      let zrcunNum = 0
-      let wgNum = 0
-      res.data.forEach((item) => {
-        zrcunNum = zrcunNum + item.naturalVillageCount
-        wgNum = wgNum + item.gridCount
-      })
-      this.dataList = res.data
-      this.cunNum = cunNum
-      this.zrcunNum = zrcunNum
-      this.wgNum = wgNum
-    })
+    // partyOrgCensusList({ type: 1 }).then((res) => {
+    //   const cunNum = res.data.length
+    //   let zrcunNum = 0
+    //   let wgNum = 0
+    //   res.data.forEach((item) => {
+    //     zrcunNum = zrcunNum + item.naturalVillageCount
+    //     wgNum = wgNum + item.gridCount
+    //   })
+    //   this.dataList = res.data
+    //   this.cunNum = cunNum
+    //   this.zrcunNum = zrcunNum
+    //   this.wgNum = wgNum
+    // })
   },
   methods: {
     ...mapActions({
diff --git a/src/views/next/dialog-module/hsyf-right/djhdModal.vue b/src/views/next/dialog-module/hsyf-right/djhdModal.vue
index 023feb4..77ded42 100644
--- a/src/views/next/dialog-module/hsyf-right/djhdModal.vue
+++ b/src/views/next/dialog-module/hsyf-right/djhdModal.vue
@@ -39,18 +39,12 @@
                   </div>
                   <div class="content-basic-desc">
                     <span class="content-basic-item-title">活动详情：</span>
-                    {{ info.autoPublicTypeDesc }}
+                    {{ info.introduce }}
                   </div>
                 </div>
-                <div class="content-imgs">
-                  <div class="content-imgs-item">
-                    <img src="./images/WechatIMG140.png" />
-                  </div>
-                  <div class="content-imgs-item">
-                    <img src="./images/WechatIMG141.png" />
-                  </div>
-                  <div class="content-imgs-item">
-                    <img src="./images/WechatIMG142.png" />
+                <div class="content-imgs" v-if="info.attachmentList&&info.attachmentList.length>0">
+                  <div class="content-imgs-item" v-for="item in info.attachmentList" :key="item">
+                    <img :src="item" />
                   </div>
                 </div>
               </div>
@@ -63,49 +57,50 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
-import { actDetail } from "@/api/hsyf";
+import { mapGetters, mapActions } from 'vuex'
+import { actDetail } from '@/api/hsyf'
 export default {
-  name: "",
-  data() {
+  name: '',
+  data () {
     return {
-      dialogTitle: "活动详情",
+      dialogTitle: '活动详情',
       loading: false,
       info: {
-        topic: "万村共富",
-        actTypeName: "为民服务",
-        holdTime: "2024-05-13 14:00:00",
-        publishPartyOrgName: "移风店镇党委",
-        autoPublicTypeDesc:
-          "《实施意见》提出，巩固提升农村集体产权制度改革成果，落实农村集体经济组织财务制度和集体资产年度清查制度，构建产权关系明晰、治理架构科学、经营方式稳健收益分配合理的运行机制。推动农村集体产权流转交易市场规范化建设。发展新型农村集体经济，探索资源发包、物业出租、居间服务、资产参股等多样化途径，有效盘活集体资产推动县域供电、供气、电信、邮政等普遍服务类设施城乡统筹建设和管护同时，深化农村集体经营性建设用地入市试点。保障进城落户农民合法土地权益，鼓励依法自愿有偿转让。继续深化集体林权制度改革。",
-      },
-    };
+        topic: '万村共富',
+        actTypeName: '为民服务',
+        holdTime: '2024-05-13 14:00:00',
+        publishPartyOrgName: '移风店镇党委',
+        attachmentList: null,
+        introduce:
+          '《实施意见》提出，巩固提升农村集体产权制度改革成果，落实农村集体经济组织财务制度和集体资产年度清查制度，构建产权关系明晰、治理架构科学、经营方式稳健收益分配合理的运行机制。推动农村集体产权流转交易市场规范化建设。发展新型农村集体经济，探索资源发包、物业出租、居间服务、资产参股等多样化途径，有效盘活集体资产推动县域供电、供气、电信、邮政等普遍服务类设施城乡统筹建设和管护同时，深化农村集体经营性建设用地入市试点。保障进城落户农民合法土地权益，鼓励依法自愿有偿转让。继续深化集体林权制度改革。'
+      }
+    }
   },
   watch: {
-    djhdShow(value) {
+    djhdShow (value) {
       if (value) {
         actDetail(this.$store.state.dialog.actId).then((res) => {
-          console.log("res::", res);
-          this.info = res.data;
-        });
+          console.log('res::', res)
+          this.info = res.data
+        })
       }
-    },
+    }
   },
   computed: {
-    ...mapGetters(["djhdShow", "actId"]),
+    ...mapGetters(['djhdShow', 'actId'])
   },
   components: {},
-  mounted() {},
-  created() {},
+  mounted () {},
+  created () {},
   methods: {
     ...mapActions({
-      showGlobalDialog: "showGlobalDialog",
+      showGlobalDialog: 'showGlobalDialog'
     }),
-    closeDialog() {
-      this.showGlobalDialog("");
-    },
-  },
-};
+    closeDialog () {
+      this.showGlobalDialog('')
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/next/screen-content-left/hsyf-left/index.vue b/src/views/next/screen-content-left/hsyf-left/index.vue
index bd3c079..bbe4ef4 100644
--- a/src/views/next/screen-content-left/hsyf-left/index.vue
+++ b/src/views/next/screen-content-left/hsyf-left/index.vue
@@ -53,7 +53,7 @@
               <img :src="require('@/assets/images/icon/dyzxhRed.png')" />
             </div>
             <div class="bot-item-val">
-              <div class="bot-item-val-num">{{ zzjsValues[5].value }}</div>
+              <div class="bot-item-val-num">{{ zzjsValues[5].value||692 }}</div>
               <div class="bot-item-val-title">党员中心户</div>
             </div>
           </div>