From 9bad6aa13e74a838b7c6a9918a62a672c6b5cc7b Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Mon, 27 May 2024 14:56:38 +0800
Subject: [PATCH] gx

---
 src/view/work.vue | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/view/work.vue b/src/view/work.vue
index 8e448bd..c1b07bc 100644
--- a/src/view/work.vue
+++ b/src/view/work.vue
@@ -72,12 +72,12 @@
           </div>
           <div class="rolling">
             <div
-              v-for="(item, index) in 20"
+              v-for="(item, index) in data.lifeAssistance.subsidyInformation"
               :key="index"
               class="fundingContent"
             >
-              <span class="spot">城乡居民最低生活保障金</span>
-              <span class="spot">99,126,474</span>
+              <span class="spot">{{ item.btsx }}</span>
+              <span class="spot">{{ item.btje }}</span>
               <!-- <span class="spot">70.88</span> -->
             </div>
           </div>
@@ -144,9 +144,9 @@
                   捐赠人次: {{ item.jzrc }}
                 </div>
               </div>
-              <div class="czrBox">
-                <div class="situation situation3"></div>
-              </div>
+            </div>
+            <div class="czrBox">
+              <div class="situation situation3"></div>
             </div>
           </div>
         </div>
@@ -226,22 +226,35 @@ const data = reactive({
     ],
   }, //多元化力量参与模块
 });
+// 添加千位分隔符
+const addThousandSeparator = (numberString) => {
+  return parseInt(numberString.trim(), 10).toLocaleString("en-US");
+};
 
 const getData = async () => {
   await http.get("/api/ggfwyth/succour").then((res) => {
     if (res.code == 200) {
       console.log(res.data);
       // 专项救助模块
-      // data.education.data[0] = res.data.specialAssistance.education.data[0];
       // 教育&医疗&就业
+      data.education.data = res.data.specialAssistance.education.data;
+      data.education.year = res.data.specialAssistance.education.year;
       // 住房&自然灾害&临时救助
+      data.housing.data = res.data.specialAssistance.housing.data;
+      data.housing.year = res.data.specialAssistance.housing.year;
       // 救助概况
       // 生活类救助模块
       // 一卡通补贴
+      data.lifeAssistance.subsidyInformation =
+        res.data.lifeAssistance.subsidyInformation;
+      res.data.lifeAssistance.subsidyInformation.forEach((item, index) => {
+        data.lifeAssistance.subsidyInformation[index].btje =
+          addThousandSeparator(item.btje);
+      });
       // 弱势群体补贴
       // 困难残疾人&困难军人&困难职工
       // 多元化力量参与
-      data.diversification.hszhxms = res.data.diversification.hszhxms
+      data.diversification.housing = res.data.diversification.housing;
     }
   });
 };
@@ -769,7 +782,7 @@ onBeforeMount(() => {
 
 .czr-bj {
   width: 529px;
-  height: 350px;
+  // height: 350px;
   // height: calc(100% - 26px);
   background: rgba(0, 103, 165, 0.18);
   box-shadow: inset 0px 0px 58px 0px rgba(37, 175, 252, 0.47);
@@ -780,14 +793,14 @@ onBeforeMount(() => {
   .czrBox {
     height: 118px;
     .column {
-      height: calc(100% - 26px);
+      // height: calc(100% - 26px);
       overflow-y: auto;
       font-size: 14px;
       color: #ffffff;
       padding-left: 18px;
       padding-right: 18px;
     }
-  }
+  
 
   .situation {
     width: 495px;
@@ -808,6 +821,7 @@ onBeforeMount(() => {
     background-image: url(@/assets/images/work/dyh1.png);
   }
 }
+}
 .school {
   display: flex;
   flex-direction: column;