From 8fa746e42ee56985f946416f360beed6fa78b4b7 Mon Sep 17 00:00:00 2001 From: xuhuajiao <13476289682@163.com> Date: Wed, 20 Mar 2024 17:11:35 +0800 Subject: [PATCH] =?UTF-8?q?=E9=A2=84=E8=A7=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/archivesManage/library.js | 11 ++- src/components/renders.js | 4 +- src/utils/index.js | 1 + src/utils/waterMark.js | 8 +- src/vendors/image/ImageViewer.vue | 2 +- src/vendors/ofd/OfdView.vue | 13 +-- src/vendors/pdf/PdfView.vue | 4 +- src/vendors/text/CodeViewer.vue | 8 +- src/vendors/xlsx/Table.vue | 6 +- .../module/uploadFile/index.vue | 5 +- src/views/preview/index.vue | 93 ++++++++++++++----- 11 files changed, 107 insertions(+), 48 deletions(-) diff --git a/src/api/archivesManage/library.js b/src/api/archivesManage/library.js index 9ab74e8..6a24c72 100644 --- a/src/api/archivesManage/library.js +++ b/src/api/archivesManage/library.js @@ -57,6 +57,14 @@ export function FetchIsAuthByLookType(params) { }) } +export function FetchBase64ByFileId(params) { + return request({ + url: 'api/control/getBase64ByFileId', + method: 'get', + params + }) +} + export default { FetchInitContorlView, FetchPrintData, @@ -64,5 +72,6 @@ export default { FetchBusinessFlowHistory, FetchBusinessFlowDetails, FetchMainData, - FetchIsAuthByLookType + FetchIsAuthByLookType, + FetchBase64ByFileId } diff --git a/src/components/renders.js b/src/components/renders.js index 7dc31e1..dde1711 100644 --- a/src/components/renders.js +++ b/src/components/renders.js @@ -100,8 +100,8 @@ const handlers = [ { accepts: ['error'], handler: async(buffer, target, type) => { - target.innerHTML = `
不支持.${type}格式的在线预览,请下载后预览或转换为支持的格式
-
支持docx, xlsx, pptx, pdf, ofd 以及纯文本格式和各种图片格式的在线预览
` + target.innerHTML = `
不支持.${type}格式的在线预览,请下载后预览或转换为支持的格式
+
支持docx, xlsx, pptx, pdf, ofd 以及纯文本格式和各种图片格式的在线预览
` return VueWrapper(target) } } diff --git a/src/utils/index.js b/src/utils/index.js index c5e1ad6..e806a38 100644 --- a/src/utils/index.js +++ b/src/utils/index.js @@ -461,3 +461,4 @@ export function saveByteArray(fileName, byte) { link.download = fileName link.click() } + diff --git a/src/utils/waterMark.js b/src/utils/waterMark.js index c321bd8..279eb86 100644 --- a/src/utils/waterMark.js +++ b/src/utils/waterMark.js @@ -5,15 +5,15 @@ export const watermark = (settings, className, type) => { watermark_txt: settings.watermark_txt, watermark_x: 20, // 水印起始位置x轴坐标 watermark_y: 10, // 水印起始位置Y轴坐标 - watermark_rows: 10, // 水印行数 + watermark_rows: 6, // 水印行数 watermark_cols: 10, // 水印列数 - watermark_x_space: 50, // 水印x轴间隔 - watermark_y_space: 100, // 水印y轴间隔 + watermark_x_space: 100, // 水印x轴间隔 + watermark_y_space: 140, // 水印y轴间隔 watermark_color: settings.watermark_color, // 水印字体颜色 watermark_alpha: settings.watermark_alpha, // 水印透明度 watermark_fontsize: settings.watermark_fontsize || '15px', // 水印字体大小 watermark_font: '微软雅黑', // 水印字体 - watermark_width: 130, // 水印宽度 + watermark_width: 200, // 水印宽度 watermark_height: 40, // 水印长度 watermark_angle: 15, // 水印倾斜度数 watermark_position: settings.watermark_position || 'absolute' diff --git a/src/vendors/image/ImageViewer.vue b/src/vendors/image/ImageViewer.vue index 066e400..a763807 100644 --- a/src/vendors/image/ImageViewer.vue +++ b/src/vendors/image/ImageViewer.vue @@ -1,5 +1,5 @@ diff --git a/src/vendors/ofd/OfdView.vue b/src/vendors/ofd/OfdView.vue index 4c8bcc6..f008646 100644 --- a/src/vendors/ofd/OfdView.vue +++ b/src/vendors/ofd/OfdView.vue @@ -1,8 +1,8 @@