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

src/view/dialog/dialogSf.vue

@@ -51,7 +51,7 @@
           <div class="item">
             <div class="item_title">
               <div class="yd_title">
-                <span>概况模型</span>
+                <span>模型概况</span>
                 <div class="semi-circle-shadow"></div>
                 <div class="animate-border">
                   <i></i>

src/view/echarts_infabt/eP4.vue

@@ -12,16 +12,16 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
-  list2: {
+  // list2: {
-    type: Array,
+  //   type: Array,
-    default: () => [],
+  //   default: () => [],
-  },
+  // },
 });
 const data = reactive({
-  list: [],
+  list: [], //乡镇街道
   list2: [],
-  zgffrc: [], //育龄妇女
+  ylfnrs: [], //育龄妇女
-  cxffrc: [], //婴幼儿
+  yyers: [], //婴幼儿
   option: {},
   bg: [],
 });
@@ -65,8 +65,8 @@ const getOption = () => {
   data.option = {
     tooltip: {
       trigger: "axis",
-      // formatter: "{b}<br />{a1}:{c1} <br />{a}:{c} ",
+      formatter: "{b}<br />{a1}:{c1} <br />{a}:{c} ",
-      formatter: "{b}<br />{a}:{c} ",
+      // formatter: "{b}<br />{a}:{c} ",
     },
     legend: {
       data: ["育龄妇女", "婴幼儿"],
@@ -123,7 +123,7 @@ const getOption = () => {
             fontSize: 16,
           },
         },
-        data: data.list2,
+        data: data.list,
       },
       {
         type: "category",
@@ -157,14 +157,14 @@ const getOption = () => {
         name: "育龄妇女",
         type: "bar",
         barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
-        data: data.list ,
+        data: data.ylfnrs,
         barWidth: "18%",
         label: {
           show: true,
           color: "#ffffff",
           position: "right",
           formatter: function (data) {
-            return data.value ;
+            return data.value;
           },
         },
         itemStyle: {
@@ -181,35 +181,35 @@ const getOption = () => {
           },
         },
       },
-      // {
+      {
-      //   z: 2,
+        z: 2,
-      //   name: "婴幼儿",
+        name: "婴幼儿",
-      //   type: "bar",
+        type: "bar",
-      //   barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
+        barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
-      //   data: data.cxffrc,
+        data: data.yyers,
-      //   barWidth: "18%",
+        barWidth: "18%",
-      //   label: {
+        label: {
-      //     show: true,
+          show: true,
-      //     color: "#ffffff",
+          color: "#ffffff",
-      //     position: "right",
+          position: "right",
-      //     formatter: function (data) {
+          formatter: function (data) {
-      //       return data.value + "万";
+            return data.value;
-      //     },
+          },
-      //   },
+        },
-      //   itemStyle: {
+        itemStyle: {
-      //     color: {
+          color: {
-      //       type: "linear",
+            type: "linear",
-      //       x: 0,
+            x: 0,
-      //       x2: 1,
+            x2: 1,
-      //       y: 0,
+            y: 0,
-      //       y2: 0,
+            y2: 0,
-      //       colorStops: [
+            colorStops: [
-      //         { offset: 0, color: "rgba(24, 234, 254, 0.2)" },
+              { offset: 0, color: "rgba(24, 234, 254, 0.2)" },
-      //         { offset: 1, color: "rgba(24, 234, 254, 0.7)" },
+              { offset: 1, color: "rgba(24, 234, 254, 0.7)" },
-      //       ],
+            ],
-      //     },
+          },
-      //   },
+        },
-      // },
+      },
 
       // {
       //   type: "bar",
@@ -235,10 +235,12 @@ const setChart = () => {
 
 onBeforeMount(() => {
   setTimeout(() => {
-    data.list = props.list;
+    data.list = props.list.xzjd;
-    data.list2 = props.list2;
+    data.ylfnrs = props.list.ylfnrs;
+    data.yyers = props.list.yyers;
+    // data.list2 = props.list2;
     // data.year = props.year;
-    console.log(1111,data.list, data.list2);
+    // console.log(222, data.list);
 
     // data.list.forEach((item) => {
     //   data.zgffrc.push((item.zgffrc / 10000).toFixed(0));

src/view/person/rwTable.vue

@@ -23,7 +23,7 @@
         <el-table-column prop="index" label="序号" width="50" />
         <el-table-column prop="xm" label="姓名" width="60" />
         <el-table-column prop="sfzhm" label="身份证" />
-        <el-table-column prop="jzzh" label="救助证号" />
+        <el-table-column prop="jzzh" label="低保证号" />
         <el-table-column prop="sjhm" label="联系电话" />
         <el-table-column prop="xzjd" label="乡镇(街道)" />
         <el-table-column prop="csq" label="村社" />
@@ -97,16 +97,16 @@
         style="width: 100%"
       >
         <el-table-column prop="index" label="序号" width="50" />
-        <el-table-column prop="ahap0016" label="申请人" width="70" />
+        <el-table-column prop="ahap0016" label="姓名" width="70" />
         <el-table-column prop="ahap0015" label="身份证" />
-        <el-table-column prop="ahax0003" label="救助证号" />
+        <el-table-column prop="ahax0003" label="低保证号" />
         <el-table-column prop="ahax0004" label="申请救助" />
         <el-table-column prop="ahax0011" label="银行账号" />
         <el-table-column prop="azdf0005" label="家庭总人口" width="50" />
-        <el-table-column prop="azdf0011" label="手机号码" />
+        <el-table-column prop="azdf0011" label="联系电话" />
         <el-table-column prop="bhax0003" label="用电户号" />
         <el-table-column prop="bhax0004" label="减免地址" />
-        <el-table-column prop="bhax0005" label="低保类别" />
+        <el-table-column prop="bhax0005" label="人员类别" />
         <el-table-column prop="bhax0008" label="致贫原因" />
         <el-table-column prop="bhax0009" label="是否申请电力减免" />
         <el-table-column prop="bhax0011" label="水费户号" />
@@ -166,7 +166,7 @@
         <el-table-column prop="index" label="序号" width="50" />
         <el-table-column prop="xm" label="姓名" width="60" />
         <el-table-column prop="sfzhm" label="身份证" />
-        <el-table-column prop="jzzh" label="救助证号" />
+        <el-table-column prop="jzzh" label="低保证号" />
         <el-table-column prop="sjhm" label="联系电话" />
         <el-table-column prop="xzjd" label="乡镇(街道)" />
         <el-table-column prop="csq" label="村社" />

src/view/table_gk/gk_infant.vue

@@ -107,10 +107,7 @@
             <i></i>
           </div>
         </div>
-        <eP4
+        <eP4 :list="data.ylfnyyefb"></eP4>
-          :list="data.ylfnyyefb.ylfnrs"
-          :list2="data.ylfnyyefb.xzjd"
-        ></eP4>
       </div>
     </div>
   </div>
@@ -131,8 +128,6 @@ const data = reactive({
   ylfnzb: {}, // 育龄妇女占比
   ylfnyyefb: {}, // 育龄妇女婴幼儿分布
 
-
-
   medicalInsurance: {}, //医疗保险
   lmb: {}, //两慢病
   mfyyqk: [