From cfb54d9c9c99dc2fbd3afab4d5694cf789d9558e Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 17 Jun 2024 10:50:33 +0800 Subject: [PATCH 1/5] =?UTF-8?q?mfa=E5=9B=BD=E9=99=85=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/MFA/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue index 71f92718..ff5f2b7d 100644 --- a/src/components/MFA/index.vue +++ b/src/components/MFA/index.vue @@ -135,7 +135,7 @@ export default { this.loading = false; if (res.IsSuccess) { if (this.status === "login") { - this.$message.success("mfa:message:verifySuccess"); + this.$message.success(this.$t("mfa:message:verifySuccess")); } this.$emit("success", this.form.UserId); this.cancel(); From e3af442b8f68a6cdfecfd4b5bfbb77aad1ac1c25 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 17 Jun 2024 12:23:35 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E9=98=85=E7=89=87=E8=A7=84=E5=88=99?= =?UTF-8?q?=E5=BD=B1=E5=83=8F=E7=AD=9B=E9=80=89=E9=80=89=E9=A1=B9=E9=A1=BA?= =?UTF-8?q?=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/reading-unit/components/ReadingRules.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue index 6ba7bb32..f427170f 100644 --- a/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue +++ b/src/views/trials/trials-panel/setting/reading-unit/components/ReadingRules.vue @@ -70,7 +70,8 @@ :label="item.value" v-for="item in $d.YesOrNoModality" :key="item.id" - >{{ item.label }} + > + {{ item.label }} From 5967fd19b208f2130ba5f0ff6a7a30d259365df2 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 17 Jun 2024 14:55:49 +0800 Subject: [PATCH 3/5] =?UTF-8?q?MFA=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 3 +++ .env.prod | 3 +++ .env.production | 3 +++ .env.prop | 3 +++ .env.uat | 3 +++ .env.usa | 3 +++ src/main.js | 2 +- 7 files changed, 19 insertions(+), 1 deletion(-) diff --git a/.env.development b/.env.development index 1795b787..1cd11a20 100644 --- a/.env.development +++ b/.env.development @@ -14,6 +14,9 @@ VUE_CLI_BABEL_TRANSPILE_MODULES = false # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false diff --git a/.env.prod b/.env.prod index 49d97ae9..2f8d7ea6 100644 --- a/.env.prod +++ b/.env.prod @@ -8,6 +8,9 @@ VUE_APP_BASE_PATH = '/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.production b/.env.production index 00537958..38fd6f0d 100644 --- a/.env.production +++ b/.env.production @@ -9,6 +9,9 @@ VUE_APP_IS_TEST = true # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false diff --git a/.env.prop b/.env.prop index 79660dba..20a7b9ee 100644 --- a/.env.prop +++ b/.env.prop @@ -5,6 +5,9 @@ NODE_ENV = 'prop' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.uat b/.env.uat index 1f04b231..b4586518 100644 --- a/.env.uat +++ b/.env.uat @@ -10,6 +10,9 @@ VUE_APP_BASE_PATH = '/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = true +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = false + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = true diff --git a/.env.usa b/.env.usa index a510c10c..dd7bcc34 100644 --- a/.env.usa +++ b/.env.usa @@ -7,6 +7,9 @@ VUE_APP_BASE_PATH = 'https://ei-code-prod.s3.amazonaws.com/2024-04-30/' # 是否开启登陆限制 true:是 false:否 VUE_APP_LOGIN_FOR_PERMISSION = false +# 是否开启长时间无操作锁定弹框MFA验证 true:是 false:否 +VUE_APP_LOCK_FOR_PERMISSION_MFA = true + # 是否开启长时间无操作锁定弹框 true:是 false:否 VUE_APP_LOCK_FOR_PERMISSION = false diff --git a/src/main.js b/src/main.js index e6053109..638ad4af 100644 --- a/src/main.js +++ b/src/main.js @@ -431,7 +431,7 @@ async function VueInit() { done() }, 500) } - if (process.env.VUE_APP_OSS_CONFIG_BUCKET === 'zyypacs-usa') { + if (eval(process.env.VUE_APP_LOCK_FOR_PERMISSION_MFA)) { sendMFAEmail({ UserId: my_userid, MfaType: 1 }).then((res) => { done(); Vue.prototype.$MFA({ From 8a5eaff5f6d0c917ce007fe7d6c4b7dd40452cc4 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Mon, 17 Jun 2024 15:02:15 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E8=8B=B1?= =?UTF-8?q?=E6=96=87=E6=8D=A2=E8=A1=8C=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/forgetpassword/index.vue | 2 +- src/views/trials/trials-myinfo/password.vue | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/forgetpassword/index.vue b/src/views/forgetpassword/index.vue index 362aad18..1498f6e1 100644 --- a/src/views/forgetpassword/index.vue +++ b/src/views/forgetpassword/index.vue @@ -13,7 +13,7 @@ ref="resetForm" v-loading="formLoading" :model="form" - label-width="100px" + label-width="130px" :rules="rules" class="demo-ruleForm" size="small" diff --git a/src/views/trials/trials-myinfo/password.vue b/src/views/trials/trials-myinfo/password.vue index 4734c4da..28a4956c 100644 --- a/src/views/trials/trials-myinfo/password.vue +++ b/src/views/trials/trials-myinfo/password.vue @@ -9,7 +9,7 @@ label-position="right" :model="password" :rules="passwordFormRules" - label-width="100px" + label-width="180px" > Date: Mon, 17 Jun 2024 16:17:33 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E6=A3=80=E6=9F=A5=E9=83=A8=E4=BD=8D?= =?UTF-8?q?=E5=8D=95=E8=A1=A8=E5=8D=95=E5=9B=9E=E8=BD=A6=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../setting/trial-config/components/logicalConfig.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue index 0c9dd9a4..f91029ec 100644 --- a/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue +++ b/src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue @@ -683,7 +683,6 @@ class="demo-form-inline" :rules="addBodyPartrules" > - {{ errMessage }} + + +