Merge branch 'master' of http://git.umayle.com:2023/liulonglong/shuinichang_

src/views/Zhou/TZCGL.vue

@@ -198,7 +198,31 @@ export default {
         xAxis: {
           type: "category",
           boundaryGap: false,
-          data: ["12:20", "13:20", "14:20", "15:20"],
+          data: [
+            "",
+            "",
+            "",
+            "",
+            "12:20",
+            "",
+            "",
+            "",
+            "",
+            "13:20",
+            "",
+            "",
+            "",
+            "",
+            "14:20",
+            "",
+            "",
+            "",
+            "",
+            "15:20",
+          ],
+          axisTick: {
+            interval: false, // 设置刻度点连续显示
+          },
           axisLabel: {
             show: true,
             interval: 0,
@@ -206,7 +230,7 @@ export default {
               color: "#fff",
               fontSize: 20,
             },
-            interval: 0, //代表显示所有x轴标签显示
+            // interval: 0, //代表显示所有x轴标签显示
           },
         },
         yAxis: {
@@ -240,7 +264,7 @@ export default {
             type: "line",
             name: "碳排放量",
             data: [
-              15, 30, 25, 20, 30, 20, 25, 23, 21, 19, 32, 29, 19, 20, 18, 20, 9,
+              15, 30, 25, 20, 30, 20, 25, 23, 21, 19, 32, 36, 19, 20, 18, 20, 9,28,21,32,24
             ],
             // smooth: true,
             itemStyle: {
@@ -1269,7 +1293,8 @@ export default {
   box-sizing: border-box;
   background-color: transparent;
   display: flex;
-  background-image: url(../../assets/img/左遮罩.png), url(../../assets/img/右遮罩.png);
+  background-image: url(../../assets/img/左遮罩.png),
+    url(../../assets/img/右遮罩.png);
   padding-top: 400px;
   justify-content: space-between;
   position: relative;