Merge branch 'yx' of ssh://61.161.152.110:29418/electronic-map into tjj2

src/views/HealthControl/healthLineChart2.vue

@@ -35,7 +35,7 @@
 </template>
 
 <script>
-import VertivalBarLineChart from "../../components/chart/combination/vertival-bar-line-chart.vue";
+import VertivalBarLineChart from "../../components/chart/combination/health-bar-line-chart.vue";
 import NormalLineChart from "../../components/chart/line/normal-line-chart.vue";
 import SvgIcon from "../../components/coms/icon/svg-icon.vue";
 import Panel from "../../components/coms/panel/panel.vue";

src/views/Home/Home.vue

@@ -174,7 +174,7 @@
               <table class="table-card">
                 <tr class="">
                   <td class="text gray">装机容量</td>
-                  <td class="value green">{{ jczbmap.zjrl }}</td>
+                  <td class="value green">{{ Number(jczbmap.zjrl) + 50 }}</td>
                   <td class="unit gray">MW</td>
                 </tr>
                 <tr class="">