Merge branch 'master' of http://114.244.114.158:8802/siwei/real3d-portalsite

src/views/cockpit/bjxm.vue

@@ -268,7 +268,7 @@ export default {
     },
     init_bjxm_cs_echart(data) {
       const _this = this;
-      data.bat_data = data.bat_data.map(value => (value / 1000).toFixed(2))
+      data.bat_data = data.bat_data.map(value => (value / 10000).toFixed(2))
       console.log('data: ', data);
 
       var dom = document.getElementById("bjxm_echart");

src/views/cockpit/gdbh.vue

@@ -755,7 +755,7 @@ export default {
     height: 100px;
     position: absolute;
     top: 0rem;
-    left: 2rem;
+    left: 0rem;
   }
 
   .item {
@@ -773,7 +773,7 @@ export default {
     display: inline-block;
 
     background: no-repeat 50%;
-    margin-left: 1rem;
+    margin-left: 2.6rem;
     margin-bottom: 0.5rem;
   }
 
@@ -796,10 +796,13 @@ export default {
   .text {
     display: inline-block;
     // border: #00FFFF 1px solid;
-    width: calc(100% - 50px);
+    width: 100%;
     margin-bottom: 4px;
     text-align: center;
     margin-left: 0.3rem;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 
     p {
       // font-kerning: normal;