触发裁判指标逻辑更改

src/views/trials/trials-panel/reading/ad-review/index.vue

@@ -396,7 +396,12 @@
             :label="$t('trials:readingTracking:config:questionName')"
             show-overflow-tooltip
             width="600"
-          />
+          >
+            <template slot-scope="scope">
+              <i v-show="scope.row.IsTriggerJudge" class="el-icon-warning" style="color:red" />
+              {{ scope.row.QuestionName }}
+            </template>
+          </el-table-column>
           <el-table-column
             prop="judgeResult"
             :label="$t('trials:adReview:title:result')"
@@ -435,7 +440,7 @@
               <el-radio-group
                 v-show="!(scope.row.Type === 'class' || scope.row.DataSource === 1)"
                 v-model="judgeSelectedArmMap[scope.row.ReadingQuestionId]"
-                :disabled="readingTaskState >= 2"
+                :disabled="readingTaskState >= 2 || !scope.row.IsTriggerJudge"
                 @change="(val) => handleJudgeArmChange(scope.row, val)"
               >
                 <el-radio :label="1">
@@ -444,9 +449,6 @@
                 <el-radio :label="2">
                   R2
                 </el-radio>
-                <el-radio v-show="scope.row.Type === 'number'" :label="3">
-                  {{ $t('trials:adReview:radio:mean') }}
-                </el-radio>
               </el-radio-group>
             </template>
           </el-table-column>
@@ -837,10 +839,22 @@ export default {
           // this.judgeQs = QuestionList
           this.$set(this.judgeForm, 'judgeResultRemark', res.Result.JudgeResultRemark || '')
           QuestionList.map((item) => {
+            let val = null
+            if (!item.Answer && item.Type === 'number' && !item.IsTriggerJudge) {
+              val = this.getJudgeAnswerAverageValue(item)
+            } else if (!item.Answer && !item.IsTriggerJudge) {
+              const row = this.judgeAnswers.find(v => {
+                return v.ReadingQuestionId === item.ReadingQuestionId
+              })
+              if (!row) return null
+              val = row.R1Answer
+            } else {
+              val = item.Answer
+            }
             this.$set(
               this.judgeForm,
               item.ReadingQuestionId,
-              item.Answer
+              val
             )
             if (item.Type === 'class') {
               this.classArr.push({ triggerId: item.ClassifyQuestionId, classId: item.ReadingQuestionId, classifyAlgorithms: item.ClassifyAlgorithms, classifyType: item.ClassifyType })
@@ -871,12 +885,13 @@ export default {
     },
     handleJudgeArmChange(question, armEnum) {
       this.$set(this.judgeSelectedArmMap, question.ReadingQuestionId, armEnum)
-      let val = null
-      if (armEnum === 1 || armEnum === 2) {
-        val = this.getJudgeAnswerValue(question, armEnum)
-      } else if (armEnum === 3) {
-        val = this.getJudgeAnswerAverageValue(question, armEnum)
-      }
+      let val = this.getJudgeAnswerValue(question, armEnum)
+      
+      // if (armEnum === 1 || armEnum === 2) {
+      //   val = this.getJudgeAnswerValue(question, armEnum)
+      // } else if (armEnum === 3) {
+      //   val = this.getJudgeAnswerAverageValue(question, armEnum)
+      // }
       
       this.$set(
         this.judgeForm,
@@ -1161,7 +1176,7 @@ export default {
       if (!row) return null
       return armEnum === 1 ? row.R1Answer : row.R2Answer
     },
-    getJudgeAnswerAverageValue(question, armEnum) {
+    getJudgeAnswerAverageValue(question) {
       const row = this.judgeAnswers.find((item) => {
         return item.ReadingQuestionId === question.ReadingQuestionId
       })