From b0195b8d212ec8e41374d272373c13a884d1141a Mon Sep 17 00:00:00 2001
From: caiyiling <1321909229@qq.com>
Date: Thu, 17 Oct 2024 15:39:34 +0800
Subject: [PATCH] =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E9=98=85=E7=89=87?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=9B=B4=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/QuestionFormItem.vue           | 16 ++++++---
 .../components/QuestionTableFormItem.vue      | 35 ++++++++++++-------
 2 files changed, 33 insertions(+), 18 deletions(-)

diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
index b4a8bf53..de2f752d 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionFormItem.vue
@@ -328,8 +328,8 @@
           :visit-task-id="visitTaskId"
           :criterion-id="criterionId"
           @formItemTableNumberChange="formItemTableNumberChange"
-          @setFormItemData="setFormItemData"
-          @resetFormItemData="resetFormItemData"
+          @setFormItemData="setTblFormItemData"
+          @resetFormItemData="resetTblFormItemData"
         />
         <div
           class="base-dialog-footer"
@@ -607,7 +607,6 @@ export default {
       // this.$emit('formItemNumberChange')
     },
     formItemTableNumberChange() {
-      console.log(this.question.TableQuestions.Questions);
       this.question.TableQuestions.Questions.forEach((v) => {
         if (v.Type === "number" && v.DataSource === 1) {
           var CalculateQuestions = JSON.parse(v.CalculateQuestions);
@@ -657,7 +656,7 @@ export default {
       });
     },
     openAddTableCol(row) {
-      this.addOrEdit.visible = true;
+      
       this.addOrEdit.title =
         row.QuestionName + this.$t("trials:readingUnit:qsList:title:tableQs"); // '表格问题'
       this.QuestionsList = row.TableQuestions.Questions;
@@ -665,7 +664,8 @@ export default {
       row.TableQuestions.Questions.map(i=>{
         this.$set(this.QuestionsForm, i.Id, null)
       })
-      this.QuestionsForm = {};
+      // this.QuestionsForm = {};
+      this.addOrEdit.visible = true;
     },
     getOrganInfoList() {
       var param = {
@@ -717,6 +717,12 @@ export default {
     setFormItemData(obj) {
       this.$emit("setFormItemData", obj);
     },
+    setTblFormItemData(obj) {
+      this.$set(this.QuestionsForm, obj.key, obj.val)
+    },
+    resetTblFormItemData(obj) {
+      this.$set(this.QuestionsForm, obj.key, null)
+    },
     async uploadScreenshot(param) {
       if (!this.visitTaskId) {
         const loading = this.$loading({
diff --git a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
index 0805c904..cffafe01 100644
--- a/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
+++ b/src/views/trials/trials-panel/setting/reading-unit/components/QuestionTableFormItem.vue
@@ -101,6 +101,12 @@
         v-model="questionForm[question.Id]"
         disabled
       />
+      <!-- 自动计算 -->
+      <el-input
+        v-if="question.Type==='class'"
+        v-model="questionForm[question.Id]"
+        disabled
+      />
       <!-- 自增 -->
       <el-input
         v-if="question.Type==='increment'"
@@ -221,7 +227,8 @@ export default {
       urls: [],
       organList: [],
       QuestionsList: [],
-      QuestionsForm: {}
+      QuestionsForm: {},
+      timer: null
     }
   },
   computed: {
@@ -239,7 +246,7 @@ export default {
       deep: true,
       immediate: true,
       handler(v) {
-
+        console.log(v)
       }
     }
   },
@@ -249,18 +256,18 @@ export default {
         this.question.ClassifyAlgorithms
       );
     }
-    setInterval(() => {
+    this.timer = setInterval(() => {
       if (this.question.Type === "class") {
-        let o = this.ClassifyAlgorithmsList.find((v) => {
-          return (
-            this.questionForm[this.question.ClassifyQuestionId] >= v.gt &&
-            this.questionForm[this.question.ClassifyQuestionId] < v.lt
-          );
-        });
-        if (this.questionForm[this.question.ClassifyQuestionId]) {
-          this.questionForm[this.question.Id] = o ? o.label : null;
+        if (this.questionForm[this.question.ClassifyTableQuestionId]) {
+          let o = this.ClassifyAlgorithmsList.find((v) => {
+            return (
+              this.questionForm[this.question.ClassifyTableQuestionId] >= v.gt &&
+              this.questionForm[this.question.ClassifyTableQuestionId] < v.lt
+            );
+          });
+          this.$emit('setFormItemData', { key: this.question.Id, val: o ? o.label : null })
         } else {
-          this.questionForm[this.question.Id] = null;
+          this.$emit('setFormItemData', { key: this.question.Id, val: null })
         }
       }
     }, 300);
@@ -282,6 +289,9 @@ export default {
       this.getOrganInfoList()
     }
   },
+  beforeDestroy() {
+    clearInterval(this.timer)
+  },
   methods: {
     save() {
     },
@@ -291,7 +301,6 @@ export default {
       this.QuestionsList = row.TableQuestions.Questions
       this.AnswersList = row.TableQuestions.Answers
       this.QuestionsForm = {}
-      console.log(this.QuestionsForm)
     },
     getOrganInfoList() {
       var param = {