From 6bfe21d17f09c7114f191205e8d456d5de226039 Mon Sep 17 00:00:00 2001 From: qq787203167 <787203167@qq.com> Date: Wed, 2 Mar 2022 17:08:30 +0800 Subject: [PATCH 1/9] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jero-web/src/App.vue | 2 +- jero-web/src/assets/watermark.js | 10 +- jero-web/src/config/router.config.js | 5 + .../library/docDetail/index.vue | 115 +++++++++++------- .../views/documentManage/library/index.vue | 3 +- 5 files changed, 90 insertions(+), 45 deletions(-) diff --git a/jero-web/src/App.vue b/jero-web/src/App.vue index 80defc7d6..bf2d43e47 100644 --- a/jero-web/src/App.vue +++ b/jero-web/src/App.vue @@ -94,7 +94,7 @@ #app { height: 100%; } - +.doc-detail{background: #fff} .ant-layout { background: transparent !important; } diff --git a/jero-web/src/assets/watermark.js b/jero-web/src/assets/watermark.js index 65874022f..c35e34285 100644 --- a/jero-web/src/assets/watermark.js +++ b/jero-web/src/assets/watermark.js @@ -11,8 +11,14 @@ let setWatermark = (str) => { cans.fillStyle = '#f4f4f4' cans.textAlign = 'left' cans.textBaseline = 'Middle' - cans.fillText(str, 10,120) - document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + cans.fillText(str, 10, 120) + if (document.getElementsByClassName('ant-layout-content') && document.getElementsByClassName('ant-layout-content').length > 0) { + document.getElementsByClassName('ant-layout-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + + } else { + document.getElementsByClassName('detail-content')[0].style.background = 'url(' + can.toDataURL('image/png') + ') left top repeat' + + } return id } diff --git a/jero-web/src/config/router.config.js b/jero-web/src/config/router.config.js index 30d383659..cae396a53 100644 --- a/jero-web/src/config/router.config.js +++ b/jero-web/src/config/router.config.js @@ -320,6 +320,11 @@ export const constantRouterMap = [ name: 'alteration', component: () => import(/* webpackChunkName: "user" */ '@/views/user/alteration/Alteration') }, + { + path: '/docManage/library/detail', + name: 'docIndex', + component: () => import(/* webpackChunkName: "user" */ '@/views/documentManage/library/docDetail/index') + }, ] }, diff --git a/jero-web/src/views/documentManage/library/docDetail/index.vue b/jero-web/src/views/documentManage/library/docDetail/index.vue index b7aac6aa6..a728dd1ed 100644 --- a/jero-web/src/views/documentManage/library/docDetail/index.vue +++ b/jero-web/src/views/documentManage/library/docDetail/index.vue @@ -1,73 +1,86 @@