From 73cca88ed3a5c30a5e5a5da8a2dd3cb74cfb6b66 Mon Sep 17 00:00:00 2001
From: 24kycj <1637269896@qq.com>
Date: Tue, 13 May 2025 15:52:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/index.js                   |  2 +-
 src/renderer/store/modules/chat.js  | 10 ++--
 src/renderer/views/manage/index.vue | 73 ++++++++++++++++++++++-------
 3 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/main/index.js b/src/main/index.js
index fad1381..719e6d7 100644
--- a/src/main/index.js
+++ b/src/main/index.js
@@ -33,7 +33,7 @@ function createWindow () {
   require("@electron/remote/main").initialize();
   require("@electron/remote/main").enable(mainWindow.webContents);
   // 禁用默认菜单
-  Menu.setApplicationMenu(null);
+  // Menu.setApplicationMenu(null);
   // mainWindow.maximize()
   mainWindow.show()
   mainWindow.loadURL(winURL)
diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js
index 5cb8a4b..4a53343 100644
--- a/src/renderer/store/modules/chat.js
+++ b/src/renderer/store/modules/chat.js
@@ -461,16 +461,20 @@ const actions = {
         let error = data.resp_info
         if (error.error) {
           let errors = error.error
-          console.log(errors)
+          let continues = [8, 9, 10, 11, 12]
           for (let i = 0; i < errors.length; i++) {
             setTimeout(() => {
-              commit('setData', { name: 'printer_error', data: { type: 'error', notify: Error[errors[i]] } })
+              let req = continues.indexOf(errors[i]) > -1 ? 'continue_task' : ''
+              if (req) {
+                commit('setData', { name: 'printer_error', data: { type: 'error', confirm: Error[errors[i]], req: req } })
+              } else {
+                commit('setData', { name: 'printer_error', data: { type: 'error', notify: Error[errors[i]] } })
+              }
             }, 500)
           }
         }
         if (error.error1) {
           let errors = error.error1.toString(2).split('').reverse()
-          console.log(errors)
           for (let i = 0; i < errors.length; i++) {
             if (errors[i] == 1) {
               setTimeout(() => {
diff --git a/src/renderer/views/manage/index.vue b/src/renderer/views/manage/index.vue
index 8ef58cd..2fa904b 100644
--- a/src/renderer/views/manage/index.vue
+++ b/src/renderer/views/manage/index.vue
@@ -185,6 +185,10 @@ export default {
         {
           id: 3,
           name: '进入运输模式'
+        },
+        {
+          id: 5,
+          name: '进入循环模式'
         }
       ],
       refreshTime: 10,
@@ -344,6 +348,10 @@ export default {
             {
               id: 3,
               name: '进入运输模式'
+            },
+            {
+              id: 5,
+              name: '进入循环模式'
             }
           ]
         }
@@ -365,26 +373,34 @@ export default {
       switch (e.id) {
         case 1:
           // 校准设备
-          that
-            .$confirm('请在打印机托盘放入一张光盘，点击确定后将自动校准打印机', '温馨提示', {
-              confirmButtonText: '确定',
-              cancelButtonText: '取消',
-              type: 'warning'
+          that.$store
+            .dispatch('chat/websocketsend', {
+              req_name: 'openPrinterClay',
+              req_type: 2,
+              req_info: {}
             })
             .then(() => {
-              that.$store
-                .dispatch('chat/websocketsend', {
-                  req_name: 'CaliPrinter',
-                  req_type: 2,
-                  req_info: {
-                    cali_num: 2
-                  }
+              that
+                .$confirm('请在打印机托盘放入一张光盘，点击确定后将自动校准打印机', '温馨提示', {
+                  confirmButtonText: '确定',
+                  cancelButtonText: '取消',
+                  type: 'warning'
                 })
                 .then(() => {
-                  that.$message({
-                    message: '执行成功',
-                    type: 'success'
-                  })
+                  that.$store
+                    .dispatch('chat/websocketsend', {
+                      req_name: 'CaliPrinter',
+                      req_type: 2,
+                      req_info: {
+                        cali_num: 2
+                      }
+                    })
+                    .then(() => {
+                      that.$message({
+                        message: '执行成功',
+                        type: 'success'
+                      })
+                    })
                 })
             })
           break
@@ -507,7 +523,7 @@ export default {
               that.$store
                 .dispatch('chat/websocketsend', {
                   req_name: 'CaliPrinterHead',
-                  req_type: 1,
+                  req_type: 2,
                   req_info: {}
                 })
                 .then(() => {
@@ -658,6 +674,29 @@ export default {
                 })
             })
           break
+        case 5:
+          // 进入循环模式
+          that
+            .$confirm('请确保已经取掉左右光盘桶托架，点击确定后设备将进入循环模式', '温馨提示', {
+              confirmButtonText: '确定',
+              cancelButtonText: '取消',
+              type: 'warning'
+            })
+            .then(() => {
+              that.$store
+                .dispatch('chat/websocketsend', {
+                  req_name: 'CycleMode',
+                  req_type: 2,
+                  req_info: {}
+                })
+                .then(() => {
+                  that.$message({
+                    message: '执行成功',
+                    type: 'success'
+                  })
+                })
+            })
+          break
       }
     },
     cdChange(index, e) {