日期格式化BUG

assets/js/controllers/report/incident_reportCtrl.js

@@ -57,7 +57,6 @@ app.controller("incident_reportCtrl", [
     $scope.area_place = {}; //搜索条件
     $scope.dateChoose = {}; //选择日期组件存储值
     $scope.BTdata;
-    $scope.nowdata = moment(new Date()).format("YYYY/MM/DD HH:ss:mm");
     var weeks = new Date().getDay();
     $scope.starttimes = moment(
       new Date().getTime() - 86400000 * (weeks + 6 - 1)
@@ -66,10 +65,10 @@ app.controller("incident_reportCtrl", [
       new Date().getTime() - 86400000 * (weeks - 1)
     ).format("YYYY-MM-DD 23:59:59");
     $scope.changeForm = function (paramDateFrom) {
-      $scope.starttimes = moment(paramDateFrom).format("YYYY-MM-DD");
+      $scope.starttimes = moment(paramDateFrom).format("YYYY-MM-DD 00:00:00");
     };
     $scope.changeTo = function (paramDateTo) {
-      $scope.endtimes = moment(paramDateTo).format("YYYY-MM-DD");
+      $scope.endtimes = moment(paramDateTo).format("YYYY-MM-DD 23:59:59");
     };
     // 日期重置
     $scope.dateReset = function () {
@@ -655,32 +654,10 @@ app.controller("incident_reportCtrl", [
     $scope.report_datas = function () {
       console.log($scope.searchkeys);
       var s = new Date($scope.searchkeys.startTime);
-      var st =
-        s.getFullYear() +
-        "-" +
-        (s.getMonth() + 1) +
-        "-" +
-        s.getDate() +
-        " " +
-        s.getHours() +
-        ":" +
-        s.getMinutes() +
-        ":" +
-        s.getSeconds();
+      var st = moment(s).format('YYYY-MM-DD 00:00:00')
 
       var e = new Date($scope.searchkeys.endTime);
-      var en =
-        e.getFullYear() +
-        "-" +
-        (e.getMonth() + 1) +
-        "-" +
-        e.getDate() +
-        " " +
-        e.getHours() +
-        ":" +
-        e.getMinutes() +
-        ":" +
-        e.getSeconds();
+      var en = moment(e).format('YYYY-MM-DD 23:59:59')
 
       $scope.searchkeys.startTime = st;
       $scope.searchkeys.endTime = en;
@@ -740,14 +717,15 @@ app.controller("incident_reportCtrl", [
         delete $scope.searchkeys.areaId;
       }
       $scope.area_place = {};
-      $scope.starttimes = moment(
-        new Date().getTime() - 86400000 * (weeks + 6 - 1)
-      ).format("YYYY-MM-DD");
-      $scope.endtimes = moment(
-        new Date().getTime() - 86400000 * (weeks - 1)
-      ).format("YYYY-MM-DD");
-      $scope.searchkeys.startTime = $scope.starttimes;
-      $scope.searchkeys.endTime = $scope.endtimes;
+      // $scope.starttimes = moment(
+      //   new Date().getTime() - 86400000 * (weeks + 6 - 1)
+      // ).format("YYYY-MM-DD");
+      // $scope.endtimes = moment(
+      //   new Date().getTime() - 86400000 * (weeks - 1)
+      // ).format("YYYY-MM-DD");
+      // $scope.searchkeys.startTime = $scope.starttimes;
+      // $scope.searchkeys.endTime = $scope.endtimes;
+      $scope.dateReset();
       console.log($scope);
       $scope.YWBB_searchKeys = {
         startTime: $scope.searchkeys.startTime,