Merge branch 'main' of https://gitea.frp.extimaging.com/XCKJ/irc_web into main

.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
 

.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
 

.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
 

.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
 

.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
 

.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
 

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();

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({

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"

src/views/trials/trials-myinfo/password.vue

@@ -9,7 +9,7 @@
       label-position="right"
       :model="password"
       :rules="passwordFormRules"
-      label-width="100px"
+      label-width="180px"
     >
       <!-- 旧密码 -->
       <el-form-item

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 }}
           </el-radio>
         </el-radio-group>
       </el-form-item>

src/views/trials/trials-panel/setting/trial-config/components/logicalConfig.vue

@@ -683,7 +683,6 @@
           class="demo-form-inline"
           :rules="addBodyPartrules"
         >
-          <!--受试者编号-->
           <el-form-item
             :label="$t('trials:setting:form:bodyPart')"
             prop="bodyPartStr"
@@ -697,6 +696,14 @@
             ></el-input>
             <span class="errTip" v-if="errMessage">{{ errMessage }}</span>
           </el-form-item>
+          <el-form-item
+            :label="$t('trials:setting:form:bodyPart')"
+            style="display: none"
+            prop="bodyPartStr"
+            label-width="150px"
+          >
+            <el-input clearable :maxlength="50"></el-input>
+          </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">