From 478e170578e7a868d21c10c6dda57007acb4ead1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8C=83=E5=BC=BA=E5=BC=BA?= <787203167> Date: Tue, 12 Mar 2024 18:49:35 +0800 Subject: [PATCH] =?UTF-8?q?=20=E6=96=B0=E6=97=A7=E6=8B=86=E5=88=86?= =?UTF-8?q?=E5=8D=95=E5=AF=B9=E6=AF=94--=E5=8F=91=E8=B5=B7=E6=AF=94?= =?UTF-8?q?=E5=AF=B9--=E6=96=B0=E6=97=A7=E6=9D=A1=E6=AC=BE=E7=9B=AE?= =?UTF-8?q?=E5=BD=95=EF=BC=8C=E5=B1=95=E7=A4=BA=E4=B8=8D=E5=AE=8C=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/ImportSplitResultModal.vue | 15 ++++++++++++++- .../documentSplit/modules/SplitClauseDetail.vue | 7 ++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue index 0da4d16..60d1c2e 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/ImportSplitResultModal.vue @@ -168,7 +168,20 @@ export default { this.$emit('ok') this.close() } else { - this.$message.warning(res.message) + this.$info({ + closeable: true, // 展示右上角关闭 + cancelText: '知道了', + title: '提示', + content: (h) => { + const contentArr = res.message.split('
') + const contentDomArr = [] + for (const content of contentArr) { + contentDomArr.push(h('div', {}, content)) + } + return contentDomArr + } + }) + // this.$message.warning(res.message) } }).finally(() => { this.confirmLoading = false diff --git a/jero-web/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue b/jero-web/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue index 898cf30..1e9e288 100644 --- a/jero-web/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue +++ b/jero-web/src/views/documentTool/documentSplit/modules/SplitClauseDetail.vue @@ -26,7 +26,6 @@ export default { methods: { open (val) { this.contentVisible = true - console.log(val) this.contentValue = window.getHtml(val) }, handleCancel () { @@ -43,4 +42,10 @@ export default { margin: 0 -24px; padding: 0 24px; } + /deep/.word-table{ + margin-top: 20px; + } + /deep/.wordImg{ + margin-top: 20px; + }