Merge branch 'main' of https://git.cityme.com.cn/xiangshan/ggfwjsc

src/router/index.js

@@ -70,11 +70,11 @@ const router = createRouter({
           path: '/home/index/person',
           component: () => import('../view/person/index.vue'),
         },
-        {
-          name: '地图编辑',
-          path: '/home/index/mapEdit',
-          component: () => import('../view/sy_map_fb.vue'),
-        },
+        // {
+        //   name: '地图编辑',
+        //   path: '/home/index/mapEdit',
+        //   component: () => import('../view/sy_map_fb.vue'),
+        // },
       ]
     },
   ]

src/view/analyze.vue

@@ -804,7 +804,7 @@ const data = reactive({
   whistleblower: {
     culeTotal: {
       data: ["100", "120", "199", "133", "210"],
-      time: ["61-70", "71-80", "81-90", "91-100", "100以上"],
+      time: ["60-69", "70-79", "80-89", "90-99", "100以上"],
     },
   }, //高血压柱状图
 
@@ -978,7 +978,7 @@ const getData = async () => {
       data.analysis.lnr = res.data.lnr;
       // data.analysis.push[0].num = res.data.push[0].num;
 
-      const ageBt = ["nl6170", "nl7180", "nl8190", "nl91100", "nl100"];
+      const ageBt = ["nl6069", "nl7079", "nl8089", "nl9099", "nl100"];
       ageBt.forEach((key, index) => {
         data.whistleblower.culeTotal.data[index] = res.data.lnr.rksj[key];
       });
@@ -1021,9 +1021,45 @@ const getData = async () => {
       data.ViewData[8].value = res.data.dataShow.tekun.total; //特困年份
       // data.ViewData[9].data = res.data.dataShow.qtjbrs.qtjbrs; //其他疾病
       // data.ViewData[9].value = res.data.dataShow.qtjbrs.total; //其他疾病年份
-      showEchart.value = true;
+      
     }
   });
+  await http.get("/api/ggfwyth/succour").then((res) => {
+    if (res.code == 200) {
+      data.dataAnalysis.forEach((item,index)=>{
+        item.data.length=0;
+        item.year.length=0;
+        if(index<=2){
+          item.year=[...res.data.lifeAssistance.jz.month];
+        }else if (index==3){
+          item.year=[...res.data.underprivileged.disabilitySubsidies.month];
+        }else if(index==4){
+          item.year=[...res.data.underprivileged.difficultSoldiers.year];
+        }else{
+          item.year=[...res.data.underprivileged.needyWorkers.year];
+        }
+      })
+      res.data.lifeAssistance.jz.data.forEach((item, index) => {
+        data.dataAnalysis[0].data.push(item.tkjzrs);
+        data.dataAnalysis[1].data.push(item.dbjzrs);
+        data.dataAnalysis[2].data.push(item.dibianJzrs);
+      });
+      res.data.underprivileged.disabilitySubsidies.data.forEach(
+        (item, index) => {
+          data.dataAnalysis[3].data.push(item.shbtrs);
+        }
+      );
+      res.data.underprivileged.difficultSoldiers.data.forEach((item, index) => {
+        data.dataAnalysis[4].data.push(item.jzrs);
+      });
+      res.data.underprivileged.needyWorkers.data.forEach((item, index) => {
+        data.dataAnalysis[5].data.push(item.jzrs);
+      });
+    }
+    jzChange('1', '特困')
+ 
+  });
+     showEchart.value = true;
 };
 
 onMounted(() => {
@@ -1282,7 +1318,7 @@ onBeforeUnmount(() => {
 }
 
 .flex11 {
-  padding-bottom: 12px ;
+  padding-bottom: 12px;
 }
 
 .map {

src/view/echart_analyze/pie4.vue

@@ -33,7 +33,7 @@ const data = reactive({
   name:'特困',
   list: [6280, 6280, 6280, 5924, 1824],
   year: [2020, 2021, 2022, 2023, 2024],
-  bg: [0, 0, 0, 0, 0],
+  bg: [0, 0, 0, 0],
   option: {},
 });
 
@@ -73,8 +73,12 @@ const getOption = () => {
       },
     },
     yAxis: {
-      // name: "人数/次",
+      name: "人数/次",
       type: "value",
+             max: function (value) {
+          // 自定义Y轴最大值，确保数据点显示在顶部
+          return Math.ceil(Math.max(value.max, value.max * 1.6) / 50) * 50;
+        },
       nameTextStyle: {
         // 设置Y轴名称的样式
         fontSize: 14, // 这里设置字体大小为20
@@ -152,6 +156,10 @@ watch(
   (newVal, oldVal) => {
     data.list = newVal;
      data.name = props.name;
+         data.bg.length=0;
+    data.year.forEach(item=>{
+      data.bg.push(0)
+    })
     getOption();
     setChart();
   }
@@ -161,6 +169,10 @@ watch(
   (newVal, oldVal) => {
     data.year = newVal;
      data.name = props.name;
+         data.bg.length=0;
+    data.year.forEach(item=>{
+      data.bg.push(0)
+    })
     getOption();
     setChart();
   }
@@ -171,6 +183,10 @@ onBeforeMount(() => {
     data.list = props.list;
     data.year = props.year;
     data.name = props.name;
+    data.bg.length=0;
+    data.year.forEach(item=>{
+      data.bg.push(0)
+    })
     getOption();
     setChart();
   }, 600);

src/view/sy.vue

@@ -370,7 +370,7 @@
             <div class="zwfw">
               <div class="shang">
                 <div class="shang_item">
-                  <div class="title">一网通办事</div>
+                  <div class="title">一网通办率</div>
                   <div class="i">
                     <zwfw1 :list="data.zwfw.list1" />
                   </div>

src/view/sy_details.vue

@@ -696,7 +696,7 @@ const formData = reactive({
       },
       {
         SerialNumber: "03",
-        SubsidyType: "高温津贴",
+        SubsidyType: "高龄津贴",
         SubsidRecipients: "龙游户籍老人",
         SubsidyStandards:
           "80周岁（含）至89周岁的老年人，每人每月享受60元高龄老人生活津贴：90周岁（含）至98司岁的老年人，每人每明享受160元高龄老人生活连贴：99同岁及以上的老年人，每人每月享安1000元长寿保健补助金。",