潘钊 / bsth_control · Commits

Commit bc0ca3e9cb047042574570d417b0fcb66271eca2

Authored by 徐烜
1 parent 0140e85d
build: skipped

时刻表v2.7.13 

1、修改进场班次时间的逻辑，与上一个班次方向相反
2、修改导出时刻表的近出场时间逻辑，出场和下一个班次方向一样。进场如上
Inline Side-by-side
Showing 2 changed files with 16 additions and 16 deletions
src/main/resources/static/pages/base/timesmodel/js/v2/core/InternalScheduleObj.js
  View file @bc0ca3e
@@ -1556,12 +1556,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) { @@ -1556,12 +1556,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
1556 oEndBc.fnSetIsLastBc(false); // 有可能最后一个班次是吃饭班次，重置 1556 oEndBc.fnSetIsLastBc(false); // 有可能最后一个班次是吃饭班次，重置
1557 oEndBc.fnSetEatTime(0); // 有可能最后一个班次是吃饭班次，重置 1557 oEndBc.fnSetEatTime(0); // 有可能最后一个班次是吃饭班次，重置
1558 aOtherBc.push(_factory.createBcObj( 1558 aOtherBc.push(_factory.createBcObj(
1559 - oLp, "in", oEndBc.isUp(), 1, 1559 + oLp, "in", !oEndBc.isUp(), 1,
1560 oEndBc.getArrTimeObj(), 1560 oEndBc.getArrTimeObj(),
1561 _paramObj 1561 _paramObj
1562 )); 1562 ));
1563 aOtherBc.push(_factory.createBcObj( 1563 aOtherBc.push(_factory.createBcObj(
1564 - oLp, "lc", oEndBc.isUp(), 1, 1564 + oLp, "lc", !oEndBc.isUp(), 1,
1565 oEndBc.getArrTimeObj(), 1565 oEndBc.getArrTimeObj(),
1566 _paramObj 1566 _paramObj
1567 )); 1567 ));
@@ -1587,7 +1587,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) { @@ -1587,7 +1587,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
1587 oLp.fnGetBcChainInfo(0)["e_b"] 1587 oLp.fnGetBcChainInfo(0)["e_b"]
1588 ); 1588 );
1589 aOtherBc.push(_factory.createBcObj( 1589 aOtherBc.push(_factory.createBcObj(
1590 - oLp, "in", oEndBc.isUp(), 1, 1590 + oLp, "in", !oEndBc.isUp(), 1,
1591 oEndBc.getArrTimeObj(), 1591 oEndBc.getArrTimeObj(),
1592 _paramObj 1592 _paramObj
1593 )); 1593 ));
@@ -1613,12 +1613,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) { @@ -1613,12 +1613,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
1613 oLp.fnGetBcChainInfo(1)["e_b"] 1613 oLp.fnGetBcChainInfo(1)["e_b"]
1614 ); 1614 );
1615 aOtherBc.push(_factory.createBcObj( 1615 aOtherBc.push(_factory.createBcObj(
1616 - oLp, "in", oEndBc.isUp(), 1, 1616 + oLp, "in", !oEndBc.isUp(), 1,
1617 oEndBc.getArrTimeObj(), 1617 oEndBc.getArrTimeObj(),
1618 _paramObj 1618 _paramObj
1619 )); 1619 ));
1620 aOtherBc.push(_factory.createBcObj( 1620 aOtherBc.push(_factory.createBcObj(
1621 - oLp, "lc", oEndBc.isUp(), 1, 1621 + oLp, "lc", !oEndBc.isUp(), 1,
1622 oEndBc.getArrTimeObj(), 1622 oEndBc.getArrTimeObj(),
1623 _paramObj 1623 _paramObj
1624 )); 1624 ));
src/main/resources/static/pages/base/timesmodel/js/v2/main_v2.js
  View file @bc0ca3e
@@ -187,7 +187,7 @@ var Main_v2 = function() { @@ -187,7 +187,7 @@ var Main_v2 = function() {
187 oInternalLp.fnGetBcChainInfo(0)["s_b"] 187 oInternalLp.fnGetBcChainInfo(0)["s_b"]
188 ); 188 );
189 oTempBc = _factory.createBcObj( 189 oTempBc = _factory.createBcObj(
190 - oLp, "bd", true, 1, 190 + oLp, "bd", oStartBc.isUp(), 1,
191 oStartBc.getFcTimeObj(), 191 oStartBc.getFcTimeObj(),
192 _paramObj 192 _paramObj
193 ); 193 );
@@ -213,7 +213,7 @@ var Main_v2 = function() { @@ -213,7 +213,7 @@ var Main_v2 = function() {
213 }); 213 });
214 214
215 oTempBc = _factory.createBcObj( 215 oTempBc = _factory.createBcObj(
216 - oLp, "out", true, 1, 216 + oLp, "out", oStartBc.isUp(), 1,
217 oStartBc.getFcTimeObj(), 217 oStartBc.getFcTimeObj(),
218 _paramObj 218 _paramObj
219 ); 219 );
@@ -249,7 +249,7 @@ var Main_v2 = function() { @@ -249,7 +249,7 @@ var Main_v2 = function() {
249 ); 249 );
250 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")"); 250 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
251 oTempBc = _factory.createBcObj( 251 oTempBc = _factory.createBcObj(
252 - oLp, "in", true, 1, 252 + oLp, "in", !oEndBc.isUp(), 1,
253 oEndBc.getArrTimeObj(), 253 oEndBc.getArrTimeObj(),
254 _paramObj 254 _paramObj
255 ); 255 );
@@ -278,7 +278,7 @@ var Main_v2 = function() { @@ -278,7 +278,7 @@ var Main_v2 = function() {
278 }); 278 });
279 279
280 oTempBc = _factory.createBcObj( 280 oTempBc = _factory.createBcObj(
281 - oLp, "lc", true, 1, 281 + oLp, "lc", !oEndBc.isUp(), 1,
282 oEndBc.getArrTimeObj(), 282 oEndBc.getArrTimeObj(),
283 _paramObj 283 _paramObj
284 ); 284 );
@@ -311,7 +311,7 @@ var Main_v2 = function() { @@ -311,7 +311,7 @@ var Main_v2 = function() {
311 oInternalLp.fnGetBcChainInfo(0)["s_b"] 311 oInternalLp.fnGetBcChainInfo(0)["s_b"]
312 ); 312 );
313 oTempBc = _factory.createBcObj( 313 oTempBc = _factory.createBcObj(
314 - oLp, "bd", true, 1, 314 + oLp, "bd", oStartBc.isUp(), 1,
315 oStartBc.getFcTimeObj(), 315 oStartBc.getFcTimeObj(),
316 _paramObj 316 _paramObj
317 ); 317 );
@@ -337,7 +337,7 @@ var Main_v2 = function() { @@ -337,7 +337,7 @@ var Main_v2 = function() {
337 }); 337 });
338 338
339 oTempBc = _factory.createBcObj( 339 oTempBc = _factory.createBcObj(
340 - oLp, "out", true, 1, 340 + oLp, "out", oStartBc.isUp(), 1,
341 oStartBc.getFcTimeObj(), 341 oStartBc.getFcTimeObj(),
342 _paramObj 342 _paramObj
343 ); 343 );
@@ -373,7 +373,7 @@ var Main_v2 = function() { @@ -373,7 +373,7 @@ var Main_v2 = function() {
373 ); 373 );
374 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")"); 374 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
375 oTempBc = _factory.createBcObj( 375 oTempBc = _factory.createBcObj(
376 - oLp, "in", true, 1, 376 + oLp, "in", !oEndBc.isUp(), 1,
377 oEndBc.getArrTimeObj(), 377 oEndBc.getArrTimeObj(),
378 _paramObj 378 _paramObj
379 ); 379 );
@@ -408,7 +408,7 @@ var Main_v2 = function() { @@ -408,7 +408,7 @@ var Main_v2 = function() {
408 oInternalLp.fnGetBcChainInfo(1)["s_b"] 408 oInternalLp.fnGetBcChainInfo(1)["s_b"]
409 ); 409 );
410 oTempBc = _factory.createBcObj( 410 oTempBc = _factory.createBcObj(
411 - oLp, "bd", true, 1, 411 + oLp, "bd", oStartBc.isUp(), 1,
412 oStartBc.getFcTimeObj(), 412 oStartBc.getFcTimeObj(),
413 _paramObj 413 _paramObj
414 ); 414 );
@@ -434,7 +434,7 @@ var Main_v2 = function() { @@ -434,7 +434,7 @@ var Main_v2 = function() {
434 }); 434 });
435 435
436 oTempBc = _factory.createBcObj( 436 oTempBc = _factory.createBcObj(
437 - oLp, "out", true, 1, 437 + oLp, "out", oStartBc.isUp(), 1,
438 oStartBc.getFcTimeObj(), 438 oStartBc.getFcTimeObj(),
439 _paramObj 439 _paramObj
440 ); 440 );
@@ -471,7 +471,7 @@ var Main_v2 = function() { @@ -471,7 +471,7 @@ var Main_v2 = function() {
471 ); 471 );
472 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")"); 472 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
473 oTempBc = _factory.createBcObj( 473 oTempBc = _factory.createBcObj(
474 - oLp, "in", true, 1, 474 + oLp, "in", !oEndBc.isUp(), 1,
475 oEndBc.getArrTimeObj(), 475 oEndBc.getArrTimeObj(),
476 _paramObj 476 _paramObj
477 ); 477 );
@@ -500,7 +500,7 @@ var Main_v2 = function() { @@ -500,7 +500,7 @@ var Main_v2 = function() {
500 }); 500 });
501 501
502 oTempBc = _factory.createBcObj( 502 oTempBc = _factory.createBcObj(
503 - oLp, "lc", true, 1, 503 + oLp, "lc", !oEndBc.isUp(), 1,
504 oEndBc.getArrTimeObj(), 504 oEndBc.getArrTimeObj(),
505 _paramObj 505 _paramObj
506 ); 506 );