From 575acb8356c9f6b2fe5a45f359739237b17624ff Mon Sep 17 00:00:00 2001
From: duanxiaohai <1812246227@qq.com>
Date: Fri, 28 Jun 2024 11:08:54 +0800
Subject: [PATCH] gx

---
 src/assets/images/yl/ylnlbj.png     | Bin 0 -> 1686 bytes
 src/assets/images/yl/ylnln.png      | Bin 0 -> 3559 bytes
 src/assets/images/yl/ylnlv.png      | Bin 0 -> 3506 bytes
 src/view/echarts_education/pie5.vue |   2 +-
 src/view/echarts_yl/pie3d.vue       | 101 ++++++-------
 src/view/echarts_yl/ylSMFW.vue      |   2 +-
 src/view/education.vue              |   4 +-
 src/view/sy.vue                     |  19 +--
 src/view/yl.vue                     | 221 ++++++++++++++++++++++++++--
 9 files changed, 273 insertions(+), 76 deletions(-)
 create mode 100644 src/assets/images/yl/ylnlbj.png
 create mode 100644 src/assets/images/yl/ylnln.png
 create mode 100644 src/assets/images/yl/ylnlv.png

diff --git a/src/assets/images/yl/ylnlbj.png b/src/assets/images/yl/ylnlbj.png
new file mode 100644
index 0000000000000000000000000000000000000000..6f2016585f349f84e23d7d4589b868a4f967266d
GIT binary patch
literal 1686
zcmeAS@N?(olHy`uVBq!ia0y~yVEhGSr*N<V$vnPK=YSMrage(c!@6@aFBurv0z6$D
zLn`9l-rkrsB~ya+!S~sQk{6t|bWC-Xx|uC_Mf+mIZ0W%DM>?9qlM|P=CM`7RG`?>X
zSavkY@mcGfN1o;e|4%-w>^^L8X2tz~a{FhlzPc&z+OE8u>7@qSw*L5Q8z-#b(7?dR
zB*|19c>Cxwy{ypq>$87-dh{>i|E-)qzmv`t7KOQA7c13Xyi1IQLjb7wz<jQn``4bQ
z^S@5+H7q~>PvV#5@yX$(-xIEUwdeg(#{^cT;Qb)!+V<!Cum0w}(Qp6v<msNrlWVR`
z+@c7!>^DbD-KKgIyPmt{pW0_z-BUla8Dh4>yaPWs-Rr%){d2~=>u>i|NeMz+_nV{V
z@Gld;^UprYY`vv^0-<`wRyqIp^VM}u)5~RgA<o;!w0r)&-u>}s_kZL4WWxw{&jihc
z7sl@wiGq0<f(Bo7dz`?k9hNmLJin(q3~c=Z*8>-}8*o9~IFqT(?z3JL*a3}VjL!ED
zX|w>tiG?GDOXAm=-5IW+P-BT=;i=_bEHG-xXmE|DE`}kPPZDfuZQu9i>PB5^0Tph*
zJZ%Un2@9*t`k$`|_0e_(7ZX6AH5z8y`rSXbxH4{gv`{Nt?c)u0y~p#Py($PkZn#zi
zQgi@Ig>%!t=DnHZ7kADYSaz;f4dsB8Lj_Nn?r;D4^XB4@4~t%8pZoYE^scQ$>EBbc
zHNjT1aJ*41FnoRcGyB(l$7a~K{d<06{+z25{l8V;teOEXd}3A}c&h%h{cEB5r`<~b
zdH<e|+Wr1b_~~7duXk;Xz1BGYUhK=ge~Q7y(TDxOg7AW_S!v+vU%T#InJ)hQ_^<2i
b{}?~>T5rlc+E)pzXc#<Q{an^LB{Ts5B7<5>

literal 0
HcmV?d00001

diff --git a/src/assets/images/yl/ylnln.png b/src/assets/images/yl/ylnln.png
new file mode 100644
index 0000000000000000000000000000000000000000..6277faf9ec6499e4970b717d38b7584f87aea1f3
GIT binary patch
literal 3559
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/yl/ylnlv.png b/src/assets/images/yl/ylnlv.png
new file mode 100644
index 0000000000000000000000000000000000000000..7733b1c8c644f7fc8ad53329d7edb1852e864aab
GIT binary patch
literal 3506
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

literal 0
HcmV?d00001

diff --git a/src/view/echarts_education/pie5.vue b/src/view/echarts_education/pie5.vue
index 4a5ab85..7668c8e 100644
--- a/src/view/echarts_education/pie5.vue
+++ b/src/view/echarts_education/pie5.vue
@@ -9,7 +9,7 @@ import * as echarts from "echarts";
 
 const props = defineProps({
   list: {
-    type: Array,
+    type: Object,
     default: () => {
       return [];
     },
diff --git a/src/view/echarts_yl/pie3d.vue b/src/view/echarts_yl/pie3d.vue
index dcf277f..2f218a5 100644
--- a/src/view/echarts_yl/pie3d.vue
+++ b/src/view/echarts_yl/pie3d.vue
@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: 250px"></div>
+  <div ref="chart" style="width: 40%; height: 200px"></div>
 </template>
 
 <script setup>
@@ -17,7 +17,7 @@ import "echarts-gl";
 
 const props = defineProps({
   list: {
-    type: Array,
+    type: Object,
     default: () => {
       return [];
     },
@@ -223,53 +223,53 @@ function getPie3D(pieData, internalDiameterRatio) {
   let option = {
     //animation: false,
     //图例组件
-    legend: {
-      data: legendData,
-      color: [
-        "#8FD7FC",
-        "#466BE7",
-        "#F4BB29",
-        "#49C384",
-        "#8FD7FC",
-        "#466BE7",
-        "#F4BB29",
-        "#49C384",
-      ],
-      width: "40%",
-      //图例列表的布局朝向。
-      orient: "vertical",
-      right: 20,
-      top: "center",
-      //图例文字每项之间的间隔
-      itemGap: 10,
-      show: true,
-      icon: "rect",
-      itemHeight: 10,
-      itemWidth: 25,
-      textStyle: {
-        //图例字体大小
-        fontSize: 16,
-        color: "#FFFFFF",
-        lineHeight: 20,
-      },
+    // legend: {
+    //   data: legendData,
+    //   color: [
+    //     "#8FD7FC",
+    //     "#466BE7",
+    //     "#F4BB29",
+    //     "#49C384",
+    //     "#8FD7FC",
+    //     "#466BE7",
+    //     "#F4BB29",
+    //     "#49C384",
+    //   ],
+    //   width: "40%",
+    //   //图例列表的布局朝向。
+    //   orient: "vertical",
+    //   right: 20,
+    //   top: "center",
+    //   //图例文字每项之间的间隔
+    //   itemGap: 10,
+    //   show: true,
+    //   icon: "rect",
+    //   itemHeight: 10,
+    //   itemWidth: 25,
+    //   textStyle: {
+    //     //图例字体大小
+    //     fontSize: 16,
+    //     color: "#FFFFFF",
+    //     lineHeight: 20,
+    //   },
 
-      //格式化图例文本
-      formatter: function (name) {
-        var target;
-        for (var i = 0, l = pieData.length; i < l; i++) {
-          if (pieData[i].name == name) {
-            target = pieData[i].value;
-          }
-        }
-        if (name == "91-100岁") {
-          return `   ${name}           ${target} 人`;
-        } else if (name == "100岁以上") {
-          return `   ${name}          ${target} 人`;
-        } else {
-          return `   ${name}             ${target} 人`;
-        }
-      },
-    },
+    //   //格式化图例文本
+    //   formatter: function (name) {
+    //     var target;
+    //     for (var i = 0, l = pieData.length; i < l; i++) {
+    //       if (pieData[i].name == name) {
+    //         target = pieData[i].value;
+    //       }
+    //     }
+    //     if (name == "91-100岁") {
+    //       return `   ${name}   ${target}   ${target}  ${target} `;
+    //     } else if (name == "100岁以上") {
+    //       return `   ${name}   ${target}   ${target}  ${target} `;
+    //     } else {
+    //       return `   ${name}     ${target}   ${target}  ${target} `;
+    //     }
+    //   },
+    // },
     //移动上去提示的文本内容
     tooltip: {
       backgroundColor: "rgba(18, 55, 85, 0.8);",
@@ -306,10 +306,10 @@ function getPie3D(pieData, internalDiameterRatio) {
         zoomSensitivity: 0, //设置为0无法缩放
         panSensitivity: 0, //设置为0无法平移
         alpha: 25, //角度(这个很重要 调节角度的)
-        distance: 100, //调整视角到主体的距离，类似调整zoom(这是整体大小)
+        distance: 120, //调整视角到主体的距离，类似调整zoom(这是整体大小)
       },
       top: "-30",
-      left: "-120",
+      left: "0",
       width: "100%",
       show: false,
       boxHeight: 20,
@@ -548,6 +548,7 @@ function bindListen(myChart) {
 //     myChart.resize();
 //   });
 // });
+
 const setChart = () => {
   var myChart = echarts.init(chart.value);
   myChart.setOption(data.option);
diff --git a/src/view/echarts_yl/ylSMFW.vue b/src/view/echarts_yl/ylSMFW.vue
index 705770c..a2502f4 100644
--- a/src/view/echarts_yl/ylSMFW.vue
+++ b/src/view/echarts_yl/ylSMFW.vue
@@ -18,7 +18,7 @@ import * as echarts from "echarts";
 
 const props = defineProps({
   list: {
-    type: Array,
+    type: Object,
     default: () => {
       return [];
     },
diff --git a/src/view/education.vue b/src/view/education.vue
index 0be4248..44eb540 100644
--- a/src/view/education.vue
+++ b/src/view/education.vue
@@ -327,9 +327,9 @@ import edxs from "./echarts_education/edXS.vue";
 import edxs1 from "./echarts_education/edXS1.vue";
 import edxs2 from "./echarts_education/edXS2.vue";
 import edxs3 from "./echarts_education/edXS3.vue";
+import edie5 from "./echarts_education/pie5.vue";
 
 import edie from "./echarts_education/pie.vue";
-import edie5 from "./echarts_education/pie5.vue";
 import edCSR from "./echarts_education/edCSR.vue";
 import edXX from "./echarts_education/edXX.vue";
 import ePie1 from "./echarts_education/pie1.vue";
@@ -572,7 +572,7 @@ const data = reactive({
     },
   ],
   xxgk: {},
-  xzncjszcsl: [],
+  xzncjszcsl: {},
   xzncxxsl: [[], []],
   zzxm: [],
   schoolData: [
diff --git a/src/view/sy.vue b/src/view/sy.vue
index c73813e..e6ae4a7 100644
--- a/src/view/sy.vue
+++ b/src/view/sy.vue
@@ -836,7 +836,7 @@ const dataTab = reactive({
       property: "qqz",
     },
     {
-      label: "始发时间",
+      label: "到达龙游站时间",
       type: "slot",
       property: "dd",
     },
@@ -1278,7 +1278,7 @@ const getTable = (url, currentPage) => {
     .get(`${url}?page=${currentPage}&size=${pagination.pageSize}`)
     .then((res) => {
       if (res.code == 200) {
-        console.log(res,'表格数据');
+        console.log(res, "表格数据");
         tableType.data = res.data;
         pagination.total = res.count;
         dialogShow.value = true;
@@ -1431,7 +1431,7 @@ const colorList = [
   { color2: "rgba(76,174,254,1)" },
 ];
 const bt = computed(() => {
-  return (index)=> {
+  return (index) => {
     let str = `--i:${colorList[index].color2}`;
     return str;
   };
@@ -1498,6 +1498,8 @@ const autoScroll = () => {
   if (!isAutoScrolling) return;
 
   const mainEl = mainRef.value;
+  if (!mainEl) return;
+
   mainEl.scrollTop += 1; // 每次滚动的距离
 
   if (mainEl.scrollTop + 1 >= mainEl.scrollHeight - mainEl.clientHeight) {
@@ -1511,10 +1513,9 @@ const autoScroll = () => {
 };
 onBeforeMount(async () => {
   getData();
-  setTimeout(()=>{
-startAutoScroll();
-  },1000)
-  
+  setTimeout(() => {
+    startAutoScroll();
+  }, 1000);
 });
 </script>
 
@@ -1696,9 +1697,9 @@ startAutoScroll();
     right: 5px;
     top: 1px;
   }
-  .gTitle{
+  .gTitle {
     position: absolute;
-    color: #ACD1F1;
+    color: #acd1f1;
     height: 100%;
     display: flex;
     align-items: center;
diff --git a/src/view/yl.vue b/src/view/yl.vue
index f1fe402..02d6a3c 100644
--- a/src/view/yl.vue
+++ b/src/view/yl.vue
@@ -157,7 +157,41 @@
           <div class="mtpText1">{{ data.oldAgeTotal }}</div>
           <div class="mtpText2">{{ data.oldAgePercent }}%</div>
         </div>
-        <ePie3d v-if="showR" :list="data.rkgk"></ePie3d>
+        <div class="ageGroup">
+          <div class="ageGroupBj">
+            <div class="Gendern"></div>
+            <div class="Male">男性总人数</div>
+            <div class="ageGroupNum">2307303</div>
+          </div>
+          <div class="ageGroupBj">
+            <div class="Genderv"></div>
+            <div class="Male">女性总人数</div>
+            <div class="ageGroupNum">230730</div>
+          </div>
+        </div>
+        <div class="ageGroupone">
+          <ePie3d v-if="showR" :list="data.rkgk"></ePie3d>
+          <div class="btList" ref="mainRef">
+            <div class="btListding">
+              <span>各年龄段</span>
+              <span>总数/人</span>
+              <span>男性人数/人</span>
+              <span>女性人数/人</span>
+            </div>
+            <div class="btList_item" v-for="(item, index) in btList">
+              <div class="btList_item_color" :style="bt(index)"></div>
+              <div class="btList_item_value">
+                {{ item.name }}
+                <div
+                  class="btList_item_value1"
+                  v-for="(item1, index) in item.value"
+                >
+                  {{ item1 }}
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
       </div>
       <div class="flex1">
         <div class="yd_title familyPlanning">
@@ -204,7 +238,11 @@
           <div
             class="history1"
             @click="
-              showDialog('居家养老服务照料中心', '/api/ggfwyth/yljgzlzxList','num')
+              showDialog(
+                '居家养老服务照料中心',
+                '/api/ggfwyth/yljgzlzxList',
+                'num'
+              )
             "
           >
             <div>
@@ -291,7 +329,7 @@ import ylJHSY from "./echarts_yl/ylJHSY.vue";
 import ylSMFW from "./echarts_yl/ylSMFW.vue";
 import ylXZZC from "./echarts_yl/ylXZZC.vue";
 import Dialog from "./dialog/dialog.vue";
-import { ref, onMounted, onBeforeMount, reactive } from "vue";
+import { ref, onMounted, onBeforeMount, reactive, computed } from "vue";
 import http from "@/utils/request.js";
 const leftchoose = ref({
   first: "1",
@@ -354,7 +392,7 @@ const yl_column = ref([
   {
     label: "机构名称",
     property: "mc",
-    align: 'left'
+    align: "left",
   },
   {
     label: "机构地址",
@@ -390,15 +428,15 @@ const chooseVillage = (village) => {
   tableType.url = "/api/ggfwyth/zcxxList";
   getTownDetail();
 };
-const showDialog = (title, url,coulumn) => {
+const showDialog = (title, url, coulumn) => {
   tableType.title = title;
   tableType.url = url;
-  if(coulumn=='num'){
+  if (coulumn == "num") {
     tableType.columns = yl_column2.value;
-  }else{
-     tableType.columns = yl_column.value;
+  } else {
+    tableType.columns = yl_column.value;
   }
- 
+
   getTable(url, pagination.currentPage);
 };
 //获取表格数据
@@ -440,6 +478,48 @@ const getTownDetail = () => {
     }
   });
 };
+const btList = ref([
+  {
+    name: "60-70岁",
+    value: ["17824", "17824", "17824"],
+  },
+  {
+    name: "70-80岁",
+    value: ["18742", "18742", "18742"],
+  },
+  {
+    name: "80-90岁",
+    value: ["3407", "3407", "3407"],
+  },
+  {
+    name: "90-100岁",
+    value: ["144", "144", "144"],
+  },
+  {
+    name: "100岁以上",
+    value: ["10", "10", "10"],
+  },
+]);
+//扇形图颜色数据
+const colorList = [
+  { color2: "#FFE35F" },
+  { color2: "#0081FF" },
+  { color2: "#8ABEDB" },
+  { color2: "#25B9C8" },
+  { color2: "#30EB92" },
+  { color2: "rgba(254,178,128,1)" },
+  { color2: "rgba(151,176,255,1)" },
+  { color2: "rgba(164,151,255,1)" },
+  { color2: "rgba(159,110,254,1)" },
+  { color2: "rgba(180,143,241,1)" },
+  { color2: "rgba(76,174,254,1)" },
+];
+const bt = computed(() => {
+  return (index) => {
+    let str = `--i:${colorList[index].color2}`;
+    return str;
+  };
+});
 const data = reactive({
   leftTop1: [],
   leftTop2: [],
@@ -458,7 +538,7 @@ const data = reactive({
   leftbottomYear: [],
   oldAgePercent: "",
   oldAgeTotal: "",
-  rkgk: [],
+  rkgk: {},
   centerBottom1: [],
   centerBottom2: [],
   centerBottomYear: [],
@@ -477,7 +557,6 @@ onBeforeMount(() => {
 const getData = () => {
   http.get("/api/ggfwyth/yl").then((res) => {
     if (res.code == 200) {
-      console.log(res.data, "养老");
       // 养老保险
       // 人次
       res.data.endowmentInsurance.ffrc.forEach((element) => {
@@ -1136,6 +1215,7 @@ const getData = () => {
   background-size: 100% 100%;
   margin: 4px auto;
   margin-top: 10px;
+  // margin-bottom: 14px;
   position: relative;
 
   .moveImg {
@@ -1177,8 +1257,8 @@ const getData = () => {
     background-repeat: no-repeat;
     background-size: 100% 100%;
     position: absolute;
-    top: 358px;
-    left: 84px;
+    top: 350px;
+    left: 20px;
   }
 
   .mtpText1 {
@@ -1207,6 +1287,121 @@ const getData = () => {
     color: #ffffff;
   }
 }
+.ageGroup {
+  display: flex;
+  justify-content: space-between;
+  width: 530px;
+  height: 50px;
+  margin-left: 10px;
+
+  .ageGroupBj {
+    width: 253px;
+    height: 50px;
+    background-image: url(@/assets/images/yl/ylnlbj.png);
+    background-repeat: no-repeat;
+    background-size: 100% 100%;
+    display: flex;
+    align-items: center;
+    .Gendern {
+      width: 34px;
+      height: 34px;
+      background-image: url(@/assets/images/yl/ylnln.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      margin-right: 12px;
+      margin-left: 14px;
+    }
+    .Genderv {
+      width: 34px;
+      height: 34px;
+      background-image: url(@/assets/images/yl/ylnlv.png);
+      background-repeat: no-repeat;
+      background-size: 100% 100%;
+      margin-right: 12px;
+      margin-left: 14px;
+    }
+    .Male {
+      font-family: PingFangSC, PingFang SC;
+      font-weight: 400;
+      font-size: 16px;
+      color: #ffffff;
+      letter-spacing: 2px;
+      text-align: left;
+      font-style: normal;
+      margin-right: 18px;
+    }
+
+    .ageGroupNum {
+      font-size: 16px;
+      font-weight: 400;
+      color: #00fff0;
+      letter-spacing: 1px;
+      text-align: right;
+      font-style: normal;
+      font-family: TCloudNumber, TCloudNumber;
+    }
+  }
+}
+.ageGroupone {
+  display: flex;
+  .btList {
+    width: 70%;
+    height: 200px;
+    margin-top: 10px;
+    .btListding {
+      font-weight: 500;
+      font-size: 14px;
+      color: #ffffff;
+      text-align: left;
+      font-style: normal;
+      font-family: PingFangSC, PingFang SC;
+      text-shadow: 0px 0px 4px rgba(255, 255, 255, 0.65);
+      display: flex;
+      align-items: center;
+      justify-content: flex-end;
+      span {
+        width: 20%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+      span:nth-child(3) {
+        width: 25%;
+      }
+      span:nth-child(4) {
+        width: 25%;
+      }
+    }
+    .btList_item {
+      display: flex;
+      align-items: center;
+      box-sizing: border-box;
+      width: 100%;
+      padding: 5px;
+
+      .btList_item_color {
+        width: 22px;
+        height: 8px;
+        background-color: var(--i);
+        border-radius: 6px;
+        margin-right: 17px;
+      }
+      .btList_item_value {
+        width: 100%;
+        font-size: 18px;
+        color: #ffffff;
+        display: flex;
+        justify-content: space-between;
+      }
+      .btList_item_value1 {
+        width: 24%;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+      }
+    }
+  }
+}
 
 :deep(.el-table) {
   background: rgba(32, 64, 115, 1);