duy 1 year ago
parent
commit
a96f1fde03
1 changed files with 32 additions and 26 deletions
  1. 32 26
      src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

+ 32 - 26
src/views/manager/projectinfo/treeTemplate/template/setInputTPT.vue

@@ -291,15 +291,18 @@ export default {
         } else if(this.from.type == 'daterange'|this.from.type == 'date'){
           let c = this.yearSort.concat(this.TimeSort);//c=[1,2,3,4,5,6]
           console.log(c,'c');
-          let  isAdd=this.IncreasingFn(c)
+          let  isAdd=this.isContinuityNum(c)
           console.log(isAdd,'isAdd');
-          if(isAdd){
+          if(isAdd||c.length===1){
             let dateFormat=[]
             this.yearList.forEach((ele)=>{
               this.checkDateList.forEach((ele1)=>{
                 if(ele.value===ele1){
                   dateFormat.push(
-                    ele
+                    {
+                      name:ele.name,
+                      value:ele.value
+                    }
                   )
                 }
               })
@@ -308,7 +311,10 @@ export default {
               this.checkTimeist.forEach((ele1)=>{
                 if(ele.value===ele1){
                   dateFormat.push(
-                    ele
+                    {
+                      name:ele.name,
+                      value:ele.value
+                    }
                   )
                 }
               })
@@ -439,28 +445,28 @@ export default {
     },
     // 判断是否是是
   
-    IncreasingFn(array) {
-      let IncreasingFn = false
-      let arrayCount = array.length - 1
-      // console.log(arrayCount,'现在是?');
-      for (var i = 0; i < arrayCount; i++) {
-        let currentArr = Number(array[i]) + 1
-        let nestArr = Number(array[i + 1])
- 
-        if (i < 1 == arrayCount) {
-          console.log('执行')
-          currentArr = Number(array[i])
-          nestArr = Number(array[i])
-        }
-        if (currentArr != nestArr) {
-          IncreasingFn = false
-          break
-        } else {
-          IncreasingFn = true
-        }
-      }
-      return IncreasingFn
-    },
+   //判断一串数字是否是连续的
+  isContinuityNum(num){
+            let array=[];
+            if(num instanceof Array){
+                array = [...num];
+            }else{
+                array = Array.from(num.toString())//转换为数组
+            }            
+            
+            var i=array[0];
+            var isContinuation=true;
+            for(var e in array){
+                if(array[e]!=i){
+                    isContinuation=false;
+                    break;
+                }
+                i++;
+            }
+            return isContinuation;
+
+  },
+
 
 
     changeDate(val){