Merge remote-tracking branch 'origin/master_merge_V13'

zhijie

2023-12-03 166f256cda92ce8755ce0bf982ee2d355d7b6e42

 src/views/exam/paper/values.vue

@@ -23,7 +23,7 @@
               <div>{{$t('values_title_description_3')}}<img class="tools-button" src="@/assets/exam-paper/question.png" style="width: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_3_2')}}</span></div>
               <div>{{$t('values_title_description_4')}}<img class="tools-button" src="@/assets/exam-paper/scale.png" style="width: 15px;height: 15px;position: absolute;margin-top: 2px"/><span style="margin-left: 20px;">{{$t('values_title_description_4_2')}}</span></div>
            </div>
				

            <div style="display: flex;justify-content: flex-start;padding: 10px 0;">
               <el-button style="margin-top: 12px;" @click="step1_start" type="primary" round v-if="!step1Start">{{$t('start')}}</el-button>
               <el-button style="margin-top: 12px;" type="primary" round @click="step1_next"
@@ -155,7 +155,7 @@
                  <div style="padding: 0 10px;width:80px;">{{$t('values_pic_tmpArea')}}</div>
                  <draggable animation="300" class="pic-tmparea-div"
                     style="border: 1px solid gray;padding: 10px;width: 45%;"
                     :list="step3EWEIArea[0]" :options="{group:{name:'EWEIArea',pull:'clone'}}" 
                     :list="step3EWEIArea[0]" :options="{group:{name:'EWEIArea',pull:'clone'}}"
                     @start="ev=>step3TmpAreaStart(ev,0)"
                     @end="step3TmpAreaMoveEnd">
                     <div v-for="q in step3EWEIArea[0]" :key="q.id" class="mullinediv-item2"
@@ -171,9 +171,14 @@
            </div>
            <div style="display:flex;margin-top: 200px;">
               <div style="display: inline-block;min-width: 150px;text-align: right;padding-right: 5px;">
                  <div class="mul-inlinediv-row mul-inlinediv-lineheight" 
                  <div class="mul-inlinediv-row mul-inlinediv-lineheight"
                     v-for="(item,index) in step2ScoreRanges">
                     {{item.stepName}}
                     <span v-if="item.stepName=='不确定是否相似'">
                        不确定是否与你相似 <span v-if="item.step<step2ScoreRanges.length">{{$t('values_step_names_unit')}}</span>
                     </span>
                     <span v-else>
                        {{$t('values_step_names_unit_pre')}}{{item.stepName}} <span v-if="item.step<step2ScoreRanges.length">{{$t('values_step_names_unit')}}</span>
                     </span>
                  </div>
               </div>
               <div style="display: inline-block;width: 20px;margin-top: 4px;">
@@ -183,9 +188,9 @@
               </div>
               <!--
               <div style="display: inline-block;min-width: 20px;text-align: right;">
                  <div class="mul-inlinediv-row mul-inlinediv-lineheight" 
                  <div class="mul-inlinediv-row mul-inlinediv-lineheight"
                     v-for="(item,index) in step2ScoreRanges">
                     {{item.deviate}}
                     {{$t('values_step_names_unit')}}
                  </div>
               </div>
               -->
@@ -421,7 +426,7 @@
               }
            ).catch(e => {})
         }
		

         document.body.ondrop = function(event) {
            event.preventDefault();
            event.stopPropagation();
@@ -472,7 +477,7 @@
                _this.sortQuestions()
                _this.caculateScoreRangeSelectedById(this.getStep2StepItem(this.step2SubStep).itemOrder)
        }).catch(() => {
            

        });
            */
            this.step = "step2-0"
@@ -911,7 +916,7 @@
               //设置最后的Step的StepName为固定值
               if(_this.step2ScoreRanges[i]['step'] >= max){
                  if(max % 2 == 0){//偶数
							

                  } else {//奇数
                     _this.step2ScoreRanges[i]['stepName'] = names[names.length-1]
                  }
@@ -1095,7 +1100,7 @@
                  answerItem.startTime = ''
               }
               answerItem.completed = true
               answerItem.content = this.getContentByQuestionId(answerItem.questionId) 
               answerItem.content = this.getContentByQuestionId(answerItem.questionId)
                  //this.getLikeTypeByScoreRangeItemOrder(answerItem.subjectId)
               answerItem.questionReport = {
                  questionOrder: answerItem.questionId,
@@ -1138,7 +1143,7 @@
                        langType: question.langType, //答题语言
                        partOrder: question.partOrder, //分片
                        imgUrl: question.imgUrl, //图片地址
                        answer: question.content //题目答案 
                        answer: question.content //题目答案
                     })
                  }
               }
@@ -1422,7 +1427,7 @@
      justify-content: center;
      width: 100%;
   }
	

   .mul-inlinediv-down {
      min-width: 16px;
      //line-height: 106px;