panqiuyao 8 месяцев назад
Родитель
Сommit
4bea64c1f2

+ 9 - 2
electron/controller/socket.js

@@ -15,12 +15,19 @@ class SocketController extends Controller {
    * Connect to WebSocket server
    */
   async connect() {
-    if(socket)  return;
 
      await new Promise(async (resolve,reject) => {
+
+       const win = CoreWindow.getMainWindow()
+       if(socket){
+         console.log('has socket ')
+         resolve(true);
+         win.webContents.send('controller.socket.connect_open', true);
+         return;
+       }
+
       socket = new WebSocket('ws://'+pyapp+':7074/ws');
 
-      const win = CoreWindow.getMainWindow()
       // 监听连接成功事件
       socket.on('open', () => {
         console.log('socket open')

+ 5 - 1
electron/controller/utils.js

@@ -42,7 +42,11 @@ class UtilsController extends Controller {
   async openMain (config) {
 
 
-    if( this.app.electron[config.id]) return;
+    if( this.app.electron[config.id]){
+      this.app.electron[config.id].focus();
+      this.app.electron[config.id].show();
+      return;
+    }
     const win = new BrowserWindow({
       ...config,
 

+ 0 - 1
frontend/src/stores/modules/socket.ts

@@ -62,7 +62,6 @@ async function connectSocket(){
         connectSocket,
         disconnectSocket,
     }
-
 });
 
 export default socket;

+ 2 - 3
frontend/src/views/Setting/index.vue

@@ -271,7 +271,7 @@
               <el-radio :label="true">翻转</el-radio>
               <el-radio :label="false">不翻转</el-radio>
               </el-radio-group>
-              <a class="cursor-pointer" @click="changeNum('shoe_upturn')">测试翻转</a>
+              <a class="cursor-pointer" @click="changeNum('overturn_steering')">测试翻转</a>
             </div>
           </el-form-item>
           <el-form-item label="LED灯光开光" @change="changeNum('laser_position')">
@@ -774,11 +774,10 @@ async function changeNum(type) {
       'turntable_steering': 'turntable_angle',
       'turntable_position_motor': 'turntable_position',
       'camera_steering': 'camera_angle',
-      'shoe_upturn': 'shoe_upturn',
+      'overturn_steering': 'shoe_upturn',
       'laser_position': 'led_switch',
       'take_picture': 'number_focus',
     };
-    await socketStore.connectSocket();
     socketStore.sendMessage({
       type: 'control_mcu',
       data: {