Guoxiaohuan 5 gadi atpakaļ
vecāks
revīzija
35dfdc4af2
1 mainītis faili ar 10 papildinājumiem un 3 dzēšanām
  1. 10 3
      src/views/evaluate/index.vue

+ 10 - 3
src/views/evaluate/index.vue

@@ -206,6 +206,7 @@ export default {
         //   new Date(dateTime.setDate(dateTime.getDate() - 1))
         // );
         this.pickerVal2[0] = this.pickerVal2[0] - 24 * 60 * 60 * 1000;
+        this.pickerVal2[1] = this.pickerVal2[1] - 24 * 60 * 60 * 1000;
         // this.pickerVal2[0] =
         //   newData.slice(0, 4) +
         //   "." +
@@ -228,10 +229,16 @@ export default {
         //   newData.slice(4, 6) +
         //   "." +
         //   newData.slice(6, 8);
-        this.pickerVal2[1] = this.pickerVal2[1] + 24 * 60 * 60 * 1000;
+        let end = this.formatter(new Date().getTime() - 24 * 60 * 60 * 1000);
+        if (this.formatter(this.pickerVal2[1]) == end) {
+          this.pickerVal2[1] = new Date().getTime() - 24 * 60 * 60 * 1000;
+        } else {
+          this.pickerVal2[0] = this.pickerVal2[0] + 24 * 60 * 60 * 1000;
+          this.pickerVal2[1] = this.pickerVal2[1] + 24 * 60 * 60 * 1000;
+        }
+        this.pickerVal2 = [this.pickerVal2[0], this.pickerVal2[1]];
+        this.query(0);
       }
-      this.pickerVal2 = [this.pickerVal2[0], this.pickerVal2[1]];
-      this.query(0);
     }
   }
 };