From 13160e49545bbcbc9fb71e9b9e82db53e90fceae Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Tue, 21 May 2024 16:20:38 +0800
Subject: [PATCH] gx

---
 src/view/sy.vue | 39 ++++++++++++++++++++-------------------
 vite.config.js  |  4 ++--
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/view/sy.vue b/src/view/sy.vue
index 2ed89f3..237ac8b 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -13,13 +13,13 @@
                 <span class="left">收入：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.zgylbxzsr
-                }}</span>
+                }}万元</span>
               </div>
               <div class="sr" style="margin-top: 5px">
                 <span class="left">支出：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.zgylbxzzc
-                }}</span>
+                }}万元</span>
               </div>
             </div>
           </div>
@@ -28,11 +28,13 @@
             <div class="item_content">
               <div class="sr">
                 <span class="left">收入：</span
-                ><span class="right">{{ data.LivelihoodWelfare.gsbxzsr }}</span>
+                ><span class="right"
+                  >{{ data.LivelihoodWelfare.gsbxzsr }}万元</span
+                >
               </div>
               <div class="sr" style="margin-top: 5px">
                 <span class="left">支出：</span
-                ><span class="right">{{ data.LivelihoodWelfare.gsbxzzc }}</span>
+                ><span class="right">{{ data.LivelihoodWelfare.gsbxzzc }}万元</span>
               </div>
             </div>
           </div>
@@ -45,13 +47,13 @@
                 <span class="left">收入：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.cxylbxzsr
-                }}</span>
+                }}万元</span>
               </div>
               <div class="sr" style="margin-top: 5px">
                 <span class="left">支出：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.cxylbxzzc
-                }}</span>
+                }}万元</span>
               </div>
             </div>
           </div>
@@ -64,13 +66,13 @@
                 <span class="left">收入：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.zgyilbxzsr
-                }}</span>
+                }}万元</span>
               </div>
               <div class="sr" style="margin-top: 5px">
                 <span class="left">支出：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.zgyilbxzzc
-                }}</span>
+                }}万元</span>
               </div>
             </div>
           </div>
@@ -83,13 +85,13 @@
                 <span class="left">收入：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.cxyilbxzsr
-                }}</span>
+                }}万元</span>
               </div>
               <div class="sr" style="margin-top: 5px">
                 <span class="left">支出：</span
                 ><span class="right">{{
                   data.LivelihoodWelfare.cxyilbxzzc
-                }}</span>
+                }}万元</span>
               </div>
             </div>
           </div>
@@ -355,11 +357,11 @@ const data = reactive({
     xxzs: "0", //学校总数
     xszs: "0", //学生总数
     jzgzs: "0", //教职工总数
-  }, 
+  },
   employmentService: {
-    jypx: '0', //就业培训
-    jyjxfw: '0', //就业见习服务
-    jyyz: '0', //就业援助
+    jypx: "0", //就业培训
+    jyjxfw: "0", //就业见习服务
+    jyyz: "0", //就业援助
   }, //就业服务
   LivelihoodWelfare: {
     zgylbxzsr: "0", //职工基本养老保险总收入
@@ -637,7 +639,6 @@ const ylwsList = ref([
   },
 ]);
 
-
 const jtsyList = ref([
   {
     name: "公共自行车",
@@ -748,9 +749,7 @@ const getData = async () => {
       ];
       if (data.LivelihoodWelfare) {
         msfzKeys.forEach((key) => {
-          data.LivelihoodWelfare[key] = addThousandSeparator(
-            res.data.msfz[key]
-          );
+          data.LivelihoodWelfare[key] = (res.data.msfz[key] / 10000).toFixed(2) ;
         });
       }
       // 救助服务
@@ -768,7 +767,9 @@ const getData = async () => {
       // 就业服务
       const jyfwKeys = ["jypx", "jyjxfw", "jyyz"];
       jyfwKeys.forEach((key) => {
-        data.employmentService[key] = addThousandSeparator(res.data.jyfw[key].toString());
+        data.employmentService[key] = addThousandSeparator(
+          res.data.jyfw[key].toString()
+        );
       });
       // 年龄段分类&人口数据&年龄比例
       data.PopulationData = res.data.rksj;
diff --git a/vite.config.js b/vite.config.js
index 4f65ea6..7594a2c 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -15,8 +15,8 @@ export default defineConfig({
       // 第一个代理
       "/api": {
         // 匹配到啥来进行方向代理
-        // target: "http://192.168.2.42:8095/", //周源
-        target: "http://220.191.238.50:996/", //周源
+        target: "http://192.168.2.42:8095/", //周源
+        // target: "http://220.191.238.50:996/", //周源
         changeOrigin: true, //是否支持跨域
         //rewrite: (path) => path.replace(/^\/api/, '') // 如果不需要api 直接把路径上的api 替换成空，这个
       },