时刻表v2.7.12

1、修正主副站停站时间总是相反的bug 2、修正吃饭方向总是一个方向的问题 3、修正进出场总是一个方向的问题

时刻表v2.7.12
1、修正主副站停站时间总是相反的bug 2、修正吃饭方向总是一个方向的问题 3、修正进出场总是一个方向的问题
徐烜
1 parent c19196e3
Showing 4 changed files with 46 additions and 21 deletions
src/main/resources/static/pages/base/timesmodel/js/v2/ParameterObj.js
src/main/resources/static/pages/base/timesmodel/js/v2/core/InternalLpObj.js
src/main/resources/static/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js
src/main/resources/static/pages/base/timesmodel/js/v2/main_v2.js
@@ -730,6 +730,22 @@ var ParameterObj = function() {
             return _stopTypeObj.isMasterStop && (!_stopTypeObj.isMasterUpStop);
         },
+        /**
+         * 获取副站停站的方向（true，上行，false，下行）。
+         */
+        getDirAnotherWayStop: function() {
+            if (!this.isTwoWayStop()) {
+                if (this.isUpOneWayStop()) {
+                    return true;
+                } else {
+                    return false;
+                }
+
+            } else {
+                return undefined;
+            }
+        },
+
         //----------------- 获取高峰配车数、加班路牌数 ----------------//
         /**
          * 获取高峰建议配车数（TODO：参照一下）。
@@ -1391,7 +1407,7 @@ var ParameterObj = function() {
             var _iMinLayoverTime = 0;
             var _iMaxlayoverTime = 0;
-            if (this.isTwoWayStop() || isUp == this.isUpOneWayStop()) {
+            if (this.isTwoWayStop() || (this.getDirAnotherWayStop() != isUp)) {
                 // 主站停站
                 // 早晚高峰，行驶时间的10%-15%，最少3分钟
                 // 低谷，行驶时间的15%-20%，最少10分钟
@@ -486,10 +486,13 @@ InternalLpObj.prototype.fnGetQBcIndexWithFcTimeFromGroupArray = function(
     console.log("比较时间=" + fctime.format("HH:mm"));
+    var oBc;
+
     for (i = 0; i < this._$_qCount; i++) {
         group = groupArray[i];
         if (group) {
-            if (group.getBc1() && hasUp) {
+            oBc = group.getBc1();
+            if (oBc != undefined && (oBc.isUp() == hasUp || oBc.isUp() == hasDown)) {
                 bc1time = group.getBc1().getFcTimeObj();
                 console.log("bc1time=" + bc1time.format("HH:mm") + " tempdiff=" + tempdiff);
                 tempdiff = Math.abs(bc1time.diff(fctime));
@@ -514,7 +517,8 @@ InternalLpObj.prototype.fnGetQBcIndexWithFcTimeFromGroupArray = function(
                 }
             }
-            if (group.getBc2() && hasDown) {
+            oBc = group.getBc2();
+            if (oBc != undefined && (oBc.isUp() == hasUp || oBc.isUp() == hasDown)) {
                 bc2time = group.getBc2().getFcTimeObj();
                 console.log("bc2time=" + bc2time.format("HH:mm") + " tempdiff=" + tempdiff);
                 tempdiff = Math.abs(bc2time.diff(fctime));
@@ -159,12 +159,13 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
         // 在第一个班次之前再添加一个模拟班次，用于中标线的作用
         // 那一圈必定是低谷，而且圈索引0，班次索引1，暂时标记，最后删除
+        var iXXTime = _qIsUp ? _paramObj.getDownTroughTime() : _paramObj.getUpTroughTime();
         var iFirstStopTime =
             _paramObj.fnCalcuFixedStopNumber(
                 _paramObj.addMinute(aBcArray[0].getFcTimeObj(), -10),
-                _qIsUp
+                _qIsUp,
+                iXXTime
             );
-        var iXXTime = _qIsUp ? _paramObj.getDownTroughTime() : _paramObj.getUpTroughTime();
         var oFlagBc = _factory.createBcObj( // 标记班次
             _internalLpArray[0],
             "normal",
@@ -173,6 +174,9 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             _paramObj.addMinute(aBcArray[0].getFcTimeObj(), -(iFirstStopTime + iXXTime)),
             _paramObj
         );
+        console.log("ddfdfdf=" + (iFirstStopTime));
+        console.log("ddfdfdf=" + (iXXTime));
+        console.log("ttt ==" + oFlagBc.getFcTimeObj().format("HH:mm"));
         oFlagBc.fnSetDelFlag(true); // 标记了删除记号
         _internalLpArray[0].setBc(0, 1, oFlagBc);
@@ -1377,6 +1381,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
             // 晚饭index
             var aDEIndex;
+            console.log("吃饭");
             // 所有吃饭都默认在一个方向，两个方向暂时不考虑
             if (_paramObj.fnIsUpEat()) {
                 aLEIndex = _internalLpArray[0].getQBcIndexWithFcTime(_paramObj.toTimeObj("10:15"), true, false);
@@ -1533,12 +1538,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         oLp.fnGetBcChainInfo(0)["s_b"]
                     );
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "bd", true, 1,
+                        oLp, "bd", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "out", true, 1,
+                        oLp, "out", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
@@ -1551,12 +1556,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                     oEndBc.fnSetIsLastBc(false); // 有可能最后一个班次是吃饭班次，重置
                     oEndBc.fnSetEatTime(0); // 有可能最后一个班次是吃饭班次，重置
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "in", true, 1,
+                        oLp, "in", oEndBc.isUp(), 1,
                         oEndBc.getArrTimeObj(),
                         _paramObj
                     ));
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "lc", true, 1,
+                        oLp, "lc", oEndBc.isUp(), 1,
                         oEndBc.getArrTimeObj(),
                         _paramObj
                     ));
@@ -1567,12 +1572,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         oLp.fnGetBcChainInfo(0)["s_b"]
                     );
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "bd", true, 1,
+                        oLp, "bd", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "out", true, 1,
+                        oLp, "out", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
@@ -1582,7 +1587,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         oLp.fnGetBcChainInfo(0)["e_b"]
                     );
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "in", true, 1,
+                        oLp, "in", oEndBc.isUp(), 1,
                         oEndBc.getArrTimeObj(),
                         _paramObj
                     ));
@@ -1593,12 +1598,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         oLp.fnGetBcChainInfo(1)["s_b"]
                     );
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "bd", true, 1,
+                        oLp, "bd", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "out", true, 1,
+                        oLp, "out", oStartBc.isUp(), 1,
                         oStartBc.getFcTimeObj(),
                         _paramObj
                     ));
@@ -1608,12 +1613,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
                         oLp.fnGetBcChainInfo(1)["e_b"]
                     );
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "in", true, 1,
+                        oLp, "in", oEndBc.isUp(), 1,
                         oEndBc.getArrTimeObj(),
                         _paramObj
                     ));
                     aOtherBc.push(_factory.createBcObj(
-                        oLp, "lc", true, 1,
+                        oLp, "lc", oEndBc.isUp(), 1,
                         oEndBc.getArrTimeObj(),
                         _paramObj
                     ));
@@ -19,7 +19,7 @@ var Main_v2 = function() {
                 var _bcsj = paramObj.calcuTravelTime(_fcsj, isUp);
                 var _arrsj = paramObj.addMinute(_fcsj, _bcsj);
                 //var _stoptime =  paramObj.fnCalcuFixedStopNumber(_arrsj, !isUp, _bcsj);
-                var _stoptime =  paramObj.fnCalcuFixedStopNumber(_arrsj, !isUp, paramObj.calcuTravelTime(_fcsj, isUp));
+                var _stoptime =  paramObj.fnCalcuFixedStopNumber(_arrsj, isUp, paramObj.calcuTravelTime(_fcsj, isUp));
                 var _tccid = paramObj.getTTinfoId();
                 var _ttinfoid = paramObj.getTTinfoId();
                 var _xl = paramObj.getXlId();
@@ -806,10 +806,10 @@ var Main_v2 = function() {
             // 11、祛除上标线结尾有删除标记的班次
             schedule.fnRemoveDelLastFlagBc();
             //
-            // // TODO：12、平均化指定时间后的班次列表间隔
-            // schedule.fnAdjustBcInterval2_avg(true, _paramObj.toTimeObj("19:50"));
-            // schedule.fnAdjustBcInterval2_avg(false, _paramObj.toTimeObj("19:50"));
-            //
+            // // // TODO：12、平均化指定时间后的班次列表间隔
+            // // schedule.fnAdjustBcInterval2_avg(true, _paramObj.toTimeObj("19:50"));
+            // // schedule.fnAdjustBcInterval2_avg(false, _paramObj.toTimeObj("19:50"));
+
             // 10、补进出场例保班次
             schedule.fnCalcuOtherBc();