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

src/views/NewPages/forecast-system.vue

@@ -72,21 +72,21 @@
         </el-col>
         <el-col :span="19">
           <panel :title="'损失电量分析'">
-            <multiple-bar-line-chart :height="'310px'" 
+            <multiple-bar-line-chart :height="'100%'" 
               :lineData="chart1Line" :barData="chart1Bar"
               :units="['功率（万kW）','电量（万kWh）']"/>
           </panel>
         </el-col>
       </el-row>
-      <el-row>
+      <el-row class="bottom-charts">
         <el-col :span="12">
           <panel :title="'超短期风功率预测'">
-            <arrow-line-chart :height="'310px'" :list="chart2List" :units="['功率（万kW）','风速（m/s）']"/>
+            <arrow-line-chart :height="'100%'"  :list="chart2List" :units="['功率（万kW）','风速（m/s）']"/>
           </panel>
         </el-col>
         <el-col :span="12">
           <panel :title="'短期风功率预测'">
-            <arrow-line-chart :height="'310px'" :list="chart3List" :units="['功率（万kW）','风速（m/s）']"/>
+            <arrow-line-chart :height="'100%'"  :list="chart3List" :units="['功率（万kW）','风速（m/s）']"/>
           </panel>
         </el-col>
       </el-row>
@@ -230,6 +230,16 @@ export default {
 
 <style lang="less">
 .forecast-system {
+  .com-panel{
+    .panel-body{
+      height: 43vh;
+    }
+  }
+  .bottom-charts{
+    .panel-body{
+      height: 35vh;
+    }
+  }
   .action-bar {
     .selections {
       flex: 1 0 auto;
@@ -281,7 +291,7 @@ export default {
           flex: 1 0 calc(100% / 3 - 8px);
           background: fade(@gray, 20);
           margin-bottom: 8px;
-
+          height: 10vh;
           .tag-title {
             font-size: 12px;
             color: @gray-l;
@@ -295,13 +305,14 @@ export default {
             font-size: 20px;
             color: @green;
             text-align: center;
-            padding: 12px 0;
+            padding: 3vh 0;
             .unit {
               position: absolute;
               color: @gray;
               font-size: 12px;
               bottom: 8px;
               right: 8px;
+              top: 40%;
             }
           }