11wqe1 6 months ago
parent
commit
6c462f5622
2 changed files with 273 additions and 47 deletions
  1. 8 7
      src/components/easy2/commpont/markDialog.vue
  2. 265 40
      src/components/easy2/studyStudent.vue

+ 8 - 7
src/components/easy2/commpont/markDialog.vue

@@ -5,7 +5,7 @@
     >
       <div class="left">
         <div
-          v-if="markScoreworksStudent.length - 1 == toolIndex"
+          v-if="finalMarkList == toolIndex"
           v-loading="ScLoading"
         >
           <div class="scoreTit">
@@ -131,10 +131,10 @@
           </div>
         </div>
 
-        <!-- 提交列表 -->
+        <!-- 提交列表 -->       
         <div style="flex: 1;display: flex;flex-direction: column;overflow: auto;">
           <div class="workListTit" @click="workListTitBtn">
-            <i class="el-icon-arrow-down"></i>提交列表({{ workList.length }})
+            <i class="el-icon-arrow-down"></i>提交列表 ({{ workList.length }})
           </div>
           <div style="overflow: auto;flex: 1;">
             <div
@@ -230,7 +230,7 @@
       </div>
       <div class="RigCon">
         <!-- 作业内容  -->
-        <div v-if="cutNum == 0" style="height: 100%;">
+        <div v-if="cutNum == 0" style="height: 97%;">
           <div
             v-if="
               currentUid.type == 13 || currentUid.type == 10
@@ -288,7 +288,7 @@
               <!-- <div>{{ currentUid.content }}</div> -->
             </div>
           </div>
-          <div v-if="currentUid.type == 15" style="height: 95%;">
+          <div v-if="currentUid.type == 15" style="height: 100%;">
             <div
               class="worksAnswer"
               v-if="currentUid.content"
@@ -379,7 +379,8 @@ export default {
     "task",
     "scoTit",
     "markScoreVisible",
-    "markScoreworksStudent"
+    "markScoreworksStudent",
+    "finalMarkList"
   ],
   data() {
     return {
@@ -959,7 +960,7 @@ export default {
               if (this.currentUid.type == 5) {
                 this.playerOptions.sources[0].src = this.currentUid.content;
               }
-              this.current = index;
+              // this.current = index;
               this.workId = e.id;
               this.appraise(e);
             }

+ 265 - 40
src/components/easy2/studyStudent.vue

@@ -2482,7 +2482,7 @@
                           展开
                         </div>
                       </div>
-                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex ">
+                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && finalMarkList == toolIndex ">
                         <div  style="margin-right:10px" class="ScoreBtn"  @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           一键重置
                         </div>
@@ -2824,7 +2824,22 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
                             <el-popover
+                              v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -2840,11 +2855,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -2915,7 +2927,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+
                             <el-popover
+                              v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -2931,11 +2959,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3010,7 +3035,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                              v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -3026,11 +3067,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3105,7 +3143,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -3121,11 +3175,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3637,7 +3688,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+
                               <el-popover
+                              v-else
                                 placement="top"
                                 width="318"
                                 :disabled="AIloading[toolIndex][wIndex].loading"
@@ -3653,11 +3720,8 @@
                                     @handleHide=handleHide
                                     :wIndex="wIndex"
                                     :scoCon="w" 
-                                    
                                     :toolIndex="toolIndex" 
                                     :key="refreshKey" 
-                                    
-                                    
                                     :stage="courseType"
                                     :task="taskCount"  
                                     :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3777,7 +3841,7 @@
                         展开
                       </div>
                     </div>
-                    <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                    <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && finalMarkList == toolIndex">
                       <div  style="margin-right:10px" class="ScoreBtn"  @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           一键重置
                       </div> 
@@ -3856,7 +3920,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -3872,11 +3952,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -3950,7 +4027,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -3966,11 +4059,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -4045,7 +4135,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -4061,11 +4167,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -4742,7 +4845,23 @@
                                   评分
                                 </div>
                                 <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                                  <div
+                                    v-if="finalMarkList != toolIndex"
+                                      class="answerScore"
+                                      @click.stop="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                      :class="{
+                                        rightW:
+                                          w.userid == userid ||
+                                          tType == 1 ||
+                                          tType == 4 ||
+                                          w.ateacher == userid,
+                                      }"
+                                    >
+                                    <span>查看</span>
+                                  </div>
+                                  
                                   <el-popover
+                                  v-else
                                   placement="top"
                                   width="318"
                                   :disabled="AIloading[toolIndex][wIndex].loading"
@@ -4768,7 +4887,7 @@
                                 
                                   <div
                                     class="answerScore"
-                                    @click.stop="markScoreDig2(w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                    @click.stop="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
                                     slot="reference"
                                     :class="{
                                       rightW:
@@ -4913,7 +5032,23 @@
                             </div>
 
                             <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                              <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click.stop="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                              
                               <el-popover
+                              v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -4929,7 +5064,6 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
                                   
@@ -5245,7 +5379,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -5261,7 +5411,6 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
                                   
@@ -5578,7 +5727,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -5594,7 +5759,6 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
                                   
@@ -6194,7 +6358,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -6210,11 +6390,8 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
-                                  
-                                  
                                   :stage="courseType"
                                   :task="taskCount"  
                                   :scoTit="chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList"
@@ -6997,7 +7174,7 @@
                           展开
                         </div>
                       </div>
-                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                      <div  style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && finalMarkList == toolIndex">
                         <div  style="margin-right:10px" class="ScoreBtn" @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)" >
                           一键重置
                         </div>
@@ -7071,7 +7248,23 @@
                             评分
                           </div>
                           <div v-else-if="courseDetail.userid == userid && courseDetail.state == 5">
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+                            
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -7087,7 +7280,6 @@
                                   @handleHide=handleHide
                                   :wIndex="wIndex"
                                   :scoCon="w" 
-                                  
                                   :toolIndex="toolIndex" 
                                   :key="refreshKey" 
                                   
@@ -7295,7 +7487,7 @@
                           展开
                         </div>
                       </div>
-                      <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && worksStudent.length-1 == toolIndex">
+                      <div style="display: flex;" v-if="courseDetail.userid == userid && chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList && courseDetail.state == 5 && finalMarkList == toolIndex">
                         <div @click="resetLoopEva(worksStudent[toolIndex],chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,courseType,taskCount,toolIndex,tool.toolDetail,worksStudent)"  style="margin-right:10px" class="ScoreBtn">
                           一键重置
                         </div>
@@ -7385,7 +7577,23 @@
 
                             <!-- @show="handleShow(toolIndex,wIndex)"
                             @hide="handleHide(toolIndex,wIndex,worksStudent)" -->
+                            <div
+                              v-if="finalMarkList != toolIndex"
+                                class="answerScore"
+                                @click="markScoreDig2(w.sName,worksStudent,w.userid,toolIndex,chapInfoList[courseType].chapterInfo[0].taskJson[taskCount].eList,AIloading[toolIndex][wIndex].loading)"
+                                :class="{
+                                  rightW:
+                                    w.userid == userid ||
+                                    tType == 1 ||
+                                    tType == 4 ||
+                                    w.ateacher == userid,
+                                }"
+                              >
+                              <span>查看</span>
+                            </div>
+
                             <el-popover
+                            v-else
                               placement="top"
                               width="318"
                               :disabled="AIloading[toolIndex][wIndex].loading"
@@ -12789,6 +12997,7 @@
         :toolIndex="markScoretoolIndex"  
         :stage="courseType" 
         :task="taskCount" 
+        :finalMarkList="finalMarkList"
         :scoTit="markScoreTit" 
         :markScoreworksStudent="markScoreworksStudent"
         :markScoreVisible="markScoreVisible"
@@ -13290,7 +13499,8 @@ export default {
       markScoreTit:{},
       markfullscreen:false,
       xianObj: ["DOCX", "MD", "TXT", "PDF"],
-      markScoreworksStudent:[]
+      markScoreworksStudent:[],
+      finalMarkList:-1
     };
   },
   methods: {
@@ -15439,7 +15649,6 @@ export default {
       }
     },
     async openScore(w, index) {
-      console.log(w,index)
       this.wScore = 0;
       this.wScore = w.score ? JSON.parse(w.score).wScore : 0;
       this.scoreDetail = w.score ? JSON.parse(w.score).detail : "";
@@ -17833,7 +18042,6 @@ export default {
               this.courseType
             ];
             this.chapInfoList = JSON.parse(this.courseDetail.chapters);
-            console.log('this.chapInfoList22222',this.chapInfoList);
 
             if (this.tcid && res.data[1].length) {
               let _inviteA = [];
@@ -18068,9 +18276,26 @@ export default {
             this.vChapterData = _chapterData;
             this.$forceUpdate();
           }
+          // console.log('this.chapInfoList22222',JS);
+
           if(this.courseDetail.state == 5){
             let chapInfoListCopy = this.chapInfoList[0].chapterInfo[0].taskJson;
-           
+
+            let chap = chapInfoListCopy[this.taskCount].toolChoose
+            console.log('chap',chap)
+
+            for (let k = chap.length - 1; k >= 0; k--) {
+              if (chap[k].tool[0] === 16 || chap[k].tool[0] === 52) {
+                this.finalMarkList = k;
+                break;
+              }
+              if (chap[k].tool[0] === 7 || chap[k].tool[0] === 50  || chap[k].tool[0] === 1 || chap[k].tool[0] === 3 || chap[k].tool[0] === 48 || chap[k].tool[0] === 15 || chap[k] === 57) {
+                this.finalMarkList = k;
+                break;
+              }
+            }
+            console.log('finalMarkList',this.finalMarkList)
+              
             for (let k = 0; k < chapInfoListCopy[this.taskCount].eList.length; k++) {
               if(!chapInfoListCopy[this.taskCount].eList[k].rule){
                 this.againEva(this.taskCount,k)