mod:图标

electron/controller/socket.js

@@ -22,7 +22,9 @@ class SocketController extends Controller {
       const win = CoreWindow.getMainWindow()
       // 监听连接成功事件
       socket.on('open', () => {
+        console.log('socket open')
         resolve(true);
+        win.webContents.send('controller.socket.connect_open', true);
       });
 
       // 监听消息事件

frontend/src/stores/modules/socket.ts

@@ -15,8 +15,9 @@ const socket = defineStore('socket', ()=>{
     })
 
 async function connectSocket(){
-    if(!clientStore.isClient) return;
+    if(socket.value) return socket.value;
     await new Promise((resolve, reject) => {
+        if(!clientStore.isClient) resolve(true);
         clientStore.ipc.removeAllListeners(icpList.socket.connect);
         clientStore.ipc.send(icpList.socket.connect);
         clientStore.ipc.on(icpList.socket.connect+'_open', async (event, result) => {
@@ -29,7 +30,7 @@ async function connectSocket(){
 
     async function disconnectSocket(){
         if(!clientStore.isClient) return;
-        new  Promise((resolve,reject)=>{
+        await  new  Promise((resolve,reject)=>{
             clientStore.ipc.removeAllListeners(icpList.socket.disconnect);
             clientStore.ipc.send(icpList.socket.disconnect);
             clientStore.ipc.on(icpList.socket.connect, async (event, result) => {
@@ -43,6 +44,8 @@ async function connectSocket(){
 
     async function sendMessage(data){
         if(!clientStore.isClient) return;
+        console.log('sendMessage');
+        console.log(data);
         new  Promise((resolve,reject)=>{
             clientStore.ipc.removeAllListeners(icpList.socket.sendMessage);
             clientStore.ipc.send(icpList.socket.sendMessage,JSON.stringify(data));

frontend/src/views/Photography/shot.vue

@@ -209,11 +209,15 @@ async function getPhotoRecords(params?:{}) {
 
 //执行拍照   扫了货号，点击遥控器
 async function runGoods(data) {
+  console.log('aa2')
   await socketStore.connectSocket();
+
+  console.log('aa3')
   socketStore.sendMessage({
     type: 'run_mcu',
     data,
   })
+  console.log('aa4')
   runLoading.value = true;
   runAction.value = data
   goods_art_no.value = ''
@@ -270,6 +274,7 @@ onMounted(async () => {
     if (result.code === 0 && result.data?.data) {
       if(result.data?.data.goods_art_no) runGoods(result.data?.data)
       if(!result.data?.data.goods_art_no && goods_art_no.value){
+        console.log('aa')
         console.log('手工')
         console.log({
           ...result.data?.data,
@@ -279,6 +284,7 @@ onMounted(async () => {
           ...result.data?.data,
           goods_art_no: goods_art_no.value
         })
+        console.log('aa1')
       }
 
     }