From 44946923d8a2a0d7c6ee266e8b54e019b11a2e21 Mon Sep 17 00:00:00 2001
From: juwei001 <974220104@qq.com>
Date: Fri, 15 Mar 2024 11:23:57 +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

---
 src/api/hsyf.js                               |   9 +
 .../hsyf-left/company/company.vue             |   2 +-
 .../dialog-module/hsyf-left/company/jzfw.vue  |   2 +-
 .../dialog-module/hsyf-right/djhdModal.vue    |  65 +++---
 .../dialog-module/hsyf-right/ylqdModal.vue    | 188 +++++++-----------
 .../screen-content-right/hsyf-right/index.vue |  16 +-
 6 files changed, 127 insertions(+), 155 deletions(-)

diff --git a/src/api/hsyf.js b/src/api/hsyf.js
index 187080a..1b3fa73 100644
--- a/src/api/hsyf.js
+++ b/src/api/hsyf.js
@@ -115,3 +115,12 @@ export function partyWishList (params) {
     params
   })
 }
+
+// 移列清单
+export function icpartyinventoryPage (params) {
+  return request({
+    url: '/api/resi/partymember/yifengScreen/selectInventoryList',
+    method: 'GET',
+    params
+  })
+}
diff --git a/src/views/next/dialog-module/hsyf-left/company/company.vue b/src/views/next/dialog-module/hsyf-left/company/company.vue
index 76dbbc6..9e80ccc 100644
--- a/src/views/next/dialog-module/hsyf-left/company/company.vue
+++ b/src/views/next/dialog-module/hsyf-left/company/company.vue
@@ -19,7 +19,7 @@
                     <div
                       v-for="item in dataList"
                       :key="item.id"
-                      @click="currentId = item.id"
+                      @click="onDatils(item)"
                       :class="`content-left-list-item ${
                         currentId === item.id ? 'action' : ''
                       }`"
diff --git a/src/views/next/dialog-module/hsyf-left/company/jzfw.vue b/src/views/next/dialog-module/hsyf-left/company/jzfw.vue
index 332ae17..b56e234 100644
--- a/src/views/next/dialog-module/hsyf-left/company/jzfw.vue
+++ b/src/views/next/dialog-module/hsyf-left/company/jzfw.vue
@@ -19,7 +19,7 @@
                     <div
                       v-for="item in dataList"
                       :key="item.id"
-                      @click="currentId = item.id"
+                      @click="onDatils(item)"
                       :class="`content-left-list-item ${
                         currentId == item.id ? 'action' : ''
                       }`"
diff --git a/src/views/next/dialog-module/hsyf-right/djhdModal.vue b/src/views/next/dialog-module/hsyf-right/djhdModal.vue
index e2d9d17..023feb4 100644
--- a/src/views/next/dialog-module/hsyf-right/djhdModal.vue
+++ b/src/views/next/dialog-module/hsyf-right/djhdModal.vue
@@ -16,23 +16,23 @@
               <div class="content">
                 <div class="content-basic">
                   <div class="content-basic-item">
-                    <div class="content-basic-item-title">活动名称：</div>
+                    <div class="content-basic-item-title" style="width: 80px;">活动名称：</div>
                     <div class="content-basic-item-txt">{{ info.topic }}</div>
                   </div>
                   <div class="content-basic-item">
-                    <div class="content-basic-item-title">活动类型：</div>
+                    <div class="content-basic-item-title" style="text-align: right;">活动类型：</div>
                     <div class="content-basic-item-txt">
                       {{ info.actTypeName }}
                     </div>
                   </div>
                   <div class="content-basic-item">
-                    <div class="content-basic-item-title">活动时间：</div>
+                    <div class="content-basic-item-title" style="width: 80px;">活动时间：</div>
                     <div class="content-basic-item-txt">
                       {{ info.holdTime }}
                     </div>
                   </div>
                   <div class="content-basic-item">
-                    <div class="content-basic-item-title">发布党组织：</div>
+                    <div class="content-basic-item-title" style="text-align: right;">发布党组织：</div>
                     <div class="content-basic-item-txt">
                       {{ info.publishPartyOrgName }}
                     </div>
@@ -63,50 +63,49 @@
 </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: '移风店镇党委',
+        topic: "万村共富",
+        actTypeName: "为民服务",
+        holdTime: "2024-05-13 14:00:00",
+        publishPartyOrgName: "移风店镇党委",
         autoPublicTypeDesc:
-          '《实施意见》提出，巩固提升农村集体产权制度改革成果，落实农村集体经济组织财务制度和集体资产年度清查制度，构建产权关系明晰、治理架构科学、经营方式稳健收益分配合理的运行机制。推动农村集体产权流转交易市场规范化建设。发展新型农村集体经济，探索资源发包、物业出租、居间服务、资产参股等多样化途径，有效盘活集体资产推动县域供电、供气、电信、邮政等普遍服务类设施城乡统筹建设和管护同时，深化农村集体经营性建设用地入市试点。保障进城落户农民合法土地权益，鼓励依法自愿有偿转让。继续深化集体林权制度改革。'
-      }
-    }
+          "《实施意见》提出，巩固提升农村集体产权制度改革成果，落实农村集体经济组织财务制度和集体资产年度清查制度，构建产权关系明晰、治理架构科学、经营方式稳健收益分配合理的运行机制。推动农村集体产权流转交易市场规范化建设。发展新型农村集体经济，探索资源发包、物业出租、居间服务、资产参股等多样化途径，有效盘活集体资产推动县域供电、供气、电信、邮政等普遍服务类设施城乡统筹建设和管护同时，深化农村集体经营性建设用地入市试点。保障进城落户农民合法土地权益，鼓励依法自愿有偿转让。继续深化集体林权制度改革。",
+      },
+    };
   },
   watch: {
-    djhdShow (value) {
+    djhdShow(value) {
       if (value) {
-        actDetail(this.$store.state.dialog.actId).then(res => {
-          console.log('res::', res)
-          this.info = res.data
-        })
+        actDetail(this.$store.state.dialog.actId).then((res) => {
+          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>
@@ -277,6 +276,7 @@ export default {
         width: 49%;
         display: flex;
         &-title {
+          width: 110px;
           font-size: 16px;
           font-weight: 500;
           font-family: PingFang SC;
@@ -284,6 +284,7 @@ export default {
           line-height: 32px;
         }
         &-txt {
+          width: 250px;
           font-size: 16px;
           font-weight: 500;
           font-family: PingFang SC;
diff --git a/src/views/next/dialog-module/hsyf-right/ylqdModal.vue b/src/views/next/dialog-module/hsyf-right/ylqdModal.vue
index 1e2fed0..32700d9 100644
--- a/src/views/next/dialog-module/hsyf-right/ylqdModal.vue
+++ b/src/views/next/dialog-module/hsyf-right/ylqdModal.vue
@@ -22,7 +22,7 @@
                         :class="`content-left-list-item ${
                           openId == item.id ? 'open' : ''
                         }`"
-                        @click="openMene(item.id)"
+                        @click="openMene(item)"
                       >
                         <div class="content-left-list-item-title">
                           <div class="content-left-list-item-title-left">
@@ -46,7 +46,7 @@
                         :class="`content-left-list-item ${
                           currentId == item.id ? 'action' : ''
                         }`"
-                        @click="openMene(item.id, item.children)"
+                        @click="openMene(item, item.children)"
                       >
                         <div class="content-left-list-item-title">
                           <div class="content-left-list-item-title-left">
@@ -69,7 +69,7 @@
                         v-for="item1 in item.children"
                         v-show="openId == item.id && openVisable"
                         :key="item1.id"
-                        @click="currentId = item1.id"
+                        @click="onDatils(item1)"
                         :class="`content-left-list-item1 ${
                           currentId == item1.id ? 'action' : ''
                         }`"
@@ -82,56 +82,7 @@
                   </div>
                 </div>
                 <div class="content-right">
-                  <div class="content-right-txt">
-                    <div style="font-size: 20px; font-weight: bold">
-                      《中国共产党中央委员会工作条例》
-                    </div>
-                    <div style="font-size: 16px">
-                      (2020年9月28日中共中央政治局会议审议批准
-                      2020年9月30日中共中央发布)
-                    </div>
-                    <div>
-                      <div style="font-weight: bold; font-size: 16px">
-                        第一章 总则
-                      </div>
-                      <div>
-                        第一条
-                        为了加强党的中央委员会工作，根据《中国共产党章程》，制定本条例。
-                      </div>
-                      <div>
-                        第二条
-                        党的最高领导机关，是党的全国代表大会和它所产生的中央委员会。在全国代表大会闭会期间，中央委员会领导党的全部工作，对外代表中国共产党。
-                      </div>
-                      <div>
-                        第三条
-                        中央委员会高举中国特色社会主义伟大旗帜，以马克思列宁主义、毛泽东思想、邓小平理论、“三个代表重要思想、科学发展观、习近平新时代中国特色社会主义思想为指导，带头增强“四个意识”、坚定“四个自信”、做到“两个维护”，不忘初心、牢记使命，总揽全局、协调各方，以坚定正确的政治立场和政治方向，团结带领全党全军全国各族人民为全面建成社会主义现代化强国、实现中华民族伟大复兴的中国梦不懈奋斗。第四条
-                        中央委员会开展工作，牢牢把握以下原则:
-                        <div>
-                          (一)坚持党对一切工作的领导，确保党中央集中统一领导。
-                        </div>
-                        <div>
-                          (二)坚持和发展中国特色社会主义，全面贯彻党的基本理论、基本路线、基本方略。
-                        </div>
-                        <div>
-                          (三) 坚持解放思想，实事求是，与时俱进，求真务实。
-                        </div>
-                        <div>
-                          (四)坚持全心全意为人民服务，以人民为中心，为人民执政、靠人民执政。
-                        </div>
-                        <div>
-                          (五》坚持民主集中制，充分发扬党内民主，实行正确有效集中，维护党的团结统一
-                        </div>
-                        <div>
-                          (六) 坚持从严管党治党，永葆党的先进性和纯洁性。
-                        </div>
-                      </div>
-                    </div>
-                    <div>
-                      <div style="font-weight: bold; font-size: 16px">
-                        第二章 领导地位
-                      </div>
-                    </div>
-                  </div>
+                  <div v-html="info.content"></div>
                 </div>
               </div>
             </div>
@@ -143,105 +94,112 @@
 </template>
 
 <script>
-import { mapGetters, mapActions } from "vuex";
+import { mapGetters, mapActions } from 'vuex'
+import { icpartyinventoryPage } from '@/api/hsyf'
 export default {
-  name: "",
-  data() {
+  name: '',
+  data () {
     return {
-      dialogTitle: "“移”列清单",
-      currentId: "1-1",
-      openId: "1",
-      dataList: [
-        {
-          name: "大欧鸟笼乡村记忆馆",
-          id: "1",
-        },
-        {
-          name: "七彩田园",
-          id: "2",
-        },
-        {
-          name: "中共即墨县委纪念馆",
-          id: "3",
-        },
-      ],
+      dialogTitle: '“移”列清单',
+      currentId: '1-1',
+      openId: '1',
+      dataList: [],
+      info: { content: '' },
       loading: false,
-      openVisable: true,
-    };
+      openVisable: true
+    }
   },
   computed: {
-    ...mapGetters(["ylqdShow"]),
+    ...mapGetters(['ylqdShow'])
   },
   components: {},
-  mounted() {},
-  created() {
+  mounted () {},
+  created () {
     this.dataList = [
       {
-        title: "党章党规",
-        id: "1",
+        title: '党章党规',
+        id: '1',
         children: [
           {
-            id: "1-1",
-            title: "《中国共产党中央委员会工作条例》",
+            id: '1-1',
+            title: '《中国共产党中央委员会工作条例》'
           },
           {
-            id: "1-2",
-            title: "党史学习教育工作条例",
+            id: '1-2',
+            title: '党史学习教育工作条例'
           },
           {
-            id: "1-3",
-            title: "关于新形势下党内政治生活···",
+            id: '1-3',
+            title: '关于新形势下党内政治生活···'
           },
           {
-            id: "1-4",
-            title: "信访工作条例",
+            id: '1-4',
+            title: '信访工作条例'
           },
           {
-            id: "1-5",
-            title: "中国共产党纪律处分条例",
+            id: '1-5',
+            title: '中国共产党纪律处分条例'
           },
           {
-            id: "1-6",
-            title: "中国共产党章程",
+            id: '1-6',
+            title: '中国共产党章程'
           },
           {
-            id: "1-7",
-            title: "中国共产党组织工作条例",
-          },
-        ],
+            id: '1-7',
+            title: '中国共产党组织工作条例'
+          }
+        ]
       },
       {
-        id: "2",
-        title: "党务知识",
+        id: '2',
+        title: '党务知识'
       },
       {
-        id: "3",
-        title: "学习清单",
+        id: '3',
+        title: '学习清单'
       },
       {
-        id: "4",
-        title: "便民服务清单",
-      },
-    ];
+        id: '4',
+        title: '便民服务清单'
+      }
+    ]
+    this.getData()
   },
   methods: {
     ...mapActions({
-      showGlobalDialog: "showGlobalDialog",
+      showGlobalDialog: 'showGlobalDialog'
     }),
-    openMene(id, bool) {
-      if (this.openId === id) {
-        this.openVisable = !this.openVisable;
+    getData () {
+      icpartyinventoryPage().then((res) => {
+        this.dataList = res.data
+        if (this.dataList.length > 0) {
+          if (this.dataList[0].type === 2) {
+            this.onDatils(this.dataList[0])
+          } else {
+            this.openMene(this.dataList[0], this.dataList[0].children)
+            this.onDatils(this.dataList[0].children[0])
+          }
+        }
+      })
+    },
+    openMene (item, bool) {
+      if (this.openId === item.id) {
+        this.openVisable = !this.openVisable
       }
-      if(!bool){
-        this.currentId = id;
+      if (!item.children) {
+        this.onDatils(item)
       }
-      this.openId = id;
+      this.openId = item.id
     },
-    closeDialog() {
-      this.showGlobalDialog("");
+    closeDialog () {
+      this.showGlobalDialog('')
     },
-  },
-};
+    onDatils (item) {
+      this.currentId = item.id
+      this.info = item
+    }
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/views/next/screen-content-right/hsyf-right/index.vue b/src/views/next/screen-content-right/hsyf-right/index.vue
index cc37cc9..0af0575 100644
--- a/src/views/next/screen-content-right/hsyf-right/index.vue
+++ b/src/views/next/screen-content-right/hsyf-right/index.vue
@@ -20,11 +20,10 @@
               :src="item.attachments.length > 0 ? item.attachments[0] : ''"
               alt=""
             />
-            <div class="imgE">暂无图片</div>
+            <div v-else class="imgE">暂无图片</div>
             <section>
               <div>
-                {{ item.title }}“奋斗新征程，基层谱新篇”乡村振兴宣传
-                月服务活动“奋斗新征程，基层谱新篇”乡村振兴宣传 月服务活动
+                {{ item.topic }}
               </div>
               <div>{{ item.publishPartyOrgName }}</div>
             </section>
@@ -36,10 +35,15 @@
             v-for="(item, index) in activityList"
             :key="index"
           >
-            <img :src="item.imgSrc" alt="" />
+            <img
+              v-if="item.attachments && item.attachments.length > 0"
+              :src="item.attachments.length > 0 ? item.attachments[0] : ''"
+              alt=""
+            />
+            <div v-else class="imgE">暂无图片</div>
             <section>
-              <div>{{ item.title }}</div>
-              <div>{{ item.unit }}</div>
+              <div>{{ item.topic }}</div>
+              <div>{{ item.publishPartyOrgName }}</div>
             </section>
           </div>
         </div>