Merge branch 'pudong' into jiading

潘钊
2 parents 49163cf3 3479ec7f
Showing 3 changed files with 23 additions and 5 deletions
src/main/resources/static/pages/base/timesmodel/js/v2/ParameterObj.js
src/main/resources/static/real_control_v2/fragments/north/nav/all_devices.html
src/main/resources/static/real_control_v2/fragments/north/nav/history_sch_maintain.html
@@ -390,9 +390,18 @@ var ParameterObj = function() {
          */
         getUpLastDtimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.up.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.up.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
         /**
          * 获取下行首班时间对象。
@@ -410,9 +419,18 @@ var ParameterObj = function() {
          */
         getDownLastDTimeObj: function() {
             _validInternal(); // 验证
-            return this.toTimeObj(
+            var oStartTime = this.toTimeObj(
+                _firstLastDepartureTimeStrObj.down.firstVehicleDepartureTimeStr
+            );
+            var oEndTime = this.toTimeObj(
                 _firstLastDepartureTimeStrObj.down.lastVehicleDepartureTimeStr
             );
+            if (oEndTime.isBefore(oStartTime)) {
+                // 如果末班车时间早于首班车时间，则末班车时间跨天，需要加1天
+                oEndTime.add(1, "day");
+            }
+
+            return oEndTime;
         },
  
         //-------------- 获取吃饭时间 ----------------//
@@ -181,7 +181,7 @@
                     if(lineCode)
                         data.lineId=lineCode;
                 }
-                $.get('/gps/real/all', data, function(rs) {
+                $.get('/gps/real/all?t=' + Math.random(), data, function(rs) {
                     //数据转换
                     var code2Name=gb_data_basic.lineCode2NameAll();
                     $.each(rs.list, function(){
@@ -438,9 +438,9 @@
                     });
  
                     //统计路单 -娄高峰
-                    /*gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
+                    gb_common.$get('/calcWaybill/generateNew', {date:rq, line: lineCode}, function () {
                         reCountEp.emitLater('calcWaybill');
-                    });*/
+                    });
  
                     //统计油 -廖磊
                     gb_common.$post('/ylb/updateHistory', {date:rq, line: lineCode}, function () {