diff --git a/.env.usa b/.env.usa index fb686483..55f99ac9 100644 --- a/.env.usa +++ b/.env.usa @@ -2,28 +2,28 @@ ENV = 'usa' NODE_ENV = 'usa' # base public path -VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-10/' +VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-07-11/' # 是否开启登陆限制 true:是 false:否 -VUE_APP_LOGIN_FOR_PERMISSION = false +VUE_APP_LOGIN_FOR_PERMISSION = true # 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION_MFA = true # 是否开启长时间无操作锁定弹框 true:是 false:否 -VUE_APP_LOCK_FOR_PERMISSION = false +VUE_APP_LOCK_FOR_PERMISSION = true # 无操作锁定弹框判断时间 单位:秒 VUE_APP_LOCK_FOR_TIME = 900 # 是否开启长时间无操作登出 true:是 false:否 -VUE_APP_LOGOUT_FOR_PERMISSION = false +VUE_APP_LOGOUT_FOR_PERMISSION = true # 无操作锁定弹框判断时间 单位:秒 VUE_APP_LOGOUT_FOR_TIME = 1800 # 是否开启密码正则验证 true:是 false:否 -VUE_APP_PASSWORD_FOR_PERMISSION = false +VUE_APP_PASSWORD_FOR_PERMISSION = true # 是否开启密码正则验证 true:是 false:否 VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ diff --git a/.env.usa_prod b/.env.usa_prod new file mode 100644 index 00000000..5a6ac5da --- /dev/null +++ b/.env.usa_prod @@ -0,0 +1,46 @@ +# just a flag +ENV = 'usa' +NODE_ENV = 'usa' +# base public path +VUE_APP_BASE_PATH = 'https://ei-med-s3-code.s3.amazonaws.com/2024-07-11/' + +# 是否开启登陆限制 true:是 false:否 +VUE_APP_LOGIN_FOR_PERMISSION = true + +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = true + +# 是否开启长时间无操作锁定弹框 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION = true + +# 无操作锁定弹框判断时间 单位:秒 +VUE_APP_LOCK_FOR_TIME = 900 + +# 是否开启长时间无操作登出 true:是 false:否 +VUE_APP_LOGOUT_FOR_PERMISSION = true + +# 无操作锁定弹框判断时间 单位:秒 +VUE_APP_LOGOUT_FOR_TIME = 1800 + +# 是否开启密码正则验证 true:是 false:否 +VUE_APP_PASSWORD_FOR_PERMISSION = true + +# 是否开启密码正则验证 true:是 false:否 +VUE_APP_PASSWORD_FOR_REGULAR = ^(?=.*[a-z])(?=.*[A-Z])(?=.*[0-9])(?=.*[-_.@^+\$!%#*?&\$~])[A-Za-z0-9-~_.@^+\$~!%#*?&]{8,32}$ + +# 是否开启文档签署验证 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' + +VUE_APP_DICOM_USA_PATH = 'https://zyypacs-usa.oss-us-west-1.aliyuncs.com' + +VUE_APP_OSS_CONFIG_REGION = 'oss-us-west-1' + +VUE_APP_OSS_CONFIG_BUCKET = 'zyypacs-usa' + +VUE_APP_OSS_PATH = '/usa/dist' diff --git a/package.json b/package.json index 4ed17b88..f3578eb6 100644 --- a/package.json +++ b/package.json @@ -7,6 +7,7 @@ "build:prod": "vue-cli-service build --mode prod", "build:uat": "vue-cli-service build --mode uat", "build:usa": "vue-cli-service build --mode usa", + "build:usa_prod": "vue-cli-service build --mode usa_prod", "pre": "vue-cli-service build --mode pre", "i18n": "npm run i18n:zh && npm run i18n:en", "i18n:zh": "node i18nGenerate.js lang=zh keyCol=5 valCol=6", diff --git a/public/favicon.ico b/public/favicon.ico index 70e9d37f..68177d68 100644 Binary files a/public/favicon.ico and b/public/favicon.ico differ diff --git a/src/assets/title-logo.png b/src/assets/title-logo.png index 37531211..fa09d218 100644 Binary files a/src/assets/title-logo.png and b/src/assets/title-logo.png differ diff --git a/src/icons/svg/login-bg.svg b/src/icons/svg/login-bg.svg new file mode 100644 index 00000000..7fe7c3cb --- /dev/null +++ b/src/icons/svg/login-bg.svg @@ -0,0 +1,781 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/icons/svg/login-logo.svg b/src/icons/svg/login-logo.svg new file mode 100644 index 00000000..1778278a --- /dev/null +++ b/src/icons/svg/login-logo.svg @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/utils/dcmUpload/anonymization.js b/src/utils/dcmUpload/anonymization.js index e528b54f..5f70554e 100644 --- a/src/utils/dcmUpload/anonymization.js +++ b/src/utils/dcmUpload/anonymization.js @@ -61,12 +61,14 @@ export const anonymization = function (file, config) { const blob = new Blob([bufferArray], { type: 'application/octet-stream' }) resolve({ blob, pixelDataElement }) } catch (err) { + console.log(file, 'warning') console.log(err) resolve(false); } }; reader.readAsArrayBuffer(file); } catch (e) { + console.log(file, 'warning') console.log(e) reject(e) } diff --git a/src/utils/dcmUpload/dcmUpload.js b/src/utils/dcmUpload/dcmUpload.js index 5399e583..56ab4599 100644 --- a/src/utils/dcmUpload/dcmUpload.js +++ b/src/utils/dcmUpload/dcmUpload.js @@ -19,6 +19,7 @@ export const dcmUpload = async function (name, file, config) { } catch (e) { + console.log(file, 'warning') resolve(false) console.log(e) } diff --git a/src/utils/oss.js b/src/utils/oss.js index 14f8c100..742d587d 100644 --- a/src/utils/oss.js +++ b/src/utils/oss.js @@ -2,10 +2,8 @@ const OSS = require('ali-oss') const router = require('@/router'); const Minio = require('minio') const stream = require('stream') -console.log(Minio) import Vue from 'vue' -const { GenerateSTS, GetObjectStoreToken } = require('../api/user.js') -import { getToken } from '@/utils/auth' +const { GetObjectStoreToken } = require('../api/user.js') Vue.prototype.OSSclientConfig = { } diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 095822bc..257ba98c 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -211,8 +211,6 @@ import TopLang from "./topLang"; // import NoticeMarquee from '../trials/trials-layout/components/noticeMarquee' import Vcode from "vue-puzzle-vcode"; import Img1 from "@/assets/pic-2.png"; -import loginBg from "@/assets/icons/svg/login-bg.svg"; -import loginLogo from "@/assets/icons/svg/login-logo.svg"; export default { name: "Login", components: { TopLang, Vcode }, @@ -256,8 +254,6 @@ export default { isShow: false, showCode: false, Img1, - loginBg, - loginLogo, }; }, computed: { @@ -407,7 +403,7 @@ export default { /* 修复input 背景不协调 和光标变色 */ $bg: #283443; -$light_gray: #0093dd; +$light_gray: #909399; $cursor: #fff; // @supports (-webkit-mask: none) and (not (cater-color: $cursor)) { @@ -537,7 +533,7 @@ $light_gray: #606266; .title-container { // margin-bottom: 50px; text-align: center; - margin-top: 18%; + margin-top: 20%; .title { font-size: 35px; color: $light_gray; diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue index 2414a4de..ba07ac88 100644 --- a/src/views/system/menu/index.vue +++ b/src/views/system/menu/index.vue @@ -1,21 +1,38 @@ diff --git a/src/views/system/role/components/RoleForm.vue b/src/views/system/role/components/RoleForm.vue index 46aa2bc0..bd79682a 100644 --- a/src/views/system/role/components/RoleForm.vue +++ b/src/views/system/role/components/RoleForm.vue @@ -16,13 +16,17 @@ - + {{ item.label }} + >{{ item.label }} @@ -38,7 +42,11 @@ - + @@ -58,9 +66,23 @@ - 展开/折叠 - 全选/全不选 - 父子联动 + {{ $t("system:role:form:checkbox:menuExpand") }} + {{ $t("system:role:form:checkbox:menuNodeAll") }} + {{ + $t("system:role:form:checkbox:menuCheckStrictly") + }} diff --git a/src/views/trials/trials-layout/components/noticeMarquee.vue b/src/views/trials/trials-layout/components/noticeMarquee.vue index 5f9a94be..4b54f77b 100644 --- a/src/views/trials/trials-layout/components/noticeMarquee.vue +++ b/src/views/trials/trials-layout/components/noticeMarquee.vue @@ -1,6 +1,6 @@