From 1589efc6678d2aad0287a39c91ddc8a3a342b411 Mon Sep 17 00:00:00 2001 From: 24kycj <1637269896@qq.com> Date: Mon, 31 Mar 2025 20:33:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/App.vue | 127 ++++++++++++++++--------- src/renderer/store/modules/chat.js | 10 +- src/renderer/views/dashboard/index.vue | 82 ++++++---------- src/renderer/views/manage/index.vue | 73 +++++++------- 4 files changed, 150 insertions(+), 142 deletions(-) diff --git a/src/renderer/App.vue b/src/renderer/App.vue index 953bc9e..16d3a1c 100644 --- a/src/renderer/App.vue +++ b/src/renderer/App.vue @@ -19,66 +19,32 @@ export default { if (that.$store.getters.token) { that.$store.dispatch('chat/initWebSocket') // 初始化websocket } + this.showNotify() + this.showNotify() + this.showNotify() + this.showNotify() }, watch: { '$store.state.chat.printer_error': { handler(val) { let that = this - const currentTime = dayjs().format('HH:mm:ss'); + const currentTime = dayjs().format('HH:mm:ss') if (val.message) { if (that.errors.indexOf(val.message) === -1) { that.errors.push(val.message) - that.$message({ - message: val.message, - type: val.type, - onClose() { - that.errors.splice(that.errors.indexOf(val.message), 1) - } - }) + that.showNotify({ time: currentTime, message: val.message, ...val }) } } if (val.notify) { if (that.errors.indexOf(val.notify) === -1) { that.errors.push(val.notify) - that.$notify({ - title: '温馨提示：' + currentTime, - message: val.notify, - type: val.type, - duration: 0, - onClose() { - that.errors.splice(that.errors.indexOf(val.notify), 1) - } - }) + that.showNotify({ time: currentTime, message: val.notify, ...val }) } } if (val.confirm) { if (that.errors.indexOf(val.confirm) === -1) { that.errors.push(val.confirm) - that.$notify({ - title: '温馨提示：' + currentTime, - duration: 0, - showClose: false, - dangerouslyUseHTMLString: true, - message: `
${val.confirm}
重试
`, - onClick(event) { - if (val.req && val.req === 'continue_task') { - // 下一个任务 - that.$store.dispatch('chat/websocketsend', { - req_name: 'continue_task', - req_type: 1, - req_info: {} - }).then(() => { - - }).catch(() => { - - }) - } - this.close() - }, - onClose() { - that.errors.splice(that.errors.indexOf(val.confirm), 1) - } - }); + that.showNotify({ time: currentTime, message: val.confirm, ...val }) } } }, @@ -86,7 +52,76 @@ export default { immediate: true } }, - methods: {} + methods: { + showNotify(data) { + let that = this + let notifyInstance + function renderNotifyContent() { + let btns = [ + that.$createElement( + 'el-button', + { + props: { size: 'mini' }, + on: { + click: () => { + notifyInstance.close() + } + } + }, + '跳过' + ), + that.$createElement( + 'el-button', + { + props: { type: 'primary', size: 'mini' }, + style: { marginLeft: '10px' }, + on: { + click: () => { + that.errors.splice(that.errors.indexOf(data.message), 1) + notifyInstance.close() + } + } + }, + '确定' + ) + ] + if (data.confirm) { + btns[1] = that.$createElement( + 'el-button', + { + props: { type: 'primary', size: 'mini' }, + style: { marginLeft: '10px' }, + on: { + click: () => { + // 下一个任务 + that.$store + .dispatch('chat/websocketsend', { + req_name: 'continue_task', + req_type: 1, + req_info: {} + }) + .then(() => {}) + .catch(() => {}) + that.errors.splice(that.errors.indexOf(data.message), 1) + notifyInstance.close() + } + } + }, + '重试' + ) + } + return that.$createElement('div', [that.$createElement('p', { style: 'margin-top: 8px; line-height: 24px' }, data.message), that.$createElement('div', { style: 'margin-top: 8px; text-align: right' }, btns)]) + } + // 创建通知实例 + notifyInstance = that.$notify({ + title: '温馨提示：' + data.time, + message: renderNotifyContent(), // 初始化时直接生成内容 + duration: 0, + type: data.type, + showClose: false, + }) + } + } }