diff --git a/src/renderer/components/workAdd/workAdd.vue b/src/renderer/components/workAdd/workAdd.vue index 2df0063..da0cacf 100644 --- a/src/renderer/components/workAdd/workAdd.vue +++ b/src/renderer/components/workAdd/workAdd.vue @@ -972,6 +972,7 @@ export default { this.setShow = false this.$store.dispatch('chat/setDatas', { name: 'workStatus', data: true }) this.$store.dispatch('setDatas', { name: 'setForm', data: this.setForm }) + localStorage.setItem('setForm', JSON.stringify(this.setForm)) }, initSet() { this.setForm = { ...this.$store.state.user.setForm } diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 223a30a..956076f 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -57,18 +57,13 @@ const Error = { 5: '机械臂移动错误,请按功能按钮重试。', 6: '设备处于离线状态', 7: '设备门盖被打开', - 8: '从打印托盘上抓取光盘错误,请手动将光盘取走', - 9: '多张光盘被抓取或移动，请手动取出所有光盘后重试。', - 10: '从进盘仓到光驱的过程中,抓取错误,请手动将光盘放回进盘仓后重试。', - 11: '从进盘仓到打印托盘的过程中,抓取错误,请手动将光盘放回进盘仓后重试。', - 12: '从光驱到打印托盘的过程中,抓取错误,请手动将光盘放回光驱后重试。', - 13: '打印机需要校准', - 14: '检测墨盒错误', + 8: '从打印托盘上抓取光盘时错误，请手动将光盘取走再点击重试。', + 9: '多张光盘被抓取或移动，请检查后手动将光盘放回原处再点重试，如重试后继续错误，则需校准设备后再来重试。', 15: '校准光盘桶失败', 16: '等待打印完成超时', - 17: '打印托盘中未放置光盘。', - 18: '设备清洗 ', - 19: '从光驱上抓取光盘到错误,请手动将光盘取走', + 17: '从打印托盘抓取光盘时未找到光盘。', + 18: '设备清洗', + 19: '从光驱上抓取光盘时错误,请手动将光盘取走再点击重试', 32: '其他错误', } const Error1 = { @@ -107,7 +102,8 @@ const CDStatus = { 1: '没有光盘', 2: '光驱托盘打开', 3: '光驱未准备好', - 4: '光盘状态正常，光盘已插入' + 4: '光盘状态正常，光盘已插入', + 5: '校验中' } // 光盘类型 @@ -461,7 +457,7 @@ const actions = { let error = data.resp_info if (error.error) { let errors = error.error - let continues = [8, 9, 10, 11, 12, 19] + let continues = [8, 9, 10, 11, 12, 17, 19] for (let i = 0; i < errors.length; i++) { setTimeout(() => { let req = continues.indexOf(errors[i]) > -1 ? 'continue_task' : '' @@ -513,59 +509,17 @@ const actions = { commit('setData', { name: 'printer_error', data: { type: 'error', notify: printer_errors[error.printer_error] } }) } } - } - // 执行错误提示 - } else if (data.resp_name === 'autoSetCDDevRes') { - if (data.resp_info.res_code === 0) { - + // 执行错误提示 } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '自动设置驱动失败' } }) - } - } else if (data.resp_name === 'setCDStrongRes') { - if (data.resp_info.res_code === 0) { + if (data.resp_info.res_code === 0) { - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '设置光盘桶失败' } }) - } - } else if (data.resp_name === 'setCDDeviceRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '设置光驱失败' } }) - } - } else if (data.resp_name === 'cleanErrorRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '清除错误失败' } }) - } - } else if (data.resp_name === 'CaliCDStoneRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '校准光盘桶失败' } }) - } - } else if (data.resp_name === 'CaliPrinterRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '校准打印机失败' } }) - } - } else if (data.resp_name === 'TransportModeRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '进入运输模式失败' } }) - } - } else if (data.resp_name === 'RefreshCdNumRes') { - if (data.resp_info.res_code === 0) { - - } else { - commit('setData', { name: 'printer_error', data: { type: 'error', notify: '刷新CD数量失败' } }) + } else { + commit('setData', { name: 'printer_error', data: { type: 'error', notify: data.resp_info.res_msg || '操作失败' } }) + } } } else { // 未知消息 - console.log('未知消息: ' + JSON.stringify(data)) + console.log('报错信息: ' + JSON.stringify(data)) } }, // 心跳检测重连 diff --git a/src/renderer/store/modules/user.js b/src/renderer/store/modules/user.js index 80377e5..5d062fd 100644 --- a/src/renderer/store/modules/user.js +++ b/src/renderer/store/modules/user.js @@ -21,7 +21,7 @@ const user = { roles: ['admin'], oneLogin: true, // 高级设置 - setForm: setFormDefault, + setForm: localStorage.getItem('setForm') ? JSON.parse(localStorage.getItem('setForm')) : setFormDefault, }, mutations: { diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index 69de0c7..7493fe6 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -753,7 +753,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -776,7 +776,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -799,7 +799,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -822,7 +822,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -845,7 +845,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -874,7 +874,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -1085,13 +1085,13 @@ export default { }, // 跳转设置 goSet(e) { - if ((that.cd_list[0]&&that.cd_list[0].copy_scheduler) || (that.cd_list[1]&&that.cd_list[1].copy_scheduler)) { - that.$message({ - message: '正在任务中，无法进行操作', - type: 'warning' - }) - return - } + // if ((that.cd_list[0]&&that.cd_list[0].copy_scheduler) || (that.cd_list[1]&&that.cd_list[1].copy_scheduler)) { + // that.$message({ + // message: '正在任务中，无法进行操作', + // type: 'warning' + // }) + // return + // } that.$router.push({ path: e }) }, // 退出登录 diff --git a/src/renderer/views/manage/index.vue b/src/renderer/views/manage/index.vue index 7b7ed6f..013331e 100644 --- a/src/renderer/views/manage/index.vue +++ b/src/renderer/views/manage/index.vue @@ -409,7 +409,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -451,7 +451,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -493,7 +493,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -517,7 +517,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -540,7 +540,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -563,7 +563,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -605,7 +605,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -634,7 +634,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -657,7 +657,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -680,7 +680,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -703,7 +703,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -726,7 +726,7 @@ export default { }) .then(() => { that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -755,7 +755,7 @@ export default { that.cdClose(e) }, 5000) that.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) }) @@ -772,7 +772,7 @@ export default { }) .then(() => { this.$message({ - message: '执行成功', + message: '已发送指令', type: 'success' }) })