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

src/view/echarts_education/eP1.vue

@@ -59,7 +59,7 @@ const getOption = () => {
     grid: {
       top: "6%",
       left: "9%",
-      right: "10%",
+      right: "14%",
       bottom: "0%",
       containLabel: false, //---grid 区域是否包含坐标轴的刻度标签
     },
@@ -78,6 +78,7 @@ const getOption = () => {
           show: false,
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisLine: {
@@ -102,6 +103,7 @@ const getOption = () => {
           show: false,
           lineStyle: {
             color: "#ffffff",
+            fontSize: 14,
             width: 1,
           },
         },
@@ -112,16 +114,12 @@ const getOption = () => {
           //y轴文字的配置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisLine: {
           //分割线配置
           show: false,
-          // lineStyle: {
-          //   color: "#ffffff",
-          //   width: 1,
-          //   type: "solid",
-          // },
         },
         data: data1,
       },
@@ -137,6 +135,7 @@ const getOption = () => {
           //---坐标轴 标签
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisTick: {

src/view/echarts_education/edCSR.vue

@@ -53,7 +53,7 @@ const option = {
     // data: ["上门服务时长", "上门服务次数"],
     // top: "8%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -64,6 +64,7 @@ const option = {
     bottom: "0%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   calculable: true,
   //   color: "rgba(0, 252, 255, 1)",
@@ -75,6 +76,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -98,6 +100,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -105,6 +108,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -112,6 +116,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -174,27 +179,7 @@ const option = {
       // data: data.map(() => max),
       data: data.map(() => Math.max(...data) * 1.02),
       barWidth: 40, //外阴影背景宽
-      // emphasis: {
+     
-      //   itemStyle: {
-      //     color: {
-      //       type: "linear",
-      //       x: 0,
-      //       x2: 0,
-      //       y: 0,
-      //       y2: 1,
-      //       colorStops: [
-      //         {
-      //           offset: 0,
-      //           color: "rgba(64, 247, 176, 0.25)",
-      //         },
-      //         {
-      //           offset: 1,
-      //           color: "rgba(17, 34, 64, 0.25)",
-      //         },
-      //       ],
-      //     },
-      //   },
-      // },
       type: "bar",
     },
   ],
@@ -202,19 +187,8 @@ const option = {
 
 // 使用生命钩子
 onMounted(() => {
-  // 基于准备好的dom，初始化echarts实例
-  // var myChart = echarts.init(document.getElementById('main'));
-  // Vue3中： 需要引入
   var myChart = echarts.init(chart.value);
-
-  // init(); // vue3.2没有this
-  // 使用刚指定的配置项和数据显示图表。
   myChart.setOption(option);
-
-  // 单图表响应式: 跟随浏览器大小改变
-  //   window.addEventListener("resize", () => {
-  //     myChart.resize();
-  //   });
 });
 </script>
 

src/view/echarts_education/edXX.vue

@@ -62,6 +62,7 @@ const getOption = () => {
             borderWidth: 1,
             borderColor: "rgba(193, 229, 255, .1)",
             color: "rgba(14, 59, 123, 0.60)",
+            fontSize: 14,
           },
         },
         tooltip: {
@@ -93,7 +94,8 @@ const getOption = () => {
           //最外面的{a|}必要，不然位置有偏差，可以根据rich a微调
           //{hr|}为圆点显示内容
           formatter: "{hr|}{a|{b} {c}}\n\n",
-          color: "#fffdef", //折线图文字颜色
+          color: "#ffffff", //折线图文字颜色
+          fontSize: 14,
           borderWidth: 10,
           borderRadius: 4,
           padding: [90, -60],
@@ -113,8 +115,9 @@ const getOption = () => {
           },
 
           textStyle: {
-            color: "white", // 改变标示文字的颜色
+            // color: "white", // 改变标示文字的颜色
-            fontSize: 13, //文字大小
+            color: "#ffffff",
+            fontSize: 14, //文字大小
           },
         },
         labelLine: {

src/view/echarts_education/pie.vue

@@ -32,8 +32,8 @@ const getOption = () => {
       top: "8%",
       right: "11%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
-        color: "#ccc",
+        color: "#ffffff",
       },
     },
     grid: {
@@ -49,7 +49,8 @@ const getOption = () => {
         axisLabel: {
           //坐标轴刻度标签的相关设置
           textStyle: {
-            color: "#ccc",
+            color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisTick: {
@@ -80,7 +81,8 @@ const getOption = () => {
         axisLabel: {
           //坐标轴刻度标签的相关设置
           textStyle: {
-            color: "#ccc",
+            color: "#ffffff",
+            fontSize: 14,
           },
         },
       },
@@ -105,7 +107,7 @@ const getOption = () => {
           show: false,
           fontSize: 14,
           fontFamily: "MicrosoftYaHei",
-          color: "#DEF1FF",
+          color: "#ffffff",
           lineHeight: 19,
         },
       },
@@ -171,6 +173,7 @@ const getOption = () => {
         yAxisIndex: 1,
         itemStyle: {
           color: "rgba(221, 242, 255, 0.1)",
+          fontSize: 14,
         },
         data: ["2019", "2020", "2021"].map(() => 100),
         barWidth: 70,

src/view/echarts_hygiene/eP4.vue

@@ -71,6 +71,7 @@ let option = {
                                 fontSize: '24',
                                 fontWeight: 'normal',
                                 color: '#fff',
+                                fontSize: 14,
                                 lineHeight: 30,
                                 rich: {
                                     cell: {

src/view/echarts_hygiene/eP5.vue

@@ -72,6 +72,7 @@ const getOption = () => {
           // },
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
           rotate: 40,
         },
@@ -94,6 +95,7 @@ const getOption = () => {
           //坐标轴刻度标签的相关设置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisLine: {
@@ -101,6 +103,7 @@ const getOption = () => {
           show: false,
           lineStyle: {
             color: "#ffffff",
+            fontSize: 14,
             width: 1,
             type: "solid",
           },

src/view/echarts_hygiene/eP7.vue

@@ -46,6 +46,7 @@ data.option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
 
@@ -76,6 +77,7 @@ data.option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
             axisLine: {
@@ -83,6 +85,7 @@ data.option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -109,7 +112,8 @@ data.option = {
         show: false,
         fontSize: 14,
         fontFamily: "MicrosoftYaHei",
-        color: "#DEF1FF",
+        color: "#ffffff",
+        fontSize: 14,
         lineHeight: 19,
       },
     },

src/view/echarts_hygiene/gxy.vue

@@ -56,6 +56,7 @@ const getOption = () => {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
     },
@@ -72,6 +73,7 @@ const getOption = () => {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
     },

src/view/echarts_hygiene/pie.vue

@@ -38,7 +38,7 @@ const getOption = () => {
       top: "6%",
       right: "11%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff",
       },
     },
@@ -57,6 +57,7 @@ const getOption = () => {
           //坐标轴刻度标签的相关设置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         data: data.year,
@@ -85,6 +86,7 @@ const getOption = () => {
           //坐标轴刻度标签的相关设置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
       },
@@ -109,7 +111,8 @@ const getOption = () => {
           show: false,
           fontSize: 14,
           fontFamily: "MicrosoftYaHei",
-          color: "#DEF1FF",
+          color: "#ffffff",
+          fontSize: 14,
           lineHeight: 19,
         },
       },

src/view/echarts_hygiene/pie2.vue

@@ -38,7 +38,7 @@ const getOption = () => {
       top: "6%",
       right: "11%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff",
       },
     },
@@ -57,6 +57,7 @@ const getOption = () => {
       axisLabel: {
         //坐标轴刻度标签的相关设置
         textStyle: {
+          fontSize: 14,
           color: "#ffffff",
         },
       },
@@ -73,6 +74,7 @@ const getOption = () => {
       axisLabel: {
         //坐标轴刻度标签的相关设置
         textStyle: {
+          fontSize: 14,
           color: "#ffffff",
         },
       },

src/view/echarts_hygiene/tnb.vue

@@ -56,6 +56,7 @@ const getOption = () => {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },
@@ -72,6 +73,7 @@ const getOption = () => {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },

src/view/echarts_sy/pie.vue

@@ -186,8 +186,8 @@ const getOption = () => {
           borderRadius: 20,
         },
         textStyle: {
-          color: "#ccc",
+          color: "#ffffff",
-          fontSize: 12,
+          fontSize: 14,
           padding: 10,
           rich: {
             name: {

src/view/echarts_work/eP1.vue

@@ -24,7 +24,7 @@ const option = {
     data: ["救助金额", "救助人数"],
     top: "8%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff", //上文字标题颜色
     },
   },
@@ -45,6 +45,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -69,12 +70,14 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
       axisLabel: {
         //y轴文字的配置
         textStyle: {
+          fontSize: 14,
           color: "#ffffff",
         },
       },
@@ -83,6 +86,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -105,6 +109,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -112,6 +117,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -138,7 +144,7 @@ const option = {
         show: false,
         fontSize: 14,
         fontFamily: "MicrosoftYaHei",
-        color: "#DEF1FF",
+        color: "#ffffff",
         lineHeight: 19,
       },
     },

src/view/echarts_work/eP2.vue

@@ -49,7 +49,7 @@ const option = {
     data: ["救助金额", "救助人数"],
     top: "8%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff", //上文字标题颜色
     },
   },
@@ -59,6 +59,7 @@ const option = {
     bottom: "0%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   calculable: true,
   color,
@@ -70,6 +71,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -94,6 +96,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -101,6 +104,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -108,6 +112,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -130,6 +135,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -137,6 +143,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -162,9 +169,9 @@ const option = {
       axisLabel: {
         show: false,
         fontSize: 14,
-        fontFamily: "MicrosoftYaHei",
         color: "#DEF1FF",
         lineHeight: 19,
+        fontFamily: "MicrosoftYaHei",
       },
     },
   ],
@@ -238,19 +245,8 @@ const option = {
 
 // 使用生命钩子
 onMounted(() => {
-  // 基于准备好的dom，初始化echarts实例
-  // var myChart = echarts.init(document.getElementById('main'));
-  // Vue3中： 需要引入
   var myChart = echarts.init(chart.value);
-
-  // init(); // vue3.2没有this
-  // 使用刚指定的配置项和数据显示图表。
   myChart.setOption(option);
-
-  // 单图表响应式: 跟随浏览器大小改变
-  //   window.addEventListener("resize", () => {
-  //     myChart.resize();
-  //   });
 });
 </script>
 

src/view/echarts_work/eP3.vue

@@ -44,7 +44,7 @@ const option = {
       data: ["特困救助金额", "低保救助金额"],
       top: "3%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff", //上文字标题颜色
       },
     },
@@ -52,7 +52,7 @@ const option = {
       data: ["特困救助人次", "低保救助人次", "低边救助人次"],
       top: "13%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff", //上文字标题颜色
       },
     },
@@ -65,6 +65,7 @@ const option = {
     bottom: "0%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   calculable: true,
   color,
@@ -76,6 +77,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -100,6 +102,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -107,6 +110,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -114,6 +118,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -136,13 +141,16 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
+
       },
       axisLine: {
         //y轴线的颜色以及宽度
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -168,9 +176,9 @@ const option = {
       axisLabel: {
         show: false,
         fontSize: 14,
-        fontFamily: "MicrosoftYaHei",
+        color: "#ffffff",
-        color: "#DEF1FF",
         lineHeight: 19,
+        fontFamily: "MicrosoftYaHei",
       },
     },
   ],

src/view/echarts_work/eP4.vue

@@ -42,7 +42,7 @@ const option = {
     ],
     top: "3%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff", //上文字标题颜色
     },
   },
@@ -53,6 +53,7 @@ const option = {
     bottom: "5%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   calculable: true,
   color,
@@ -64,6 +65,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -88,6 +90,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -95,6 +98,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -102,6 +106,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -124,6 +129,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -131,6 +137,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -156,9 +163,9 @@ const option = {
       axisLabel: {
         show: false,
         fontSize: 14,
-        fontFamily: "MicrosoftYaHei",
+        color: "#ffffff",
-        color: "#DEF1FF",
         lineHeight: 19,
+        fontFamily: "MicrosoftYaHei",
       },
     },
   ],

src/view/echarts_work/ePjz.vue

@@ -45,7 +45,7 @@ const option = {
     top: "8%",
     bottom: "9%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff", //上文字标题颜色
     },
   },
@@ -65,6 +65,7 @@ const option = {
     bottom: "7%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   xAxis: [
     {
@@ -74,6 +75,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -97,6 +99,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -104,6 +107,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -111,6 +115,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -133,6 +138,7 @@ const option = {
         //y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -140,6 +146,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -166,7 +173,7 @@ const option = {
         show: false,
         fontSize: 14,
         fontFamily: "MicrosoftYaHei",
-        color: "#DEF1FF",
+        color: "#ffffff",
         lineHeight: 19,
       },
     },
@@ -280,8 +287,8 @@ const option = {
             show: false, // 开启显示
             position: "top", // 在上方显示
             textStyle: {
-              fontSize: "12",
+              fontSize: "14",
-              color: "#B0E1FF",
+              color: "#ffffff",
             },
           },
         },

src/view/echarts_yl/eP2.vue

@@ -50,7 +50,7 @@ const getOption = () => {
     top: "8%",
     right: "15%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -63,20 +63,12 @@ const getOption = () => {
 
   xAxis: {
     type: "category",
-    // boundaryGap: false,
     data: data.year,
-    // splitArea: {
-    //   show: true,
-    //   interval: '10',
-    //   areaStyle: {
-    //     color: ["rgba(255, 255, 255, 0.10)"],
-    //     width:10,
-    //   },
-    // },
     axisLabel: {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },
@@ -85,7 +77,8 @@ const getOption = () => {
     splitLine: {
       show: true,
       lineStyle: {
-        color: "rgba(226, 226, 226, 0.3)",
+        color: "rgba(255, 255, 255, 0.2)",
+        fontSize: 14,
         width: 1,
       },
     },
@@ -93,6 +86,7 @@ const getOption = () => {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },

src/view/echarts_yl/eP2_2.vue

@@ -50,7 +50,7 @@ const getOption = () => {
       top: "8%",
       right: "15%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff",
       },
     },
@@ -77,6 +77,7 @@ const getOption = () => {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
     },
@@ -93,6 +94,7 @@ const getOption = () => {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
     },
@@ -104,6 +106,7 @@ const getOption = () => {
         showBackground: true,
         backgroundStyle: {
           color: "rgba(180, 180, 180, 0.2)",
+          fontSize: 14,
         },
       },
       {

src/view/echarts_yl/eP3.vue

@@ -50,7 +50,7 @@ const getOption = () =>{
     top: "8%",
     right: "11%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -69,6 +69,7 @@ const getOption = () =>{
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },
@@ -77,7 +78,8 @@ const getOption = () =>{
     splitLine: {
       show: true,
       lineStyle: {
-        color: "rgba(226, 226, 226, 0.3)",
+        color: "rgba(255, 255, 255, 0.2)",
+        fontSize: 14,
         width: 1,
       },
     },
@@ -85,6 +87,7 @@ const getOption = () =>{
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },

src/view/echarts_yl/eP3_2.vue

@@ -47,7 +47,7 @@ const getOption = () =>{
     top: "5%",
     right: "11%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -65,6 +65,7 @@ const getOption = () =>{
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       data: data.year,
@@ -75,6 +76,8 @@ const getOption = () =>{
       data: data.year,
       axisLabel: {
         show: false,
+        color: "#ffffff",
+        fontSize: 14,
       },
     },
 
@@ -94,6 +97,7 @@ const getOption = () =>{
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
     },
@@ -105,7 +109,7 @@ const getOption = () =>{
         show: false,
         lineStyle: {
           type: "solid",
-          color: "rgb(221, 242, 255,0.1)"
+          color: "rgb(221, 242, 255,0.3)"
         },
       },
       axisLine: {
@@ -117,8 +121,8 @@ const getOption = () =>{
       axisLabel: {
         show: false,
         fontSize: 14,
-        fontFamily: "MicrosoftYaHei",
         color: "#DEF1FF",
+        fontFamily: "MicrosoftYaHei",
         lineHeight: 19,
       },
     },

src/view/echarts_yl/pie.vue

@@ -46,7 +46,7 @@ const getOption = () => {
       top: "8%",
       right: "11%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff",
       },
     },
@@ -64,6 +64,7 @@ const getOption = () => {
           //坐标轴刻度标签的相关设置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         data: data.year,
@@ -84,7 +85,9 @@ const getOption = () => {
         splitLine: {
           show: true,
           lineStyle: {
-            color: "rgba(226, 226, 226, 0.3)",
+            // color: "rgba(226, 226, 226, 0.3)",
+            color: "#ffffff",
+            fontSize: 14,
             width: 1,
           },
         },
@@ -114,7 +117,7 @@ const getOption = () => {
           show: false,
           fontSize: 14,
           fontFamily: "MicrosoftYaHei",
-          color: "#DEF1FF",
+          color: "#ffffff",
           lineHeight: 19,
         },
       },

src/view/echarts_yl/pie2.vue

@@ -48,7 +48,7 @@ const getOption = () => {
     top: "8%",
     right: "11%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -67,6 +67,7 @@ const getOption = () => {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },
@@ -75,7 +76,8 @@ const getOption = () => {
     splitLine: {
       show: true,
       lineStyle: {
-        color: "rgba(226, 226, 226, 0.3)",
+        color: "rgba(255, 255, 255, 0.2)",
+        fontSize: 14,
         width: 1,
       },
     },
@@ -83,6 +85,7 @@ const getOption = () => {
       //坐标轴刻度标签的相关设置
       textStyle: {
         color: "#ffffff",
+        fontSize: 14,
       },
     },
   },

src/view/echarts_yl/pie3d.vue

@@ -251,7 +251,7 @@ function getPie3D(pieData, internalDiameterRatio) {
       textStyle: {
         //图例字体大小
         fontSize: 14,
-        color: "#B8DDFF",
+        color: "#FFFFFF",
         lineHeight: 20,
       },
 
@@ -288,7 +288,7 @@ function getPie3D(pieData, internalDiameterRatio) {
           ).toFixed(2);
           const value = option.series[params.seriesIndex].pieData.value;
           return (
-            `<div style='color:rgba(214, 243, 255, 0.9);'>` +
+            `<div style='color:#FFFFFF;'>` +
             `<span style="display:inline-block;margin-right:5px;border-radius:10px;width:10px;height:10px;background-color:${params.color};"></span>` +
             `${params.seriesName}<br/>` +
             `<span style='margin-right:20px'>${value}人</span>` +

src/view/echarts_yl/ylJHSY.vue

@@ -86,9 +86,9 @@ const getOption = () => {
     },
     legend: {
       data: ["计划生育人数", "计划生育补贴金额"],
-      top: "8%",
+      top: "3%",
       textStyle: {
-        fontSize: 12,
+        fontSize: 14,
         color: "#ffffff", //上文字标题颜色
       },
     },
@@ -107,6 +107,7 @@ const getOption = () => {
           //坐标轴刻度标签的相关设置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisTick: {
@@ -130,7 +131,8 @@ const getOption = () => {
           //分割线配置
           show: false,
           lineStyle: {
-            color: "#ffffff",
+            color: "rgba(255, 255, 255, 0.3)",
+            fontSize: 14,
             width: 1,
           },
         },
@@ -138,6 +140,7 @@ const getOption = () => {
           //y轴文字的配置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
         },
         axisLine: {
@@ -145,6 +148,7 @@ const getOption = () => {
           show: false,
           lineStyle: {
             color: "#ffffff",
+            fontSize: 14,
             width: 1,
             type: "solid",
           },
@@ -167,13 +171,16 @@ const getOption = () => {
           //y轴文字的配置
           textStyle: {
             color: "#ffffff",
+            fontSize: 14,
           },
+          
         },
         axisLine: {
           //y轴线的颜色以及宽度
           show: false,
           lineStyle: {
             color: "#ffffff",
+            fontSize: 14,
             width: 1,
             type: "solid",
           },
@@ -186,7 +193,7 @@ const getOption = () => {
           show: false,
           lineStyle: {
             type: "solid",
-            color: "rgb(221, 242, 255,0.1)",
+            color: "rgba(255, 255, 255, 0.3)",
           },
         },
         axisLine: {
@@ -198,9 +205,9 @@ const getOption = () => {
         axisLabel: {
           show: false,
           fontSize: 14,
-          fontFamily: "MicrosoftYaHei",
+          color: "#ffffff",
-          color: "#DEF1FF",
           lineHeight: 19,
+          fontFamily: "MicrosoftYaHei",
         },
       },
     ],

src/view/echarts_yl/ylSMFW.vue

@@ -39,6 +39,7 @@ const color = [
   },
 ];
 const option = {
+  color,
   tooltip: {
     trigger: "axis",
     formatter: "{b0}<br/> {a0}:{c0}<br/>{a1}:{c1}",
@@ -53,7 +54,7 @@ const option = {
     data: ["上门服务时长", "上门服务次数"],
     // top: "8%",
     textStyle: {
-      fontSize: 12,
+      fontSize: 14,
       color: "#ffffff",
     },
   },
@@ -64,10 +65,10 @@ const option = {
     bottom: "0%",
     containLabel: true,
     color: "#ffffff",
+    fontSize: 14,
   },
   calculable: true,
-  //   color: "rgba(0, 252, 255, 1)",
+  
-  color,
   xAxis: [
     {
       type: "category",
@@ -75,6 +76,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisTick: {
@@ -97,7 +99,8 @@ const option = {
       splitLine: {
         show: false,
         lineStyle: {
-          color: "#ffffff",
+          color: "rgba(255, 255, 255, 0.3)",
+          fontSize: 14,
           width: 1,
         },
       },
@@ -105,6 +108,7 @@ const option = {
         //坐标轴刻度标签的相关设置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -112,6 +116,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },
@@ -126,13 +131,15 @@ const option = {
       splitLine: {//分割线配置
         show: false,
         lineStyle: {
-          color: "#ffffff",
+          color: "rgba(255, 255, 255, 0.3)",
           width: 1,
+          fontSize: 14,
         },
       },
       axisLabel: {//y轴文字的配置
         textStyle: {
           color: "#ffffff",
+          fontSize: 14,
         },
       },
       axisLine: {
@@ -140,6 +147,7 @@ const option = {
         show: false,
         lineStyle: {
           color: "#ffffff",
+          fontSize: 14,
           width: 1,
           type: "solid",
         },

src/view/echarts_yl/ylXZZC.vue

@@ -1,8 +1,5 @@
 <template>
-  <div
+  <div ref="chart" style="width: 100%; height: 260px"></div>
-    ref="chart"
-    style="width: 100%; height: 260px"
-  ></div>
 </template>
 
 <script setup>
@@ -36,15 +33,12 @@ const chart = ref(null); // 创建DOM引用
 // const data = ["大街乡", "社阳乡", "沐尘畲族乡", "庙下乡", "溪口镇", "罗家乡"];
 // const datas = ["8", "10", "7", " 23", "25", "250"];
 
-
-
 const data = reactive({
   list1: [],
   list2: [],
   option: {},
 });
 
-
 let zoomShow = true;
 // if (data.length > 7) {
 //   zoomShow = true;
@@ -53,170 +47,178 @@ let zoomShow = true;
 // }
 const getOption = () => {
   data.option = {
-  tooltip: {
+    tooltip: {
-    trigger: "axis",
+      trigger: "axis",
-    axisPointer: {
+      axisPointer: {
-      type: "shadow",
+        type: "shadow",
+      },
     },
-  },
+    legend: {},
-  legend: {},
+    grid: {
-  grid: {
+      top: "0%",
-    top: "0%",
+      left: "3%",
-    left: "3%",
+      right: "8%",
-    right: "8%",
+      bottom: "3%",
-    bottom: "3%",
+      containLabel: true,
-    containLabel: true,
+      color: "#ffffff",
-    color: "#ffffff",
+      fontSize: 14,
-  },
-  dataZoom: [
-    {//在内部可以纵向拖动
-      show: zoomShow,
-      type: "inside",
-      startValue: 0,
-      endValue: 10,
-      minValueSpan: 2,
-      maxValueSpan: 10,
-      yAxisIndex: [0],
-      zoomOnMouseWheel: false, // 关闭滚轮缩放
-      moveOnMouseWheel: true, // 开启滚轮平移
-      moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
     },
-    { //纵向使用滚动条
+    dataZoom: [
-      show: zoomShow,
+      {
-      type: "slider",
+        //在内部可以纵向拖动
-      realtime: true,
+        show: zoomShow,
-      startValue: 0,
+        type: "inside",
-      endValue: 2,
+        startValue: 0,
-      width: "8",
+        endValue: 10,
-      height: "90%",
+        minValueSpan: 2,
-      yAxisIndex: [0], // 控制y轴滚动
+        maxValueSpan: 10,
-      fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
+        yAxisIndex: [0],
-      borderColor: "rgba(17, 100, 210, 0.12)",
+        zoomOnMouseWheel: false, // 关闭滚轮缩放
-      backgroundColor: "#cfcfcf", //两边未选中的滑动条区域的颜色
+        moveOnMouseWheel: true, // 开启滚轮平移
-      handleSize: 0, // 两边手柄尺寸
+        moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
-      showDataShadow: false, //是否显示数据阴影 默认auto
+      },
-      showDetail: false, // 拖拽时是否展示滚动条两侧的文字
+      {
-      top: "1%",
+        //纵向使用滚动条
-      right: "8",//距离右侧的距离
+        show: zoomShow,
-    },
+        type: "slider",
-  ],
+        realtime: true,
-  // dataZoom: [
+        startValue: 0,
-  //   {
+        endValue: 2,
-  //     //纵向使用滚动条
+        width: "8",
-  //     id: "dataZoomY",
+        height: "90%",
-  //     type: "slider",
+        yAxisIndex: [0], // 控制y轴滚动
-  //     yAxisIndex: [0], // 控制y轴滚动
+        fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
-  //     filterMode: "empty", //数据过滤,只改变数轴范围。
+        borderColor: "rgba(17, 100, 210, 0.12)",
-  //     width: "10",
+        backgroundColor: "#cfcfcf", //两边未选中的滑动条区域的颜色
-  //     height: "100%",
+        handleSize: 0, // 两边手柄尺寸
-  //     right: "3%", //距离右侧的距离
+        showDataShadow: false, //是否显示数据阴影 默认auto
-  //     orient: "vertical", //布局方式是横还是竖 'horizontal'：水平。'vertical'：竖直。
+        showDetail: false, // 拖拽时是否展示滚动条两侧的文字
-  //     start: 0, //开始 数据窗口范围的,范围是：0 ~ 100
+        top: "1%",
-  //     end: 70, //结束
+        right: "8", //距离右侧的距离
-  //     zoomLock: true, //不能缩放
+      },
-  //     fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
+    ],
-  //     borderColor: "rgba(17, 100, 210, 0.12)",
+    // dataZoom: [
-  //     backgroundColor: "#cfcfcf", //两边未选中的滑动条区域的颜色
+    //   {
-  //     handleSize: 0, // 两边手柄尺寸
+    //     //纵向使用滚动条
-  //     showDataShadow: false, //是否显示数据阴影 默认auto
+    //     id: "dataZoomY",
-  //     showDetail: false, // 拖拽时是否展示滚动条两侧的文字
+    //     type: "slider",
+    //     yAxisIndex: [0], // 控制y轴滚动
+    //     filterMode: "empty", //数据过滤,只改变数轴范围。
+    //     width: "10",
+    //     height: "100%",
+    //     right: "3%", //距离右侧的距离
+    //     orient: "vertical", //布局方式是横还是竖 'horizontal'：水平。'vertical'：竖直。
+    //     start: 0, //开始 数据窗口范围的,范围是：0 ~ 100
+    //     end: 70, //结束
+    //     zoomLock: true, //不能缩放
+    //     fillerColor: "rgba(154, 181, 215, 1)", // 滚动条颜色
+    //     borderColor: "rgba(17, 100, 210, 0.12)",
+    //     backgroundColor: "#cfcfcf", //两边未选中的滑动条区域的颜色
+    //     handleSize: 0, // 两边手柄尺寸
+    //     showDataShadow: false, //是否显示数据阴影 默认auto
+    //     showDetail: false, // 拖拽时是否展示滚动条两侧的文字
 
-  //     zoomOnMouseWheel: false, // 关闭滚轮缩放
+    //     zoomOnMouseWheel: false, // 关闭滚轮缩放
-  //     moveOnMouseWheel: true, // 开启滚轮平移
+    //     moveOnMouseWheel: true, // 开启滚轮平移
-  //     moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
+    //     moveOnMouseMove: true, // 鼠标移动能触发数据窗口平移
-  //   },
+    //   },
-  // ],
+    // ],
-  calculable: true,
+    calculable: true,
-  xAxis: {
+    xAxis: {
-    // name: '/次',
+      // name: '/次',
-    type: "value",
+      type: "value",
-    data: data.list2,
-    axisLabel: {
-      //坐标轴刻度标签的相关设置
-      textStyle: {
-        color: "#ffffff",
-      },
-      // formatter: `{value}/次` // 在每个x轴坐标都添加了单位
-      formatter: function (value, index) {
-        if (index === data.list2.length - 1) {
-          // 判断是否为最后一个标签
-          return value + "/次"; // 添加单位
-        } else {
-          return value; // 不是最后一个标签则不添加单位
-        }
-      },
-    },
-    splitLine: {
-      //分割线配置
-      show: true,
-      lineStyle: {
-        color: "rgba(255, 255, 255, 0.2)",
-        width: 1,
-      },
-    },
-    axisPointer: {
-      label: {
-        autoSplitNumber: 5,
-      },
-    },
-  },
-  yAxis: {
-    type: "category", //横向显示
-    data: data.list1,
-    // max:10,
-    //y轴文字的配置
-    axisLabel: {
-      inside: false,
-      // bargap: 0.5, // 设置固定的间隔
-      textStyle: {
-        color: "#ffffff",
-      },
-    },
-    //y轴线的颜色以及宽度
-    axisLine: {
-      show: false,
-      lineStyle: {
-        color: "#ffffff",
-        width: 1,
-        type: "solid",
-      },
-    },
-    axisTick: {
-      show: false, // 这里设置y轴刻度不显示
-    },
-    //分割线配置
-    splitLine: {
-      show: false,
-      lineStyle: {
-        color: "#ffffff",
-        width: 1,
-      },
-    },
-  },
-  series: [
-    {
-      type: "bar",
       data: data.list2,
-      barWidth: 15, //柱宽
+      axisLabel: {
-      barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
+        //坐标轴刻度标签的相关设置
-      // barCategoryGap: "10" /*多个并排柱子设置柱子之间的间距*/,
+        textStyle: {
-      barMaxWidth: 20, // 每一个都要设置
+          color: "#ffffff",
-      barMinWidth: 5, // 每一个都要设置
+          fontSize: 14,
-      itemStyle: {
+        },
-        normal: {
+        // formatter: `{value}/次` // 在每个x轴坐标都添加了单位
-          borderWidth: 1,
+        formatter: function (value, index) {
-          borderColor: "rgba(0, 183, 255, 1)",
+          if (index === data.list2.length - 1) {
-          borderRadius: [0, 0, 50, 0], //圆角边框
+            // 判断是否为最后一个标签
-          color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+            return value + "/次"; // 添加单位
-            { offset: 0, color: "rgba(26, 255, 217, 0)" },
+          } else {
-            { offset: 1, color: "rgba(0, 183, 255, 1)" },
+            return value; // 不是最后一个标签则不添加单位
-          ]),
+          }
+        },
+      },
+      splitLine: {
+        //分割线配置
+        show: true,
+        lineStyle: {
+          color: "rgba(255, 255, 255, 0.2)",
+          fontSize: 14,
+          width: 1,
+        },
+      },
+      axisPointer: {
+        label: {
+          autoSplitNumber: 5,
         },
       },
     },
-  ],
+    yAxis: {
+      type: "category", //横向显示
+      data: data.list1,
+      // max:10,
+      //y轴文字的配置
+      axisLabel: {
+        inside: false,
+        // bargap: 0.5, // 设置固定的间隔
+        textStyle: {
+          color: "#ffffff",
+          fontSize: 14,
+        },
+      },
+      //y轴线的颜色以及宽度
+      axisLine: {
+        show: false,
+        lineStyle: {
+          color: "#ffffff",
+          fontSize: 14,
+          width: 1,
+          type: "solid",
+        },
+      },
+      axisTick: {
+        show: false, // 这里设置y轴刻度不显示
+      },
+      //分割线配置
+      splitLine: {
+        show: false,
+        lineStyle: {
+          color: "rgba(255, 255, 255, 0.2)",
+          fontSize: 14,
+          width: 1,
+        },
+      },
+    },
+    series: [
+      {
+        type: "bar",
+        data: data.list2,
+        barWidth: 15, //柱宽
+        barGap: 0.3 /*多个并排柱子设置柱子之间的间距*/,
+        // barCategoryGap: "10" /*多个并排柱子设置柱子之间的间距*/,
+        barMaxWidth: 20, // 每一个都要设置
+        barMinWidth: 5, // 每一个都要设置
+        itemStyle: {
+          normal: {
+            borderWidth: 1,
+            borderColor: "rgba(0, 183, 255, 1)",
+            borderRadius: [0, 0, 50, 0], //圆角边框
+            color: new echarts.graphic.LinearGradient(0, 0, 1, 0, [
+              { offset: 0, color: "rgba(26, 255, 217, 0)" },
+              { offset: 1, color: "rgba(0, 183, 255, 1)" },
+            ]),
+          },
+        },
+      },
+    ],
+  };
 };
-}
 
 // onMounted(() => {
 //   // 基于准备好的dom，初始化echarts实例

src/view/sy.vue

@@ -637,62 +637,6 @@ const ylwsList = ref([
   },
 ]);
 
-// const whsyList = ref([
-//   {
-//     name: "公共图书馆(南孔书院)",
-//     value: "198",
-//     dw: "家",
-//   },
-//   {
-//     name: "总藏书",
-//     value: "1983",
-//     dw: "万册",
-//   },
-//   {
-//     name: "送戏下乡次数",
-//     value: "2787",
-//     dw: "次",
-//   },
-//   {
-//     name: "博物馆观展人次",
-//     value: "1.292.874",
-//     dw: "次",
-//   },
-//   {
-//     name: "图书借阅",
-//     value: "1.724.012",
-//     dw: "次",
-//   },
-// ]);
-
-// const tysyList = ref([
-//   {
-//     name: "足球场",
-//     value: "100",
-//     img: footerball,
-//   },
-//   {
-//     name: "篮球场",
-//     value: "100",
-//     img: baskerball,
-//   },
-//   {
-//     name: "乒乓球馆",
-//     value: "100",
-//     img: tableTennis,
-//   },
-//   {
-//     name: "羽毛球馆",
-//     value: "100",
-//     img: badminton,
-//   },
-//   {
-//     name: "绿色跑道",
-//     value: "100",
-//     dw: "km",
-//     img: running,
-//   },
-// ]);
 
 const jtsyList = ref([
   {