Merge branch 'master' of http://121.42.8.157:13000/zengminguo/D-MAP

src/components/TabList/index.vue

@@ -782,7 +782,6 @@ export default {
   display: flex;
   justify-content: space-between;
   align-items: center;
-  background: rgba(255,255,255,0.1);
 }
 
 .tab-buttons > div {
@@ -806,6 +805,7 @@ export default {
   background-size: 100% 100%;
   padding: 1.75vh 1.51vw;
   border-radius: 2.08vw;
+  background: rgba(255,255,255,0.36);
 }
 // .short {
 //   height: 40vh;

src/lib/ws/websocket.js

@@ -21,7 +21,7 @@ class IO {
             // 判断是否支持 WebSocket
             if ('WebSocket' in window) {
                 // 连接WebSocket
-                this.ws = new WebSocket(this.url);
+                this.ws = new WebSocket('ws://106.14.237.165/websocket');
                 this.ws.sendEvent = this.sendEvent;
                 this.ws.connectBench = this.connectBench.bind(this.ws)
                 this.ws.getImage = this.getImage.bind(this.ws)

src/views/ordinaryPage/index.vue

@@ -27,9 +27,9 @@
                 class="grid-item-background"
                 style="
                   background-color: black;
-                  padding-top: 30px;
-                  padding-bottom: 30px;
-                  padding-left: 5px;
+                  padding-top: 35px;
+                  padding-bottom: 25px;
+                  padding-left: 9px;
                   padding-right: 5px;
                   margin: 10px;
                   border-radius: 20px;
@@ -2486,8 +2486,11 @@ export default {
       var objRBL = this.remoteBenchList;
       console.log("zmg1", objRBL);
       var objRBLReverse = [];
-      for (; objRBL.length > 0; ) {
-        objRBLReverse.push(objRBL.pop());
+      if(objRBL)
+      {
+        for (; objRBL.length > 0; ) {
+          objRBLReverse.push(objRBL.pop());
+        }
       }
       if (objRBLReverse.length > 0) {
         setTimeout(() => {