diff --git a/src/renderer/store/modules/chat.js b/src/renderer/store/modules/chat.js index 059ddbe..31a8329 100644 --- a/src/renderer/store/modules/chat.js +++ b/src/renderer/store/modules/chat.js @@ -355,6 +355,12 @@ const actions = { strong_list[info.strong_list[i].strong_pos] = info.strong_list[i] } info.strongList = strong_list + if (info.cover_flag) { + commit('setData', { name: 'printer_error', data: { type: 'error', notify: '设备门盖被打开,请关闭门盖。' } }) + } + if (info.calibration_flag) { + commit('setData', { name: 'printer_error', data: { type: 'error', notify: '请先校准设备。' } }) + } commit('setData', { name: 'printer_info', data: info }) // 驱动信息 } else if (data.resp_name === 'cd_info') { @@ -470,6 +476,55 @@ const actions = { } } } + // 执行错误提示 + } 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) { + + } 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 { // 未知消息 console.log('未知消息: ' + JSON.stringify(data)) diff --git a/src/renderer/views/dashboard/index.vue b/src/renderer/views/dashboard/index.vue index bd33e21..e1bb7a8 100644 --- a/src/renderer/views/dashboard/index.vue +++ b/src/renderer/views/dashboard/index.vue @@ -162,7 +162,7 @@ :class="{ device_status1: printer_info.printer_status === 'I', device_status2: printer_info.printer_status === 'B' || printer_info.printer_status === 'P', - device_status3: printer_info.cover_flag || printer_info.calibration_flag || printer_info.lack_ink || !isConnect || !serviceStatus + device_status3: printer_info.lack_ink || !isConnect || !serviceStatus }" >
@@ -548,13 +548,13 @@ export default { ...mapGetters(['name', 'roles']), runText() { let text = this.$store.state.chat.PrinterStatus[this.printer_info.printer_status] - if (this.printer_info.cover_flag) { - text = '设备门盖被打开,请关闭门盖。' - } - if (this.printer_info.calibration_flag) { - text = '请先校准设备' - this.runVal = 4 - } + // if (this.printer_info.cover_flag) { + // text = '设备门盖被打开,请关闭门盖。' + // } + // if (this.printer_info.calibration_flag) { + // text = '请先校准设备' + // this.runVal = 4 + // } if (this.printer_info.lack_ink) { text = '缺墨警告' } @@ -622,7 +622,8 @@ export default { that .$prompt('请输入管理员密码并点击确定以执行关闭服务操作', '温馨提示', { confirmButtonText: '确定', - cancelButtonText: '取消' + cancelButtonText: '取消', + inputType: 'password' }) .then(({ value }) => { that.serviceLoading = true diff --git a/src/renderer/views/manage/index.vue b/src/renderer/views/manage/index.vue index 5b36b80..7c7dbe4 100644 --- a/src/renderer/views/manage/index.vue +++ b/src/renderer/views/manage/index.vue @@ -12,14 +12,6 @@