Merge branch 'main' of git.zdool.com:xs/ggfwjsc

src/view/dialog/dialog.vue

@@ -15,10 +15,25 @@
           </el-icon>
         </div>
       </template>
+
       <div class="tabelPart">
+        <div class="bo">
+          <div class="title">
+            <div class="title_top">
+              <img src="@/assets/images/table_l.png" alt="" style="margin-right:10px;"/>
+              <div class="name">{{ title }}详情</div>
+              <img src="@/assets/images/table_r.png" alt=""  style="margin-left:10px;"/>
+            </div>
+            <img
+              class="title_botton"
+              src="@/assets/images/table_c.png"
+              alt=""
+            />
+          </div>
+        </div>
         <el-table
           :data="data.tableData"
-          height="calc(100% - 40px)"
+          height="calc(100% - 110px)"
           :header-cell-style="{ background: '#008FCD' }"
         >
           <!-- <el-table-column
@@ -163,7 +178,7 @@ const handle = (current) => {
 }
 
 .tabelPart {
-  height: 60vh;
+  height: 80vh;
   padding: 16px;
   background: linear-gradient(
       270deg,
@@ -212,4 +227,40 @@ const handle = (current) => {
     background-color: rgba(0, 116, 255, 0) !important;
   }
 }
+.bo {
+  width: 100%;
+  display: flex;
+  // align-items: center;
+}
+.title {
+  margin: 10px auto;
+  display: flex;
+  flex-direction: column;
+  &_top {
+    display: flex;
+    align-items: end;
+    img {
+      height: 33px;
+      width: 33px;
+    }
+
+    .name {
+      font-family: PangMenZhengDao, PangMenZhengDao;
+      font-weight: 600;
+      font-size: 33px;
+      color: #ffffff;
+      line-height: 38px;
+      text-align: center;
+      font-style: normal;
+      letter-spacing: 2px;
+      background: linear-gradient(180deg, #ffffff 0%, #51ffef 100%);
+      -webkit-background-clip: text; /*将设置的背景颜色限制在文字中*/
+      -webkit-text-fill-color: transparent; /*给文字设置成透明*/
+    }
+  }
+  &_botton {
+    margin-top: 5px;
+    height: 19px;
+  }
+}
 </style>

src/view/work.vue

@@ -48,9 +48,13 @@
             <!-- <span>数据对比</span> -->
           </div>
           <div class="rolling">
-            <div v-for="(item, index) in 20" :key="index" class="fundingContent">
+            <div
-              <span class="spot">城乡居民最低生活保障金</span>
+              v-for="(item, index) in data.lifeAssistance.subsidyInformation"
-              <span class="spot">99,126,474</span>
+              :key="index"
+              class="fundingContent"
+            >
+              <span class="spot">{{ item.btsx }}</span>
+              <span class="spot">{{ item.btje }}</span>
               <!-- <span class="spot">70.88</span> -->
             </div>
           </div>
@@ -175,6 +179,10 @@ 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) => {
@@ -182,15 +190,25 @@ const getData = async () => {
       console.log(res.data);
       data.diversification.hszhxms = res.data.diversification.hszhxms
       // 专项救助模块
-      // 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;
     }
   });
 };
@@ -751,6 +769,7 @@ onBeforeMount(() => {
     justify-content: space-between;
     margin-bottom: 20px;
   }
+
 }
 }