From c2dc340a1defbd4688e708ceb68b692716bfea07 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 25 Mar 2024 16:22:45 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=87=E4=BB=B6=E6=B0=B4=E5=8D=B0=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.prod | 3 +++ .env.uat | 3 +++ .env.usa | 3 +++ package.json | 2 +- src/main.js | 1 + static/pdfjs/web/viewer.js | 3 ++- 7 files changed, 16 insertions(+), 2 deletions(-) diff --git a/.env.development b/.env.development index 0819ca53..1795b787 100644 --- a/.env.development +++ b/.env.development @@ -35,6 +35,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$! # 是否开启文档签署验证 true:是 false:否 VUE_APP_WORD_FOR_PERMISSION = false +# 公司名称 +VUE_APP_COMPANY_NAME = "Extensive Imaging" + # dicom文件地址 VUE_APP_DICOM_PATH = 'https://zyypacs.oss-cn-shanghai.aliyuncs.com' diff --git a/.env.prod b/.env.prod index 9b2fc4e8..49d97ae9 100644 --- a/.env.prod +++ b/.env.prod @@ -29,6 +29,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$! # 是否开启文档签署验证 true:是 false:否 VUE_APP_WORD_FOR_PERMISSION = true +# 公司名称 +VUE_APP_COMPANY_NAME = "Extensive Imaging" + # dicom文件地址 # VUE_APP_DICOM_PATH = 'http://101.132.193.237:7080' VUE_APP_DICOM_PATH = 'https://zyypacs-prod.oss-cn-shanghai.aliyuncs.com' diff --git a/.env.uat b/.env.uat index e0ad567f..1f04b231 100644 --- a/.env.uat +++ b/.env.uat @@ -31,6 +31,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$! # 是否开启文档签署验证 true:是 false:否 VUE_APP_WORD_FOR_PERMISSION = true +# 公司名称 +VUE_APP_COMPANY_NAME = "Extensive Imaging" + # dicom文件地址 VUE_APP_DICOM_PATH = 'https://zyypacs-uat.oss-cn-shanghai.aliyuncs.com' diff --git a/.env.usa b/.env.usa index b076b647..833c876c 100644 --- a/.env.usa +++ b/.env.usa @@ -28,6 +28,9 @@ VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$! # 是否开启文档签署验证 true:是 false:否 VUE_APP_WORD_FOR_PERMISSION = true +# 公司名称 +VUE_APP_COMPANY_NAME = "Elevate Imaging" + # dicom文件地址 VUE_APP_DICOM_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com' diff --git a/package.json b/package.json index d568f644..21b0480e 100644 --- a/package.json +++ b/package.json @@ -2,7 +2,7 @@ "name": "EICS", "version": "1.0.0", "scripts": { - "dev": "vue-cli-service serve --open", + "dev": "vue-cli-service serve --open --mode development", "build": "vue-cli-service build", "build:prod": "vue-cli-service build --mode prod", "build:uat": "vue-cli-service build --mode uat", diff --git a/src/main.js b/src/main.js index d5e5d04e..29ba2ca3 100644 --- a/src/main.js +++ b/src/main.js @@ -332,6 +332,7 @@ async function VueInit () { } const h = _vm.$createElement /* eslint-disable */ + window.VUE_APP_COMPANY_NAME = process.env.VUE_APP_COMPANY_NAME; waitOperate(eval(process.env.VUE_APP_LOGOUT_FOR_PERMISSION) ? () => { var lang = zzSessionStorage.getItem('lang')?zzSessionStorage.getItem('lang'):'zh' if ( _vm.$route.path === '/ReviewersResearchForm' || _vm.$route.path === '/ReviewersResearch' || _vm.$route.path === '/login' || _vm.$route.path === '/researchForm' || _vm.$route.path === '/researchLogin' || _vm.$route.path === '/email-recompose' || _vm.$route.path === '/recompose' || _vm.$route.path === '/resetpassword' || _vm.$route.path === '/error') { diff --git a/static/pdfjs/web/viewer.js b/static/pdfjs/web/viewer.js index 3bc2cac4..b964aba8 100644 --- a/static/pdfjs/web/viewer.js +++ b/static/pdfjs/web/viewer.js @@ -12370,7 +12370,8 @@ class PDFPageView { c.style.fontWeight = '900' c.style.color = "rgba(0, 191, 255, 0.1)"; // c.innerText = text;//text为水印内容,可以在viewer.html中传入,也可以直接替换成固定的字符串如:c.innerText = "这是一个水印"; - c.innerText = `Extensive Imaging_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`; + console.log(window.VUE_APP_COMPANY_NAME) + c.innerText = `${window.VUE_APP_COMPANY_NAME }_${obj.userName}\n${new Date().format('yyyy-MM-dd')}`; cover.appendChild(c); } }