#

src/components/easy2/studyStudent.vue

@@ -18284,18 +18284,37 @@ export default {
             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;
+            let adc = chap.filter(e=>{return (e.tool[0]==16 || e.tool[0]==52)})
+            console.log('adc',adc)
+
+            if(adc.length > 0){
+              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;
+            }else{
+              for (let k = chap.length - 1; k >= 0; k--) {
+                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;
+                }
               }
             }
+
+            // 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)