lizhuang 5 years ago
parent
commit
9934c9c350
2 changed files with 46 additions and 31 deletions
  1. 22 11
      src/views/doBusiness/monthTemp.vue
  2. 24 20
      src/views/evaluate/index.vue

+ 22 - 11
src/views/doBusiness/monthTemp.vue

@@ -2,7 +2,13 @@
   <div class="date-temp">
     <span class="arrow-left" @click="pickerChangeLeft"></span>
     <span class="arrow-line arrow-line1" @click="pickerChangeLeft"></span>
-    <el-date-picker v-model="pickerVal1" type="month" format="yyyy.MM" value-format="yyyy.MM"></el-date-picker>
+    <el-date-picker
+      v-model="pickerVal1"
+      @change="changeVal"
+      type="month"
+      format="yyyy.MM"
+      value-format="yyyyMMddhhmmss"
+    ></el-date-picker>
     <span class="arrow-line" @click="pickerChangeRight"></span>
     <span class="arrow-right" @click="pickerChangeRight"></span>
   </div>
@@ -35,18 +41,23 @@ export default {
       }
       this.$emit("pickerVal", this.pickerVal1);
     },
+    changeVal(val) {
+      console.log(val)
+      this.$emit("pickerVal", val);
+    },
     pickerChangeRight() {
       if (this.pickerVal1) {
-        let dateTime = new Date(this.pickerVal1);
-        let newData = this.formatter(
-          new Date(dateTime.setMonth(dateTime.getMonth() + 1))
-        );
-        this.pickerVal1 =
-          newData.slice(0, 4) +
-          "." +
-          newData.slice(4, 6) +
-          "." +
-          newData.slice(6, 8);
+        console.log(this.pickerVal1);
+        // let dateTime = new Date(this.pickerVal1);
+        // let newData = this.formatter(
+        //   new Date(dateTime.setMonth(dateTime.getMonth() + 1))
+        // );
+        // this.pickerVal1 =
+        //   newData.slice(0, 4) +
+        //   "." +
+        //   newData.slice(4, 6) +
+        //   "." +
+        //   newData.slice(6, 8);
       }
       this.$emit("pickerVal", this.pickerVal1);
     }

+ 24 - 20
src/views/evaluate/index.vue

@@ -181,33 +181,37 @@ export default {
     },
     daterangeLeft() {
       if (this.pickerVal2.length > 0) {
-        let dateTime = new Date(this.pickerVal2[0]);
-        let newData = this.formatter(
-          new Date(dateTime.setDate(dateTime.getDate() - 1))
-        );
-        this.pickerVal2[0] =
-          newData.slice(0, 4) +
-          "." +
-          newData.slice(4, 6) +
-          "." +
-          newData.slice(6, 8);
+        // let dateTime = new Date(this.pickerVal2[0]);
+        // let newData = this.formatter(
+        //   new Date(dateTime.setDate(dateTime.getDate() - 1))
+        // );
+        this.pickerVal2[0] = this.pickerVal2[0] - 24 * 60 * 60 * 1000;
+        // this.pickerVal2[0] =
+        //   newData.slice(0, 4) +
+        //   "." +
+        //   newData.slice(4, 6) +
+        //   "." +
+        //   newData.slice(6, 8);
         this.pickerVal2 = [this.pickerVal2[0], this.pickerVal2[1]];
+        this.query(0);
       }
     },
     daterangeRight() {
       if (this.pickerVal2.length > 0) {
-        let dateTime = new Date(this.pickerVal2[1]);
-        let newData = this.formatter(
-          new Date(dateTime.setDate(dateTime.getDate() + 1))
-        );
-        this.pickerVal2[1] =
-          newData.slice(0, 4) +
-          "." +
-          newData.slice(4, 6) +
-          "." +
-          newData.slice(6, 8);
+        // let dateTime = new Date(this.pickerVal2[1]);
+        // let newData = this.formatter(
+        //   new Date(dateTime.setDate(dateTime.getDate() + 1))
+        // );
+        // this.pickerVal2[1] =
+        //   newData.slice(0, 4) +
+        //   "." +
+        //   newData.slice(4, 6) +
+        //   "." +
+        //   newData.slice(6, 8);
+        this.pickerVal2[1] = this.pickerVal2[1] + 24 * 60 * 60 * 1000;
       }
       this.pickerVal2 = [this.pickerVal2[0], this.pickerVal2[1]];
+      this.query(0);
     }
   }
 };