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

src/view/dialog/diaLogTab.vue

@@ -100,25 +100,21 @@
         </div>
 
         <div v-if="data.tab == '0'" class="pagePart">
-          <el-pagination
+          <div v-if="title == '高铁'">
-            background
+            <el-pagination
-            layout="prev, pager, next,total"
+              background
-            :page-size="pagination.pageSize"
+              layout="prev, pager, next,total"
-            :total="pagination.total"
+              :page-size="pagination.pageSize"
-            prev-text="上一页"
+              :total="pagination.total"
-            next-text="下一页"
+              prev-text="上一页"
-            @current-change="handle"
+              next-text="下一页"
-            v-model:current-page="pagination.currentPage"
+              @current-change="handle"
-          />
+              v-model:current-page="pagination.currentPage"
+            />
+          </div>
         </div>
-        <div
+        <div v-if="data.tab == '1'" style="width: 100%; height: 550px">
-          v-if="data.tab == '1'"
+          <tL :list1="data.list1" :year="data.year"></tL>
-          style="width: 100%; height: 550px;"
-        >
-          <tL
-            :list1="data.list1"
-            :year="data.year"
-          ></tL>
         </div>
       </div>
     </el-dialog>

src/view/dialog/echarts/echartLine.vue

@@ -92,7 +92,7 @@ const getOption = () => {
         },
         nameTextStyle: {
           // 设置Y轴名称的样式
-          fontSize: 14, // 这里设置字体大小为20
+          fontSize: 16, // 这里设置字体大小为20
         },
         axisLabel: {
           //坐标轴刻度标签的相关设置
@@ -177,6 +177,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },
@@ -199,6 +200,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },
@@ -251,6 +253,7 @@ onBeforeMount(() => {
     data.list1 = props.list1;
     data.list2 = props.list2;
     data.year = props.year;
+    console.log(data.list1,data.list2,666);
     data.bg = [];
     data.year.forEach(() => {
       data.bg.push(0);

src/view/dialog/echarts/tabLine.vue

@@ -133,6 +133,7 @@ const getOption = () => {
         label: {
           show: true,
           color: "#ffffff",
+          fontSize: 16,
           formatter: function (data) {
             return data.value;
           },

src/view/echarts_hygiene/eP5.vue

@@ -29,7 +29,7 @@ const getOption = () => {
   data.option = {
     tooltip: {
       trigger: "axis",
-      // formatter: "{b0}<br />{a0}:{c0} <br />{a1}:{c1} ",
+      formatter: "{b0}<br />{a0}:{c0}",
     },
 
     grid: {

src/view/echarts_hygiene/mfyyqk.vue

@@ -0,0 +1,468 @@
+<template>
+  <div ref="chart" style="width: 96%; height: 250px"></div>
+</template>
+
+<script setup>
+import { onMounted, onBeforeMount, reactive, ref } from "vue";
+// 局部引入echarts核心模块
+import * as echarts from "echarts";
+
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => {
+      return [];
+    },
+  },
+});
+
+const chart = ref(); // 创建DOM引用
+
+const colors = [
+  {
+    left: "rgba(14, 252, 255, .16)",
+    right: "rgba(14, 252, 255, .6)",
+    top: "rgba(14, 252, 255, 1)",
+    bottom: "rgba(14, 252, 255,  .46)",
+    front: "rgba(14, 252, 255, .66)",
+  },
+  {
+    left: "rgba(14, 252, 255, .16)",
+    right: "rgba(14, 252, 255, .6)",
+    top: "rgba(14, 252, 255, 1)",
+    bottom: "rgba(14, 252, 255,  .46)",
+    front: "rgba(14, 252, 255, .66)",
+  },
+  {
+    left: "rgba(14, 252, 255, .16)",
+    right: "rgba(14, 252, 255, .6)",
+    top: "rgba(14, 252, 255, 1)",
+    bottom: "rgba(14, 252, 255,  .46)",
+    front: "rgba(14, 252, 255, .66)",
+  },
+];
+const maxList = ref([]);
+// const valueList = [20, 53, 47, 65, 29, 11, 10];
+const data = reactive({
+  list: [],
+  option: {},
+  Max: 200,
+  valueList: [20, 53, 47, 65, 29, 11, 10],
+  xxname: [
+   
+  ],
+});
+// 注册5个面图形:左侧、前面、右面、上面、下面
+//c0:左下角，c1：右下角,c2:右上角，c3：左上角
+// 绘制左侧面-ok rgba(103, 180, 233, 0.04)
+const CubeLeft_1 = echarts.graphic.extendShape({
+  shape: {
+    x: 0,
+    y: 0,
+  },
+  buildPath: function (ctx, shape) {
+    // 会canvas的应该都能看得懂，shape是从custom传入的
+    const xAxisPoint = shape.xAxisPoint;
+    const c0 = [shape.x - 20, shape.y];
+    const c1 = [shape.x - 7, shape.y - 14];
+    const c2 = [xAxisPoint[0] - 7, xAxisPoint[1] - 14];
+    const c3 = [xAxisPoint[0] - 20, xAxisPoint[1]];
+    ctx
+      .moveTo(c0[0], c0[1])
+      .lineTo(c1[0], c1[1])
+      .lineTo(c2[0], c2[1])
+      .lineTo(c3[0], c3[1])
+      .closePath();
+  },
+});
+const CubeFront_1 = echarts.graphic.extendShape({
+  shape: {
+    x: 0,
+    y: 0,
+  },
+  buildPath: function (ctx, shape) {
+    // 会canvas的应该都能看得懂，shape是从custom传入的
+    const xAxisPoint = shape.xAxisPoint;
+    const c0 = [shape.x - 20, shape.y];
+    const c1 = [shape.x + 2, shape.y];
+    const c2 = [xAxisPoint[0] + 2, xAxisPoint[1]];
+    const c3 = [xAxisPoint[0] - 20, xAxisPoint[1]];
+    ctx
+      .moveTo(c0[0], c0[1])
+      .lineTo(c1[0], c1[1])
+      .lineTo(c2[0], c2[1])
+      .lineTo(c3[0], c3[1])
+      .closePath();
+  },
+});
+const CubeRight_1 = echarts.graphic.extendShape({
+  shape: {
+    x: 0,
+    y: 0,
+  },
+  buildPath: function (ctx, shape) {
+    const xAxisPoint = shape.xAxisPoint;
+    const c0 = [shape.x + 2, shape.y];
+    const c1 = [shape.x + 15, shape.y - 14];
+    const c2 = [xAxisPoint[0] + 15, xAxisPoint[1] - 14];
+    const c3 = [xAxisPoint[0] + 2, xAxisPoint[1]];
+    ctx
+      .moveTo(c0[0], c0[1])
+      .lineTo(c1[0], c1[1])
+      .lineTo(c2[0], c2[1])
+      .lineTo(c3[0], c3[1])
+      .closePath();
+  },
+});
+const CubeTop_1 = echarts.graphic.extendShape({
+  shape: {
+    x: 0,
+    y: 0,
+  },
+  buildPath: function (ctx, shape) {
+    const c0 = [shape.x - 20, shape.y];
+    const c1 = [shape.x + 2, shape.y];
+    const c2 = [shape.x + 15, shape.y - 14];
+    const c3 = [shape.x - 7, shape.y - 14];
+    ctx
+      .moveTo(c0[0], c0[1])
+      .lineTo(c1[0], c1[1])
+      .lineTo(c2[0], c2[1])
+      .lineTo(c3[0], c3[1])
+      .closePath();
+  },
+});
+const CubeBottom_1 = echarts.graphic.extendShape({
+  shape: {
+    x: 0,
+    y: 0,
+  },
+  buildPath: function (ctx, shape) {
+    // 会canvas的应该都能看得懂，shape是从custom传入的
+    const xAxisPoint = shape.xAxisPoint;
+
+    const c0 = [xAxisPoint[0] - 20, xAxisPoint[1]];
+    const c1 = [xAxisPoint[0] + 2, xAxisPoint[1]];
+    const c2 = [xAxisPoint[0] + 15, xAxisPoint[1] - 14];
+    const c3 = [xAxisPoint[0] - 7, xAxisPoint[1] - 14];
+
+    ctx
+      .moveTo(c0[0], c0[1])
+      .lineTo(c1[0], c1[1])
+      .lineTo(c2[0], c2[1])
+      .lineTo(c3[0], c3[1])
+      .closePath();
+  },
+});
+
+echarts.graphic.registerShape("CubeLeft_1", CubeLeft_1);
+echarts.graphic.registerShape("CubeFront_1", CubeFront_1);
+echarts.graphic.registerShape("CubeRight_1", CubeRight_1);
+echarts.graphic.registerShape("CubeTop_1", CubeTop_1);
+echarts.graphic.registerShape("CubeBottom_1", CubeBottom_1);
+const getOption = () => {
+  data.option = {
+    tooltip: {
+      trigger: "axis",
+      formatter: "{b0}:{c1}",
+    },
+    legend: {
+      data: ["两慢病免费用药情况"],
+      top: "4%",
+      right: "5%",
+      textStyle: {
+        fontSize: 16,
+        color: "#ffffff",
+      },
+    },
+    grid: {
+      left: 10,
+      right: 0,
+      bottom: 20,
+      top: 70,
+      containLabel: true,
+    },
+    xAxis: [
+      {
+        type: "category",
+        data: data.xxname,
+        axisLine: {
+          show: false,
+        },
+        offset: 10,
+
+        axisTick: {
+          show: false,
+        },
+        axisLabel: {
+          show: true,
+          color: "#fff",
+          fontSize: 16,
+          //   formatter: function (value) {
+          //     return value.length > 3 ? value.slice(0, 2) + "..." : value;
+          //   },
+        },
+      },
+      {
+        type: "category",
+        data: data.xxname,
+        axisLine: {
+          show: false,
+        },
+        offset: 10,
+
+        axisTick: {
+          show: false,
+        },
+        axisLabel: {
+          show: false,
+          color: "#fff",
+          fontSize: 16,
+        },
+      },
+    ],
+    yAxis: {
+      min: 0,
+      max: data.Max,
+      // interval: 100,
+      type: "value",
+      axisLine: {
+        show: true,
+        lineStyle: {
+          color: "rgba(255, 255, 255, .16)",
+        },
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          type: "dashed",
+          color: "rgba(255, 255, 255, .16)",
+        },
+      },
+      axisTick: {
+        show: false,
+      },
+      axisLabel: {
+        show: true,
+        fontSize: 16,
+        color: "#fff",
+      },
+    },
+    series: [
+      //阴影部分
+      {
+        type: "custom",
+        renderItem: function (params, api) {
+          // console.log(api);
+          const location = api.coord([api.value(0), api.value(1)]);
+          return {
+            type: "group",
+            children: [
+              {
+                type: "CubeBottom_1",
+                shape: {
+                  api,
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: "rgba(103, 180, 233, .16)",
+                },
+              },
+              {
+                type: "CubeLeft_1",
+                shape: {
+                  api,
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: "rgba(103, 180, 233, .04)",
+                },
+              },
+              {
+                type: "CubeFront_1",
+                shape: {
+                  api,
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: "rgba(103, 180, 233, .16)",
+                },
+              },
+              {
+                type: "CubeRight_1",
+                shape: {
+                  api,
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: "rgba(103, 180, 233, .08)",
+                },
+              },
+              {
+                type: "CubeTop_1",
+                shape: {
+                  api,
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: "rgba(103, 180, 233, .26)",
+                },
+              },
+            ],
+          };
+        },
+        data: maxList.value,
+      },
+      {
+        name:'两慢病免费用药情况',
+        type: "custom",
+        itemStyle: {
+          color:'#0efdff',
+        },
+        renderItem: (params, api) => {
+          const location = api.coord([api.value(0), api.value(1)]);
+
+          return {
+            type: "group",
+            children: [
+              {
+                type: "CubeBottom_1",
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: colors[`${params.dataIndexInside % 3}`]["bottom"],
+                },
+              },
+              {
+                type: "CubeLeft_1",
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: colors[`${params.dataIndexInside % 3}`]["left"],
+                },
+              },
+              {
+                type: "CubeFront_1",
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: colors[`${params.dataIndexInside % 3}`]["front"],
+                },
+              },
+              {
+                type: "CubeRight_1",
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: colors[`${params.dataIndexInside % 3}`]["right"],
+                },
+              },
+              {
+                type: "CubeTop_1",
+                shape: {
+                  api,
+                  xValue: api.value(0),
+                  yValue: api.value(1),
+                  x: location[0],
+                  y: location[1],
+                  xAxisPoint: api.coord([api.value(0), 0]),
+                },
+                style: {
+                  fill: colors[`${params.dataIndexInside % 3}`]["top"],
+                },
+              },
+            ],
+          };
+        },
+
+        data: data.valueList,
+      },
+      //顶部字体
+      {
+        type: "bar",
+        xAxisIndex: 1,
+        label: {
+          show: true,
+          fontSize: 18,
+          position: "top",
+          color: "#ffffff",
+          formatter: function (data) {
+            return data.value - 5;
+          },
+        },
+        itemStyle: {
+          color: "rgba(221, 242, 255, 0)",
+        },
+
+        data: data.valueList.map((item) => parseInt(item) + 5),
+        barWidth: 20,
+      },
+    ],
+  };
+};
+const setChart = () => {
+  var myChart = echarts.init(chart.value);
+  myChart.setOption(data.option);
+};
+const getMaxCeilingValue = (arr) => {
+  let max = Math.max(...arr); // 找到数组中的最大值
+  return Math.ceil(max / 100) * 100; // 将最大值向上取整到最近的100的倍数
+};
+const setChart1 = () => {
+  data.valueList = [];
+  data.xxname = [];
+  if (data.list.length !== 0) {
+    data.list.forEach((item) => {
+      data.xxname.push(item.name); //信息名
+      data.valueList.push(item.num); //信息数
+    });
+  }
+};
+
+onBeforeMount(() => {
+  setTimeout(() => {
+    data.list = props.list;
+    setChart1();
+    data.Max = getMaxCeilingValue(data.valueList);
+    maxList.value = data.valueList.map((item) => parseInt(data.Max) * 0.9); // 生成新的数组，将每个值都替换为 data.Max 的90%
+    getOption();
+    setChart();
+  }, 800);
+});
+</script>
+
+<style lang="scss" scoped></style>

src/view/echarts_hygiene/pie3.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: 260px"></div>
+  <div ref="chart" style="width: 100%; height: 280px"></div>
 </template>
 
 <script setup >
@@ -19,26 +19,25 @@ const props = defineProps({
 });
 const data = reactive({
   list: [],
-  wgcs: [100,140,230,100,130], 
+  zg: [3136,4345, 4964, 5846, 8076],
-  wgje: [150,100,200,14,100], 
+  cx: [3860,6980, 7585, 8858, 12737],
-  year: [2020,2021,2022,2023,2024],
+  year: [2019,2020, 2021, 2022, 2023],
   option: {},
-  bg: [0,0,0,0,0],
+  bg: [0, 0, 0, 0, 0],
 });
 
 const chart = ref(); // 创建DOM引用
 
 const getOption = () => {
   data.option = {
-    
     tooltip: {
       trigger: "axis",
-      formatter: "{b0}<br />{a1}:{c1}次 <br />{a3}:{c3}万元 ",
+      formatter: "{b0}<br />{a1}:{c1} <br />{a3}:{c3}",
     },
     legend: {
-      data: ["违规次数", "违规金额"],
+      data: ["职工医疗保险", "城乡医疗保险"],
       top: "6%",
-      right: "11%",
+      right: "5%",
       textStyle: {
         fontSize: 16,
         color: "#ffffff",
@@ -48,7 +47,7 @@ const getOption = () => {
       top: "23%",
       left: "1%",
       right: "10%",
-      bottom: "5%",
+      bottom: "0%",
       containLabel: true,
     },
     calculable: true,
@@ -124,9 +123,9 @@ const getOption = () => {
         name: "上部1",
         type: "pictorialBar",
         symbolPosition: "end",
-        data: data.wgcs,
+        data: data.zg,
         symbol: "diamond",
-        symbolOffset: ["-55%", "-50%"],
+        symbolOffset: ["-65%", "-50%"],
         symbolSize: [15, 10],
         itemStyle: {
           borderColor: "#2fffa4",
@@ -135,10 +134,10 @@ const getOption = () => {
       },
       {
         z: 1,
-        name: "违规次数",
+        name: "职工医疗保险",
         type: "bar",
         barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
-        data: data.wgcs,
+        data: data.zg,
         barWidth: "30%",
         label: {
           show: true,
@@ -166,7 +165,7 @@ const getOption = () => {
         name: "上部1",
         type: "pictorialBar",
         symbolPosition: "end",
-        data: data.wgje,
+        data: data.cx,
         symbol: "diamond",
         symbolOffset: ["62%", "-50%"],
         symbolSize: [15, 10],
@@ -177,18 +176,18 @@ const getOption = () => {
       },
       {
         z: 2,
-        name: "违规金额",
+        name: "城乡医疗保险",
         type: "bar",
         barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
-        data: data.wgje,
+        data: data.cx,
         barWidth: "30%",
         label: {
           show: true,
           color: "#ffffff",
           position: "top",
-          formatter: function (data) {
+          // formatter: function (data) {
-            return data.value  + "万";
+          //   return data.value  + "万";
-          },
+          // },
         },
         // itemStyle: {
         //   color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [
@@ -202,7 +201,7 @@ const getOption = () => {
         //     },
         //   ]),
         // },
-              itemStyle: {
+        itemStyle: {
           color: {
             type: "linear",
             x: 0,

src/view/echarts_hygiene/pie3_1.vue

@@ -0,0 +1,175 @@
+<template>
+  <div ref="chart" style="width: 100%; height: 280px"></div>
+</template>
+
+<script setup >
+import { onMounted, reactive, ref, onBeforeMount, defineProps } from "vue";
+// 局部引入echarts核心模块
+import * as echarts from "echarts";
+
+const props = defineProps({
+  list: {
+    type: Array,
+    default: () => [],
+  },
+  year: {
+    type: Array,
+    default: () => [],
+  },
+});
+const chart = ref(); // 创建DOM引用
+const data = reactive({
+  list1: [4167.703845,4736.436645, 5345.882021, 5761.09324, 7615.018745],
+  list2: [4160.310608,5668.346418, 6463.614862, 7169.546084, 9450.380778],
+  year: [2019,2020, 2021, 2022, 2023],
+  bg: [0, 0, 0, 0,0],
+  option: {},
+});
+
+const getOption = () => {
+  data.option = {
+    tooltip: {
+      trigger: "axis",
+      padding: [20, 10, 20, 10],
+      formatter: "{b0}<br />{a0}:{c0}万元<br />{a1}:{c1}万元 ",
+    },
+    legend: {
+      data: ["职工", "城乡"],
+      top: "6%",
+      right: "5%",
+      textStyle: {
+        fontSize: 16,
+        color: "#ffffff",
+      },
+    },
+    grid: {
+      top: "20%",
+      left: "1%",
+      right: "10%",
+      bottom: "3%",
+      containLabel: true,
+    },
+
+    xAxis: {
+      type: "category",
+      // boundaryGap: false,
+      data: data.year,
+      axisLabel: {
+        //坐标轴刻度标签的相关设置
+        textStyle: {
+          color: "#ffffff",
+          fontSize: 16,
+        },
+      },
+    },
+    yAxis: {
+      name: "金额/万元",
+      type: "value",
+      nameTextStyle: {
+        // 设置Y轴名称的样式
+        fontSize: 14, // 这里设置字体大小为20
+      },
+      splitLine: {
+        show: true,
+        lineStyle: {
+          color: "rgba(226, 226, 226, 0.3)",
+          width: 1,
+        },
+      },
+      axisLabel: {
+        //坐标轴刻度标签的相关设置
+        textStyle: {
+          color: "#ffffff",
+          fontSize: 16,
+        },
+      },
+      axisLine: {
+        //y轴线的颜色以及宽度
+        show: false,
+        lineStyle: {
+          color: "#ffffff",
+          fontSize: 16,
+          width: 1,
+          type: "solid",
+        },
+      },
+    },
+    series: [
+      {
+        name: "职工",
+        type: "line",
+        stack: "Total",
+        symbol: "emptyCircle",
+        smooth: true,
+        symbolSize: 10,
+        label: {
+          show: true,
+          color: "#ffffff",
+          position: "top",
+          fontSize: 14,
+          formatter: function (data) {
+            return data.value.toFixed(0);
+          },
+        },
+        itemStyle: {
+          borderColor: "#00FCFF",
+          borderWidth: 1,
+          color: "#00FCFF",
+        },
+        data: data.list1,
+      },
+      {
+        name: "城乡",
+        type: "line",
+        stack: "Total",
+        symbol: "emptyCircle",
+        smooth: true,
+        symbolSize: 10,
+        label: {
+          show: true,
+          color: "#ffffff",
+          position: "top",
+             fontSize: 14,
+          formatter: function (data) {
+            return data.value.toFixed(0);
+          },
+        },
+        itemStyle: {
+          borderColor: "#2468FF",
+          borderWidth: 1,
+          color: "#2468FF",
+        },
+        data: data.list2,
+      },
+      {
+        name: "背景",
+        type: "bar",
+        data: data.bg,
+        showBackground: true,
+        backgroundStyle: {
+          color: "rgba(180, 180, 180, 0.2)",
+        },
+      },
+    ],
+  };
+};
+const setChart = () => {
+  // Vue3中： 需要引入
+  var myChart = echarts.init(chart.value);
+
+  // 使用刚指定的配置项和数据显示图表。
+  myChart.setOption(data.option);
+};
+
+onBeforeMount(() => {
+  setTimeout(() => {
+    // data.list = props.list;
+    // data.year = props.year;
+    getOption();
+    setChart();
+  }, 600);
+});
+</script>
+
+<style scoped>
+</style>

src/view/echarts_hygiene/pie4.vue

@@ -19,22 +19,21 @@ const props = defineProps({
 });
 const chart = ref(); // 创建DOM引用
 const data = reactive({
-  list: [6280,5924,1824],
+  list: [6280, 5924, 1824],
-  year: [2022,2023,2024],
+  year: [2022, 2023, 2024],
-  bg:[0,0,0],
+  bg: [0, 0, 0],
   option: {},
 });
 
 const getOption = () => {
   data.option = {
-    
     tooltip: {
       trigger: "axis",
       padding: [20, 10, 20, 10],
       formatter: "{b0}<br />{a0}:{c0} ",
     },
     grid: {
-      top: "5%",
+      top: "15%",
       left: "1%",
       right: "10%",
       bottom: "3%",
@@ -62,7 +61,12 @@ const getOption = () => {
       },
     },
     yAxis: {
+      name: "人数/次",
       type: "value",
+      nameTextStyle: {
+        // 设置Y轴名称的样式
+        fontSize: 14, // 这里设置字体大小为20
+      },
       splitLine: {
         show: true,
         lineStyle: {
@@ -77,6 +81,16 @@ const getOption = () => {
           fontSize: 16,
         },
       },
+      axisLine: {
+        //y轴线的颜色以及宽度
+        show: false,
+        lineStyle: {
+          color: "#ffffff",
+          fontSize: 16,
+          width: 1,
+          type: "solid",
+        },
+      },
     },
     series: [
       {
@@ -84,12 +98,13 @@ const getOption = () => {
         type: "line",
         stack: "Total",
         symbol: "emptyCircle",
-
+        smooth: true,
         symbolSize: 10,
-              label: {
+        label: {
           show: true,
           color: "#ffffff",
-         position:'top',
+          position: "top",
+             fontSize: 14,
           formatter: function (data) {
             return data.value;
           },
@@ -127,7 +142,7 @@ const getOption = () => {
 
         data: data.list,
       },
-          {
+      {
         name: "背景",
         type: "bar",
         data: data.bg,

src/view/echarts_hygiene/tnb.vue

@@ -1,5 +1,5 @@
 <template>
-  <div ref="chart" style="width: 100%; height: 210px"></div>
+  <div ref="chart" style="width: 100%; height: 250px"></div>
 </template>
 
 <script setup >
@@ -19,6 +19,10 @@ const props = defineProps({
     type: Array,
     default: () => [],
   },
+  list2: {
+    type: Array,
+    default: () => [],
+  },
   year: {
     type: Array,
     default: () => [],
@@ -26,6 +30,7 @@ const props = defineProps({
 });
 const data = reactive({
   list: [],
+  list2: [],
   year: [],
   option: {},
   bg: [],
@@ -37,10 +42,19 @@ const getOption = () => {
     tooltip: {
       trigger: "axis",
       padding: [20, 10, 20, 10],
-      formatter: "{b0}<br />{a1}:{c1} ",
+      formatter: "{b0}<br />{a1}:{c1}<br />{a2}:{c2} ",
+    },
+    legend: {
+      data: ["糖尿病人数", "高血压人数"],
+      top: "6%",
+      right: "11%",
+      textStyle: {
+        fontSize: 16,
+        color: "#ffffff",
+      },
     },
     grid: {
-      top: "5%",
+      top: "25%",
       left: "1%",
       right: "10%",
       bottom: "3%",
@@ -99,7 +113,7 @@ const getOption = () => {
         type: "line",
         stack: "Total",
         symbol: "emptyCircle",
-
+        smooth: true,
         symbolSize: 10,
         itemStyle: {
           borderColor: "#E8FF00",
@@ -141,6 +155,53 @@ const getOption = () => {
         },
         data: data.list,
       },
+      {
+        name: "高血压人数",
+        type: "line",
+        stack: "Total",
+        symbol: "emptyCircle",
+        smooth: true,
+        symbolSize: 10,
+        itemStyle: {
+          borderColor: "#00FCFF",
+          borderWidth: 1,
+          color: "#00FCFF",
+        },
+        label: {
+          show: true,
+          color: "#ffffff",
+          position: "top",
+          formatter: function (data) {
+            return data.value;
+          },
+        },
+        areaStyle: {
+          color: "#F4F65B",
+          normal: {
+            //线性渐变，前4个参数分别是x0,y0,x2,y2(范围0~1);相当于图形包围盒中的百分比。如果最后一个参数是‘true’，则该四个值是绝对像素位置。
+            color: new echarts.graphic.LinearGradient(
+              0,
+              0,
+              0,
+              1,
+              [
+                {
+                  offset: 0,
+                  // color: 'RGBA(184, 204, 241, 1)'
+                  color: "rgba(0, 252, 255, 0.50)",
+                },
+                {
+                  offset: 1,
+                  color: "rgba(0, 252, 255, 0)",
+                },
+              ],
+              false
+            ),
+            shadowBlur: 0, //shadowBlur设图形阴影的模糊大小。配合shadowColor,shadowOffsetX/Y, 设置图形的阴影效果。
+          },
+        },
+        data: data.list2,
+      },
     ],
   };
 };
@@ -149,6 +210,7 @@ watch(
   (newValue, oldValue) => {
     setTimeout(() => {
       data.list = props.list;
+      data.list2 = props.list2;
       data.year = props.year;
       data.year.forEach(() => {
         data.bg.push(0);
@@ -170,6 +232,7 @@ const setChart = () => {
 onBeforeMount(() => {
   setTimeout(() => {
     data.list = props.list;
+    data.list2 = props.list2;
     data.year = props.year;
     data.year.forEach(() => {
       data.bg.push(0);

src/view/hygiene.vue

@@ -46,40 +46,68 @@
         ></ePie2>
         <div></div>
         <div class="left_1_xia">
-          <!-- <div class="left_1_xia_item">
+          <div class="left_1_xia_item" style="flex: 1.5">
+            <div class="choose">
+              <div
+                :class="
+                  tabYd[0].choose == '异地就医人数' ? 'choose_1' : 'choose_2'
+                "
+                @click="changeYd('异地就医人数')"
+              >
+                异地就医人数
+              </div>
+              <div
+                :class="
+                  tabYd[0].choose == '异地就医金额' ? 'choose_1' : 'choose_2'
+                "
+                @click="changeYd('异地就医金额')"
+              >
+                异地就医金额
+              </div>
+            </div>
             <ePie3
               :list="data.medicalInsurance.ffrc"
               :year="data.medicalInsurance.year"
+              v-if="showEchart && tabYd[0].choose == '异地就医人数'"
             ></ePie3>
-            <div class="historyimg">医保基金监管</div>
+            <ePie3_1
-          </div> -->
+              :list="data.medicalInsurance.ffrc"
-          <div class="left_1_xia_item">
+              :year="data.medicalInsurance.year"
-            <ePie4 :list="data.lmb.gxyrs" :year="data.lmb.year"></ePie4>
+              v-if="showEchart && tabYd[0].choose == '异地就医金额'"
+            ></ePie3_1>
+          </div>
+          <div class="left_1_xia_item" style="margin-top: 40px">
+            <ePie4
+              :list="data.lmb.gxyrs"
+              :year="data.lmb.year"
+              v-if="showEchart"
+            ></ePie4>
             <div class="historyimg">手工零星报销人数</div>
           </div>
         </div>
       </div>
 
       <div class="flex1" style="margin-top: 10px">
-        <div class="yd_title " :class="lmb=='糖尿病'? 'left_3': 'left_3_1'" @click="lmbqh">
+        <div
-          <!-- <div class="qh" @click="lmbqh">{{ lmb }}</div> -->
+          class="yd_title"
+          :class="lmb == '两慢病' ? 'left_3' : 'left_3_1'"
+          @click="lmbqh"
+        >
           <div class="animate-border">
             <i></i>
             <i></i>
           </div>
         </div>
-        <div class="sm_title_1" v-if="lmb != '糖尿病'"></div>
         <tnb
           :list="data.lmb.tnbrs"
+          :list2="data.lmb.gxyrs"
           :year="data.lmb.year"
-          v-if="showEchart && lmb != '糖尿病'"
+          v-if="showEchart && lmb == '两慢病'"
         ></tnb>
-        <div class="sm_title_2" v-if="lmb != '高血压'"></div>
+        <mfyyqk
-        <gxy
+          :list="data.mfyyqk"
-          :list="data.lmb.gxyrs"
+          v-if="showEchart && lmb == '免费用药情况'"
-          :year="data.lmb.year"
+        ></mfyyqk>
-          v-if="showEchart && lmb != '高血压'"
-        ></gxy>
       </div>
     </div>
     <div class="displayFlex center_bg">
@@ -233,6 +261,7 @@
 import ePie from "./echarts_hygiene/pie.vue";
 import ePie2 from "./echarts_hygiene/pie2.vue";
 import ePie3 from "./echarts_hygiene/pie3.vue";
+import ePie3_1 from "./echarts_hygiene/pie3_1.vue";
 import ePie4 from "./echarts_hygiene/pie4.vue";
 import eP2 from "./echarts_hygiene/eP2.vue";
 import eP3 from "./echarts_hygiene/eP3.vue";
@@ -242,30 +271,25 @@ import eP5 from "./echarts_hygiene/eP5.vue";
 import eP4 from "./echarts_hygiene/eP4.vue";
 import eP4_1 from "./echarts_hygiene/eP4_1.vue";
 import tnb from "./echarts_hygiene/tnb.vue";
-import gxy from "./echarts_hygiene/gxy.vue";
+import mfyyqk from "./echarts_hygiene/mfyyqk.vue";
 import { ref, reactive, onMounted, onBeforeMount } from "vue";
 import http from "@/utils/request.js";
-const lmb = ref("高血压");
+const lmb = ref("两慢病");
 const showEchart = ref(false);
 const leftchoose = ref({
   first: "1",
   second: "1",
   third: "1",
 });
-const lmbqh = () => {
-  if (lmb.value == "高血压") {
-    lmb.value = "糖尿病";
-  } else {
-    lmb.value = "高血压";
-  }
-  console.log(lmb.value);
-};
-const change = (name, index) => {
-  leftchoose.value[name] = index;
-};
 const data = reactive({
   medicalInsurance: {}, //医疗保险
   lmb: {}, //两慢病
+  mfyyqk: [
+    { name: "2020", num: 1399947.19 },
+    { name: "2021", num: 4968369.09 },
+    { name: "2022", num: 6452334.81 },
+    { name: "2023", num: 7301560.28 },
+  ], //免费用药情况
   mz: {}, //门诊住院
   jkda: {}, //健康档案
   jsbgl: [], //精神病管理
@@ -273,6 +297,25 @@ const data = reactive({
   jktj: {}, //65岁健康体检
   jkhd: [], //健康活动
 });
+const tabYd = ref([
+  {
+    choose: "异地就医人数",
+  },
+]);
+const changeYd = (name) => {
+  tabYd.value[0].choose = name;
+};
+const lmbqh = () => {
+  if (lmb.value == "两慢病") {
+    lmb.value = "免费用药情况";
+  } else {
+    lmb.value = "两慢病";
+  }
+};
+//
+const change = (name, index) => {
+  leftchoose.value[name] = index;
+};
 //自动滚动
 const mainRef = ref(null);
 let isAutoScrolling = true;
@@ -598,6 +641,46 @@ const getData = async () => {
     display: flex;
     flex-direction: column;
     align-items: center;
+    .choose {
+      width: 100%;
+      display: flex;
+      justify-content: center;
+      margin-top: 5px;
+      margin-bottom: 5px;
+      margin-left: 35px;
+      .choose_1 {
+        cursor: pointer;
+        width: 124px;
+        height: 42px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 16px;
+        color: #ffffff;
+        line-height: 22px;
+        margin-right: 15px;
+        background-image: url(@/assets/images/hygiene/choose.png);
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+      }
+      .choose_2 {
+        cursor: pointer;
+        width: 124px;
+        height: 42px;
+        display: flex;
+        align-items: center;
+        justify-content: center;
+        font-weight: 500;
+        font-size: 16px;
+        color: #ffffff;
+        line-height: 22px;
+        margin-right: 15px;
+        background-image: url(@/assets/images/hygiene/noChoose.png);
+        background-repeat: no-repeat;
+        background-size: 100% 100%;
+      }
+    }
     .historyimg {
       margin-top: 10px;
       padding: 0 25px;
@@ -618,13 +701,13 @@ const getData = async () => {
 // }
 
 .left_3 {
-  background-image: url(@/assets/images/hygiene/gxy_new.png);
+  background-image: url(@/assets/images/hygiene/lmb.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
   cursor: pointer;
 }
 .left_3_1 {
-  background-image: url(@/assets/images/hygiene/tnb_new.png);
+  background-image: url(@/assets/images/hygiene/mfyyqk.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
   cursor: pointer;
@@ -1205,7 +1288,7 @@ const getData = async () => {
   width: 196px;
   height: 45px;
   margin-left: 175px;
-  background-image: url(@/assets/images/hygiene/tnbrs.png);
+  // background-image: url(@/assets/images/hygiene/tnbrs.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
   margin-top: 15px;
@@ -1215,7 +1298,7 @@ const getData = async () => {
   width: 196px;
   height: 45px;
   margin-left: 175px;
-  background-image: url(@/assets/images/hygiene/gxyrs.png);
+  // background-image: url(@/assets/images/hygiene/gxyrs.png);
   background-repeat: no-repeat;
   background-size: 100% 100%;
   margin-top: 15px;

src/view/sy.vue

@@ -569,16 +569,18 @@
         <div>
           {{ currentData.pxkssj.slice(0, 4) }}-{{
             currentData.pxkssj.slice(4, 6)
-          }}-{{ currentData.pxkssj.slice(6, 8) }}
+          }}-{{ currentData.pxkssj.slice(6, 8) }}/{{
+            currentData.pxjssj.slice(4, 6)
+          }}-{{ currentData.pxjssj.slice(6, 8) }}
         </div>
       </template>
-      <template #pxjssj="{ currentCol, currentData }">
+      <!-- <template #pxjssj="{ currentCol, currentData }">
         <div>
           {{ currentData.pxjssj.slice(0, 4) }}-{{
             currentData.pxjssj.slice(4, 6)
           }}-{{ currentData.pxjssj.slice(6, 8) }}
         </div>
-      </template>
+      </template> -->
     </Dialog>
     <DialogEc
       :dialogShowEc="dialogShowEc"
@@ -669,15 +671,20 @@ const columnss = reactive({
       property: "pxbmc",
     },
     {
-      label: "培训开始时间",
+      label: "培训时间",
       property: "pxkssj",
       type: "slot",
     },
-    {
+    // {
-      label: "培训结束时间",
+    //   label: "培训开始时间",
-      property: "pxjssj",
+    //   property: "pxkssj",
-      type: "slot",
+    //   type: "slot",
-    },
+    // },
+    // {
+    //   label: "培训结束时间",
+    //   property: "pxjssj",
+    //   type: "slot",
+    // },
   ],
   就业见习服务: [
     {
@@ -1047,7 +1054,7 @@ const data = reactive({
     {
       name: "公共自行车",
       key1: "骑行次数",
-      key1_value: "1172491",
+      key1_value: "117231",
       key2: "骑行时长",
       key2_value: "1283h",
       img: ggjtimg,
@@ -1352,8 +1359,10 @@ const showEc = (val) => {
   dataEc.list2 = [];
   switch (val) {
     case "公共自行车":
-      dataEc.list1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 122];
+      dataEc.list1 = [63, 145, 123, 158, 76, 133, 95, 178, 154, 112, 67, 142]; // 骑行次数
-      dataEc.list2 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 112];
+      dataEc.list2 = [
+        3150, 6550, 4905, 7430, 3625, 5985, 3990, 8020, 6725, 5235, 3520, 6490,
+      ]; // 骑行时长（分钟）
       dataEc.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dialogShowEc.value = true;
       break;
@@ -1361,7 +1370,7 @@ const showEc = (val) => {
       http.get("/api/ggfwyth/ddcList").then((res) => {
         if (res.code == 200) {
           dataEc.list1 = res.data.qxcs;
-          dataEc.list2 = res.data.qxsc;
+          dataEc.list2 = res.data.qxsc.map((str) => parseInt(str));
           dataEc.times = res.data.times;
           dialogShowEc.value = true;
         }
@@ -1378,46 +1387,184 @@ const showTab = (val) => {
   dataTab.data = [];
   switch (val) {
     case "公共汽车":
-      dataTab.list1 = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 122];
+      dataTab.list1 = [12, 15, 18, 22, 25, 30, 28, 35, 32, 40, 45, 50];
       dataTab.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dataTab.data = [
-        {
+      {
-          bc: "G13214",
+            cc: "201A",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—湖镇车站",
-          time: "2024-06-11",
+            dd: "06:56:00.000",
+            kd: "07:10:00.000",
+            ts: "14"
         },
         {
-          bc: "G13214",
+            cc: "201B",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—湖镇车站",
-          time: "2024-06-11",
+            dd: "07:30:00.000",
+            kd: "07:45:00.000",
+            ts: "15"
         },
         {
-          bc: "G13214",
+            cc: "203",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—地圩",
-          time: "2024-06-11",
+            dd: "08:00:00.000",
+            kd: "08:20:00.000",
+            ts: "20"
         },
+        {
+            cc: "301",
+            qqz: "湖镇车站—十里坪",
+            dd: "08:45:00.000",
+            kd: "09:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "302",
+            qqz: "湖镇车站—大坪",
+            dd: "09:15:00.000",
+            kd: "09:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "307",
+            qqz: "湖镇车站—蒲塘",
+            dd: "10:00:00.000",
+            kd: "10:20:00.000",
+            ts: "20"
+        },
+        {
+            cc: "308",
+            qqz: "湖镇车站—童村",
+            dd: "10:45:00.000",
+            kd: "11:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "304",
+            qqz: "湖镇车站—青塘坞",
+            dd: "11:15:00.000",
+            kd: "11:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "206",
+            qqz: "龙游公交中心—上堤",
+            dd: "12:00:00.000",
+            kd: "12:20:00.000",
+            ts: "20"
+        },
+        {
+            cc: "205",
+            qqz: "龙游公交中心—源头",
+            dd: "12:45:00.000",
+            kd: "13:00:00.000",
+            ts: "15"
+        },
+        {
+            cc: "305",
+            qqz: "湖镇车站—上堤",
+            dd: "13:15:00.000",
+            kd: "13:30:00.000",
+            ts: "15"
+        },
+        {
+            cc: "306",
+            qqz: "湖镇车站—源头",
+            dd: "14:00:00.000",
+            kd: "14:20:00.000",
+            ts: "20"
+        }
       ];
       dialogShowTab.value = true;
       break;
     case "长途汽车":
-      dataTab.list1 = [11, 21, 31, 4, 51, 6, 7, 81, 91, 10, 11, 122];
+      dataTab.list1 = [10, 12, 15, 20, 25, 18, 22, 30, 28, 35, 40, 45];
       dataTab.times = [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12];
       dataTab.data = [
-        {
+      {
-          bc: "D6456",
+            cc: "303",
-          sfzd: "A-B",
+            qqz: "湖镇车站—马家",
-          time: "2024-06-11",
+            dd: "08:00:00.000",
+            kd: "08:30:00.000",
+            ts: "30"
         },
         {
-          bc: "D6456",
+            cc: "202",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—周家",
-          time: "2024-06-11",
+            dd: "09:15:00.000",
+            kd: "09:45:00.000",
+            ts: "30"
         },
         {
-          bc: "D6456",
+            cc: "204",
-          sfzd: "A-B",
+            qqz: "龙游公交中心—社阳",
-          time: "2024-06-11",
+            dd: "10:30:00.000",
+            kd: "11:00:00.000",
+            ts: "30"
         },
+        {
+            cc: "221",
+            qqz: "龙游公交中心—溪口车站",
+            dd: "11:45:00.000",
+            kd: "12:15:00.000",
+            ts: "30"
+        },
+        {
+            cc: "222",
+            qqz: "龙游公交中心—官潭—溪口车站",
+            dd: "13:00:00.000",
+            kd: "13:30:00.000",
+            ts: "30"
+        },
+        {
+            cc: "325",
+            qqz: "溪口车站—大街",
+            dd: "14:15:00.000",
+            kd: "14:45:00.000",
+            ts: "30"
+        },
+        {
+            cc: "322",
+            qqz: "溪口车站—坑头",
+            dd: "15:30:00.000",
+            kd: "16:00:00.000",
+            ts: "30"
+        },
+        {
+            cc: "326",
+            qqz: "大街—方坦—横坑—岭脚",
+            dd: "16:45:00.000",
+            kd: "17:15:00.000",
+            ts: "30"
+        },
+        {
+            cc: "328",
+            qqz: "溪口车站—合坑源",
+            dd: "18:00:00.000",
+            kd: "18:30:00.000",
+            ts: "30"
+        },
+        {
+            cc: "329",
+            qqz: "溪口车站—际上",
+            dd: "19:15:00.000",
+            kd: "19:45:00.000",
+            ts: "30"
+        },
+        {
+            cc: "330",
+            qqz: "溪口车站—毛连里",
+            dd: "20:30:00.000",
+            kd: "21:00:00.000",
+            ts: "30"
+        },
+        {
+            cc: "327",
+            qqz: "长山桥—后山",
+            dd: "21:45:00.000",
+            kd: "22:15:00.000",
+            ts: "30"
+        }
       ];
       dialogShowTab.value = true;
       break;