Merge branch 'feature/branch_yx' of http://47.108.78.218:28999/frontend/report-html-template

# Conflicts:
#	energy-report/index.html

energy-report/index.css

@@ -1099,8 +1099,8 @@ body {
         width: 100%;
         width: 100%;
     }
     }
     .content-item-left-icon {
     .content-item-left-icon {
-        width: 120px;
-        height: 95px;
+        width: 60px;
+        height: 48px;
     }
     }
 }
 }
 
 

energy-report/index.html

@@ -604,14 +604,7 @@
                 },
                 },
             ]
             ]
         }
         }
-        const getEchartsDataPadding = () => {
-            if (windowWidth > 768) {
-                return [0,0,0,65]
-            }
-            return [
-  0,0,0,25
-            ]
-        }
+
         //用电趋势
         //用电趋势
         const getEcharts = () => {
         const getEcharts = () => {
             let option = {
             let option = {
@@ -830,7 +823,7 @@
             var option = {
             var option = {
 
 
                 grid: {
                 grid: {
-                    left: '2%',
+                    left: '1%',
                     right: '5%',
                     right: '5%',
                     bottom: '6%',
                     bottom: '6%',
                     top: 30,
                     top: 30,
@@ -889,7 +882,7 @@
                                 color: 'rgba(255, 255, 255, 1)',
                                 color: 'rgba(255, 255, 255, 1)',
                             },
                             },
                             // align: 'center',
                             // align: 'center',
-                            padding: getEchartsDataPadding()
+                            padding: [0, 0, 0, 65]
                         },
                         },
                         // offset:5,
                         // offset:5,
                         axisTick: {
                         axisTick: {
@@ -1440,7 +1433,7 @@
                         axisLabel: {
                         axisLabel: {
                             interval: 0,
                             interval: 0,
                             textStyle: {
                             textStyle: {
-                                fontSize: 12, //更改坐标轴文字大小
+                                fontSize: 14, //更改坐标轴文字大小
                                 color: "#fff",
                                 color: "#fff",
                                 padding: [0, 0, 0, 0],
                                 padding: [0, 0, 0, 0],
                             },
                             },
@@ -1948,7 +1941,7 @@
         const getBarEcharts = () => {
         const getBarEcharts = () => {
             let option = {
             let option = {
                 grid: {
                 grid: {
-                    left: "4%",
+                    left: "3%",
                     right: "1%",
                     right: "1%",
                     bottom: "3%",
                     bottom: "3%",
                     containLabel: true,
                     containLabel: true,
@@ -2291,7 +2284,7 @@
                 grid: {
                 grid: {
                     top: 50,
                     top: 50,
                     left: "1%",
                     left: "1%",
-                    right: -30,
+                    right: -20,
                     bottom: 20,
                     bottom: 20,
                     containLabel: true,
                     containLabel: true,
                 },
                 },