From ab65a9f1c7e9f991101d11896fa93ff24522cd3a Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 31 Jul 2024 11:17:32 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E9=98=85=E7=89=87=E5=8D=95=E5=85=83?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98=E9=85=8D=E7=BD=AE=E9=97=AE=E9=A2=98=E5=90=8D?=
 =?UTF-8?q?=E7=A7=B0=E4=B8=AD=E8=8B=B1=E6=96=87=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reading-unit/components/QuestionsForm.vue        | 11 +++++++++--
 .../setting/reading-unit/components/TableQsForm.vue  | 12 +++++++++---
 2 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
index f77b165b..e6d93f1d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionsForm.vue
@@ -47,7 +47,7 @@
       </el-form-item>
       <!-- 问题名称 -->
       <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'en')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'en' )"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
         prop="QuestionName"
       >
@@ -57,7 +57,7 @@
       </el-form-item>
       <!-- 问题名称(En) -->
       <el-form-item
-        v-if="(form.Type !== 'group' && !isLook) || (isLook && $i18n.locale !== 'zh')"
+        v-if="(form.Type !== 'group' && $i18n.locale !== 'zh')"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         prop="QuestionEnName"
       >
@@ -791,6 +791,8 @@ export default {
         ],
         QuestionName: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
         TypeValue: [{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
           {validator: validateTypeVal, trigger: ['blur', 'change']},
           {max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200`}],
@@ -974,6 +976,11 @@ export default {
       this.$refs.qsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        if(this.form.QuestionName && !this.form.QuestionEnName){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(!this.form.QuestionName && this.form.QuestionEnName){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
         var params = Object.assign({}, this.form)
         params.TrialId = this.$route.query.trialId
         params.ReadingCriterionPageId = this.data.ReadingCriterionPageId
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
index 63c35d12..28cde8a4 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/TableQsForm.vue
@@ -35,7 +35,7 @@
         />
       </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'en'"
         :label="$t('trials:readingUnit:qsList:title:qsName')"
         prop="QuestionName"
       >
@@ -44,7 +44,7 @@
         />
       </el-form-item>
       <el-form-item
-        v-if="form.Type !== 'group'"
+        v-if="form.Type !== 'group'&& $i18n.locale !== 'zh'"
         :label="$t('trials:readingUnit:qsList:title:qsNameEn')"
         prop="QuestionEnName"
       >
@@ -553,7 +553,8 @@ export default {
         ],
         QuestionName: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
-
+        QuestionEnName:[{required: true, message: this.$t('common:ruleMessage:specify'), trigger: ['blur', 'change']},
+          {max: 50, message: `${this.$t('common:ruleMessage:maxLength')} 50`}],
         TypeValue: [{ required: true, message: this.$t('common:ruleMessage:specify'), trigger: 'blur' },
           { validator: validateTypeVal, trigger: 'blur' },
           { max: 200, message: `${this.$t('common:ruleMessage:maxLength')} 200` }],
@@ -695,6 +696,11 @@ export default {
       this.$refs.tableQsForm.validate(valid => {
         if (!valid) return
         this.loading = true
+        if(this.form.QuestionName && !this.form.QuestionEnName){
+          this.form.QuestionEnName = this.form.QuestionName;
+        }else if(!this.form.QuestionName && this.form.QuestionEnName){
+          this.form.QuestionName = this.form.QuestionEnName;
+        }
         var params = Object.assign({}, this.form)
         params.TrialId = this.$route.query.trialId
         params.ReadingQuestionId = this.readingQuestionId

From e81b7897e7104c4af4399958e828059ddd42dddb Mon Sep 17 00:00:00 2001
From: "DESKTOP-6C3NK6N\\WXS" <815034831@qq.com>
Date: Wed, 31 Jul 2024 11:17:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?mfa=E6=A0=87=E9=A2=98=E5=8A=A0=E7=B2=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/MFA/index.vue | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/components/MFA/index.vue b/src/components/MFA/index.vue
index fd8771a3..4642b0a8 100644
--- a/src/components/MFA/index.vue
+++ b/src/components/MFA/index.vue
@@ -201,4 +201,7 @@ export default {
     margin-right: 5px;
   }
 }
+::v-deep .el-dialog__header{
+  font-weight: bold;
+}
 </style>
\ No newline at end of file