From 795a7cec7d9f8529602ba6329be040d9a6368f7d Mon Sep 17 00:00:00 2001 From: 24kycj <1637269896@qq.com> Date: Thu, 22 May 2025 16:51:00 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/App.vue | 9 ++++++--- src/renderer/store/modules/chat.js | 6 +++--- src/renderer/views/dashboard/index.vue | 5 +++-- 3 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 4e267eb..ab2fb13 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -109,10 +109,13 @@ export default { req_type: 1, req_info: {} }) - .then(() => {}) + .then(() => { + notifyInstance.close() + setTimeout(() => { + that.errors.splice(that.errors.indexOf(data.message), 1) + }, 10000); + }) .catch(() => {}) - that.errors.splice(that.errors.indexOf(data.message), 1) - notifyInstance.close() } } }, diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 4a53343..223a30a 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -58,7 +58,7 @@ const Error = { 6: '设备处于离线状态', 7: '设备门盖被打开', 8: '从打印托盘上抓取光盘错误,请手动将光盘取走', - 9: '多张光盘被抓取或移动,请手动取出多余的光盘。', + 9: '多张光盘被抓取或移动,请手动取出所有光盘后重试。', 10: '从进盘仓到光驱的过程中,抓取错误,请手动将光盘放回进盘仓后重试。', 11: '从进盘仓到打印托盘的过程中,抓取错误,请手动将光盘放回进盘仓后重试。', 12: '从光驱到打印托盘的过程中,抓取错误,请手动将光盘放回光驱后重试。', @@ -259,7 +259,7 @@ const defaultData = { cd_list: [ { cd_pos: 2, // 设备位置 1:下光驱,2:上光驱 - cd_status: 1, // 设备状态 0:无法确定光盘状态 ,1:没有光盘 , 2:光驱托盘打开, 3:光驱未准备好,4:光盘状态正常,光盘已插入 + cd_status: 4, // 设备状态 0:无法确定光盘状态 ,1:没有光盘 , 2:光驱托盘打开, 3:光驱未准备好,4:光盘状态正常,光盘已插入 cd_taskid: '', // 当前任务id dev_path: '', // 光驱路径 dev_type: 1, // 光驱类型 @@ -461,7 +461,7 @@ const actions = { let error = data.resp_info if (error.error) { let errors = error.error - let continues = [8, 9, 10, 11, 12] + let continues = [8, 9, 10, 11, 12, 19] for (let i = 0; i < errors.length; i++) { setTimeout(() => { let req = continues.indexOf(errors[i]) > -1 ? 'continue_task' : '' diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index a088ead..69de0c7 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -1514,11 +1514,11 @@ $red: #ff0000; color: #fff; text-align: center; left: 15px; - bottom: 45px; + top: 45px; } .device_right_top_img_text1 { left: 0; - bottom: 0; + top: 86px; padding: 6px; font-size: 18px; width: 100%; @@ -1526,6 +1526,7 @@ $red: #ff0000; } .device_right_top_span { font-size: 14px; + line-height: 20px; color: #ff0000; text-align: center; }