修改日期

src/pages/Alarm/History/index.vue

@@ -200,6 +200,10 @@ export default {
 
 <style lang="less" scoped>
 /deep/.el-pagination {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
   z-index: 9999;
   display: flex;
   justify-content: center;

src/pages/Alarm/RealTime/index.vue

@@ -257,6 +257,10 @@ export default {
 
 <style lang="less" scoped>
 /deep/.el-pagination {
+  position: absolute;
+  bottom: 0;
+  left: 0;
+  right: 0;
   z-index: 9999;
   display: flex;
   justify-content: center;

src/pages/ReportStatistics/index.vue

@@ -37,8 +37,6 @@
         type="datetimerange"
         start-placeholder="开始日期"
         end-placeholder="结束日期"
-        value-format="yyyy-MM-dd"
-        :default-time="['00:00:00']"
         style="margin-bottom: 10px"
       >
       </el-date-picker>
@@ -272,32 +270,39 @@ export default {
     };
   },
   created() {
-    // this.getDates()
-  },
-  mounted() {
     let date = new Date();
     let arr = new Date(new Date(new Date().toLocaleDateString()).getTime()); //今日0时日期
     this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", arr);
     this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", date);
-    this.dateMan[0] = this.reqData.begin.split(" ")[0];
-    this.dateMan[1] = this.reqData.end.split(" ")[0];
-    console.log(this.dateMan);
-    // // 本周一的日期
-    // date.setDate(date.getDate() - date.getDay() + 1);
-    // var begin =
-    //   date.getFullYear() +
-    //   "-" +
-    //   (date.getMonth() + 1) +
-    //   "-" +
-    //   date.getDate() +
-    //   " 00:00:00";
-    // var nowMonth = date.getMonth(); //当前月
-    // var nowYear = date.getFullYear(); //当前年
-    // //本月的开始时间
-    // var monthStartDate = new Date(nowYear, nowMonth, 1);
-    // console.log(Format("yyyy-MM-dd hh:mm:ss", monthStartDate), "111111111111");
+    this.dateMan[0] = this.reqData.begin;
+    this.dateMan[1] = this.reqData.end;
+    // console.log(this.dateMan);
     this.getDates();
   },
+  mounted() {
+    // let date = new Date();
+    // let arr = new Date(new Date(new Date().toLocaleDateString()).getTime()); //今日0时日期
+    // this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", arr);
+    // this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", date);
+    // this.dateMan[0] = this.reqData.begin.split(" ")[0];
+    // this.dateMan[1] = this.reqData.end.split(" ")[0];
+    // console.log(this.dateMan);
+    // // // 本周一的日期
+    // // date.setDate(date.getDate() - date.getDay() + 1);
+    // // var begin =
+    // //   date.getFullYear() +
+    // //   "-" +
+    // //   (date.getMonth() + 1) +
+    // //   "-" +
+    // //   date.getDate() +
+    // //   " 00:00:00";
+    // // var nowMonth = date.getMonth(); //当前月
+    // // var nowYear = date.getFullYear(); //当前年
+    // // //本月的开始时间
+    // // var monthStartDate = new Date(nowYear, nowMonth, 1);
+    // // console.log(Format("yyyy-MM-dd hh:mm:ss", monthStartDate), "111111111111");
+    // this.getDates();
+  },
   methods: {
     getData() {
       //获取接口数据
@@ -340,25 +345,18 @@ export default {
       }
     },
     getDates() {
+      this.dateMan = [];
       //初始化今天的数据
-      var date = new Date();
-      let m = date.getMonth() + 1;
-      if (m < 10) {
-        m = "0" + m;
-      }
-      let d = date.getDate();
-      let d2 = date.getDate() + 1;
-      if (d < 10) {
-        d = "0" + d;
-        d2 = "0" + d2;
-      }
-      this.reqData.begin =
-        date.getFullYear() + "-" + m + "-" + d + " " + "00:00:00";
-      this.reqData.end =
-        date.getFullYear() + "-" + m + "-" + d2 + " " + "23:59:59";
+      let date = new Date();
+      let arr = new Date(new Date(new Date().toLocaleDateString()).getTime()); //今日0时日期
+      this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", arr);
+      this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", date);
+      this.dateMan[0] = this.reqData.begin;
+      this.dateMan[1] = this.reqData.end;
       this.getData();
     },
     getWeeks() {
+      this.dateMan = [];
       this.isActive = 2;
       //本周第一天日期
       let date = new Date();
@@ -371,10 +369,13 @@ export default {
         date.getDate() +
         " 00:00:00";
       this.reqData.begin = begin;
-      this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", date);
+      this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", new Date());
+      this.dateMan[0] = this.reqData.begin;
+      this.dateMan[1] = this.reqData.end;
       this.getData();
     },
     getMonths() {
+      this.dateMan = [];
       //获取本月开始事件到今天的数据
       var now = new Date(); //获取当前时间
       var nowMonth = now.getMonth(); //当前月
@@ -383,13 +384,14 @@ export default {
       var monthStartDate = new Date(nowYear, nowMonth, 1);
       this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", monthStartDate);
       this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", now);
+      this.dateMan[0] = this.reqData.begin;
+      this.dateMan[1] = this.reqData.end;
       this.getData();
     },
     serachDate() {
       //日期范围查询
-      console.log(this.dateMan);
-      this.reqData.begin = this.dateMan[0] + " " + "00:00:00";
-      this.reqData.end = this.dateMan[1] + " " + "23:59:59";
+      this.reqData.begin = Format("yyyy-MM-dd hh:mm:ss", this.dateMan[0]);
+      this.reqData.end = Format("yyyy-MM-dd hh:mm:ss", this.dateMan[1]);
       this.getData();
     },
     goTo() {