1.断开台架连接 2.originPage滚动条

src/service/ws.js

@@ -129,13 +129,12 @@ export default class wsService {
     }
 
     connectBench(connectParam) {
-        // this.send("connect_bench", { bench_id: id }).then((res)=>{
-        //     console.log('rescc', res);
-        // })
-        // console.log('this.send("connect_bench")', this.send("connect_bench", { bench_id: id }));
-        console.log('connect param',connectParam)
         let res = this.send("connect_bench", connectParam);
-        console.log('res',res);
+        return res;
+    }
+
+    disconnectBench(connectParam) {
+        let res = this.send("disconnect_bench", connectParam);
         return res;
     }
 

src/views/originPage/index.less

@@ -175,4 +175,26 @@
     height: 100%;
     border-radius: 15px;
   }
+}
+
+
+*::-webkit-scrollbar {
+  /*滚动条整体样式*/
+  width: 6px;
+  /*高宽分别对应横竖滚动条的尺寸*/
+  height: 1px;
+}
+
+*::-webkit-scrollbar-thumb {
+  /*滚动条里面小方块*/
+  border-radius: 5px;
+  box-shadow: inset 0 0 5px rgba(180, 180, 180, 0.5);
+  background: rgba(180, 180, 180, 0.2);
+}
+
+*::-webkit-scrollbar-track {
+  /*滚动条里面轨道*/
+  /* box-shadow: inset 0 0 5px rgba(0, 0, 0, 0.2); */
+  border-radius: 10px;
+  background: transparent;
 }

src/views/originPage/list.vue

@@ -191,9 +191,12 @@
         <el-col :span="3" class="btn-item">
           <img @click="pressPtt" src="../../images/robot.png" />
         </el-col>
-        <el-col :span="3" class="btn-item">
+        <el-col :span="3" class="btn-item" @click="clickBenchList">
           <img @click="gotoGrid" src="../../images/grid.png" />
         </el-col>
+        <el-col :span="3" class="btn-item">
+          <img @click="disconnectBench" src="../../images/disconnect.png" />
+        </el-col>
       </el-row>
     </div>
     <div class="origin-right">
@@ -504,17 +507,6 @@ export default {
               img: res.data.data,
             });
             self.getImgList(objRBL);
-            //// let screen = screenType == 1 ? "upper" : "lower";
-            //if (screenType == 1) {
-            //  self.benchImgUpper = "data:image/png;base64," + res.data.data;
-            //} else {
-            //  self.benchImgLower = "data:image/png;base64," + res.data.data;
-            //}
-            // let screen = res.data.screen_type;
-            //if (benchId == this.connetedBenchId) {
-            //  self.getBenchImage(benchId, screenType, func);
-            //  this.$store.dispatch('benchList/setBenchImgList', {benchId, img: res.data.data});
-            //}
           });
         })
         .catch((err) => {
@@ -793,7 +785,9 @@ export default {
             });
             if (screenType == "DUO") {
               self.getBenchImage(String(benchId), 2, () => {
-                this.benchDisplayLowerVisible = true;
+                if (this.connetedBenchId) {
+                  this.benchDisplayLowerVisible = true;
+                }
               });
             } else {
               this.benchDisplayLowerVisible = false;
@@ -1533,6 +1527,19 @@ export default {
         });
       }
     },
+    clickBenchList() {
+      window.location.href = "/squarePage?m=8b934420_ZJUb_b6f9";
+    },
+    disconnectBench() {
+      ws.disconnectBench({ bench_id: String(this.connetedBenchId) }).then(
+        (res) => {
+          this.connetedBenchId = "";
+          this.currentBench = {};
+          this.benchDisplayVisible = false;
+          this.benchDisplayLowerVisible = false;
+        }
+      );
+    },
   },
   watch: {
     benchDisplayVisible(newValue, oldValue) {