Merge branch 'yx' of http://61.161.152.110:10101/r/electronic-map into yx

src/views/WindSite/pages/Home/Home.vue

@@ -282,7 +282,7 @@ export default {
           },
           {
             title: "预测电量",
-            yAxisIndex: 1,
+            yAxisIndex: 0,
             value: [],
           },
         ],
@@ -455,7 +455,7 @@ export default {
             });
 
             that.fjmap = fjmap;
-            // that.Powertrend = Powertrend;
+            that.Powertrend = Powertrend;
             that.jczbmap = res.data.jczbmap;
             that.pieChartData = {
               dayData,
@@ -514,12 +514,12 @@ export default {
             {
               title: "发电量",
               yAxisIndex: 0,
-              value: [],
+              value: []
             },
             {
               title: "预测电量",
-              yAxisIndex: 1,
-              value: [],
+              yAxisIndex: 0,
+              value: []
             },
           ];