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

src/views/HealthControl/Health1.vue

@@ -34,7 +34,7 @@
         </div>
         <div class="info-chart">
           <panel class="info-chart-panel" :title="'损失电量分析'">
-            <vertival-bar-line-chart :height="'250px'" />
+            <vertival-bar-line-chart :height="'200px'" />
           </panel>
         </div>
       </div>
@@ -322,7 +322,7 @@ export default {
       flex: 0 0 156px;
       display: flex;
       flex-direction: column;
-      height: 287px;
+      height: 237px;
       margin-right: 1.4815vh;
 
       .tab {
@@ -444,7 +444,7 @@ export default {
     .report-items {
       display: flex;
       flex-wrap: wrap;
-      height: calc(100vh - 500px);
+      max-height: calc(100vh - 440px);
 
       .item {
         flex: 0 0 calc(100% / 6 - 16px);