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/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();
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({
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"
>
{{ item.label }}
+ >
+ {{ item.label }}
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 }}
+
+
+