分数区间校验

src/views/education/edit-manager.vue

@@ -3449,20 +3449,35 @@ export default {
     },
     //校验分数是否存在交叉
     checkCrossFun(d){
-      let isRepart = false,index = null;
+      let isRepart = false,index = null,parm = null;
       //alert(d.length)
       if( d.length > 0 ){
         for(let i = 1;i < d.length;i++){
-         // console.log(d[i])
-          if(d[i].rangeMin < d[i-1].rangeMax && d[i].rangeMin > d[i-1].rangeMin || d[i-1].rangeMax >= d[i].rangeMin && d[i-1].rangeMax < d[i].rangeMax || d[i].rangeMax > d[i-1].rangeMin && d[i].rangeMax < d[i-1].rangeMax){
+         console.log(d[i-1].rangeMin,d[i-1].rangeMax)
+         if(parseInt(d[i-1].rangeMax) < parseInt(d[i-1].rangeMin)){
+           isRepart = true;
+           index = i-1;
+           parm = '1'
+           break;
+         }
+          if(d[i].rangeMin <= d[i-1].rangeMax && d[i].rangeMin >= d[i-1].rangeMin || d[i-1].rangeMax >= d[i].rangeMin && d[i-1].rangeMax <= d[i].rangeMax || d[i].rangeMax >= d[i-1].rangeMin && d[i].rangeMax <= d[i-1].rangeMax){
             isRepart = true;
             index = i;
+            parm = "2"
             //alert(isRepart)
             break;
           }
+          if(parseInt(d[i].rangeMin) > parseInt(d[i].rangeMax)){
+            isRepart = true;
+            index = i;
+            parm = '3'
+            break;
+          }
+    
         }
       }
-      return {isRepart:isRepart,index:index}
+      console.log(parm)
+      return {isRepart:isRepart,index:index,parm:parm}
     },
 
     hideErrorInfo(str){
@@ -3526,16 +3541,31 @@ export default {
 
         if(vm.formExam.passType == 2){
           let checkIdList = [];
+          var compare = function (obj1, obj2) {
+              var val1 = obj1.rangeMin;
+              var val2 = obj2.rangeMin;
+              if (val1 < val2) {
+                  return -1;
+              } else if (val1 > val2) {
+                  return 1;
+              } else {
+                  return 0;
+              }            
+          } 
+          vm.formExam.exam.sort(compare)
+          
           let isCross = vm.checkCrossFun(vm.formExam.exam).isRepart;
           if(isCross){
             let l = vm.checkCrossFun(vm.formExam.exam).index
-            vm.formExam.exam[l].minClass = 'is-error'
-            vm.formExam.exam[l].minError = '请重新输入，不能出现重合分数'
-            if(l > 0){
-              vm.formExam.exam[l-1].minClass = 'is-error'
-              vm.formExam.exam[l-1].minError = '请重新输入，不能出现重合分数'
-            }
+            if(parm == '1' || parm == '3'){
+              vm.formExam.exam[l].minClass = 'is-error'
+              vm.formExam.exam[l].minError = '分数最小值不能大于最大值'
+              //return;
+            }else if(parm == '2'){
+              vm.formExam.exam[l].minClass = 'is-error'
+              vm.formExam.exam[l].minError = '请重新输入，不能出现重合分数'
 
+            }
             this.$set(vm.formExam.exam, l, vm.formExam.exam[l])
             return
           }