From fa156c49aceffc418ae02188acc86d10301ca4f7 Mon Sep 17 00:00:00 2001 From: "wu.jian2" Date: Tue, 12 Mar 2024 10:03:38 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E4=BD=BF=E7=94=A8?= =?UTF-8?q?=E8=A7=86=E9=A2=91=E7=BB=84=E4=BB=B6=E6=92=AD=E6=94=BEmp4?= =?UTF-8?q?=E8=B5=84=E6=BA=90=EF=BC=8C=E8=B0=83=E7=94=A8=E7=94=9F=E6=88=90?= =?UTF-8?q?=E5=B0=81=E9=9D=A2=E6=96=B9=E6=B3=95=E5=A4=B1=E8=B4=A5=EF=BC=8C?= =?UTF-8?q?=E5=AF=BC=E8=87=B4=E5=A4=A7=E5=B1=8F=E6=95=B0=E6=8D=AE=E6=97=A0?= =?UTF-8?q?=E6=B3=95=E4=BF=9D=E5=AD=98=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BigScreenDesign/PageDesignTop.vue | 36 ++++++++----------- data-room-ui/packages/BizComponent/index.vue | 23 +++++------- 2 files changed, 24 insertions(+), 35 deletions(-) diff --git a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue index b67801b4..00519a77 100644 --- a/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue +++ b/data-room-ui/packages/BigScreenDesign/PageDesignTop.vue @@ -446,26 +446,20 @@ export default { try { dataUrl = await toJpeg(node, { quality: 0.2 }) } catch (error) { - if (error.type === 'error') { - // 判断的error.currentTarget是img标签,如果是的,就弹出消息说是图片跨域 - if (error.currentTarget.tagName.toLowerCase() === 'img') { - // 确认框 - this.$confirm('保存封面失败,我们将使用上次保存的封面,它不会影响其他数据的保存。由于图片资源跨域问题导致使用toDataURL API生成图片失败,我们需要将图片上传到资源库。然后在组件中使用资源库中的图片资源,以确保没有跨域问题。', '提示', { - confirmButtonText: '确定', - showCancelButton: false, - type: 'warning', - customClass: 'bs-el-message-box' - }).then(async () => { - res = await saveScreen(pageInfo) - this.$message.success('保存成功') - }).catch(async () => { - res = await saveScreen(pageInfo) - this.$message.success('保存成功') - }) - } - } else { - this.$message.warning('出现未知错误,请重试') - } + // 判断的error.currentTarget是img标签,如果是的,就弹出消息说是图片跨域 + // 确认框 + this.$confirm('保存封面失败,我们将使用上次保存的封面,不会影响大屏数据的保存。可能是因为图片、视频资源跨域了导致使用toDataURL API生成图片失败,我们可以将资源上传到资源库。然后在组件中使用资源库中的图片资源,以确保没有跨域问题。', '提示', { + confirmButtonText: '确定', + showCancelButton: false, + type: 'warning', + customClass: 'bs-el-message-box' + }).then(async () => { + res = await saveScreen(pageInfo) + this.$message.success('保存成功') + }).catch(async () => { + res = await saveScreen(pageInfo) + this.$message.success('保存成功') + }) } if (dataUrl) { if (showSize(dataUrl) > 200) { @@ -586,7 +580,7 @@ export default { }).then(() => { }).catch(() => { }) } } else { - this.$message.warning('出现未知错误,请重试') + this.$message.warning('出现未知错误,请重试2') } }) } diff --git a/data-room-ui/packages/BizComponent/index.vue b/data-room-ui/packages/BizComponent/index.vue index 3733f736..d85b402f 100644 --- a/data-room-ui/packages/BizComponent/index.vue +++ b/data-room-ui/packages/BizComponent/index.vue @@ -415,21 +415,16 @@ export default { this.loading = false }) .catch((error) => { + console.info(error) this.loading = false - if (error.type === 'error') { - // 判断的error.currentTarget是img标签,如果是的,就弹出消息说是图片跨域 - if (error.currentTarget.tagName.toLowerCase() === 'img') { - // 确认框 - this.$confirm('图片资源跨域导致使用toDataURL API生成图片失败,请将图片上传到资源库,然后在组件中使用资源库中的图片资源,确保没有跨域问题。', '提示', { - confirmButtonText: '确定', - showCancelButton: false, - type: 'warning', - customClass: 'bs-el-message-box' - }).then(() => { }).catch(() => { }) - } - } else { - this.$message.warning('出现未知错误,请重试') - } + // 判断的error.currentTarget是img标签,如果是的,就弹出消息说是图片跨域 + // 确认框 + this.$confirm('图片、视频资源跨域导致使用toDataURL API生成图片失败,请将资源上传到资源库,然后在组件中使用资源库中的图片资源,确保没有跨域问题。', '提示', { + confirmButtonText: '确定', + showCancelButton: false, + type: 'warning', + customClass: 'bs-el-message-box' + }).then(() => { }).catch(() => { }) }) }, pageJump () {