*

ui/src/views/monitor/elec/index.vue

@@ -71,7 +71,11 @@
                 </div>
             </div>
             <div class="right" style="1270px">
+<<<<<<< HEAD
               <steam-balance />
+=======
+              <steam-balance/>
+>>>>>>> 121a5b5b4aa4bc15c8b7bb9fb19c24489d7036a1
             </div>
           </div>
         </div>