潘钊 / 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 1556 oEndBc.fnSetIsLastBc(false); // 有可能最后一个班次是吃饭班次，重置
1557 1557 oEndBc.fnSetEatTime(0); // 有可能最后一个班次是吃饭班次，重置
1558 1558 aOtherBc.push(_factory.createBcObj(
1559   - oLp, "in", oEndBc.isUp(), 1,
  1559 + oLp, "in", !oEndBc.isUp(), 1,
1560 1560 oEndBc.getArrTimeObj(),
1561 1561 _paramObj
1562 1562 ));
1563 1563 aOtherBc.push(_factory.createBcObj(
1564   - oLp, "lc", oEndBc.isUp(), 1,
  1564 + oLp, "lc", !oEndBc.isUp(), 1,
1565 1565 oEndBc.getArrTimeObj(),
1566 1566 _paramObj
1567 1567 ));
... ... @@ -1587,7 +1587,7 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
1587 1587 oLp.fnGetBcChainInfo(0)["e_b"]
1588 1588 );
1589 1589 aOtherBc.push(_factory.createBcObj(
1590   - oLp, "in", oEndBc.isUp(), 1,
  1590 + oLp, "in", !oEndBc.isUp(), 1,
1591 1591 oEndBc.getArrTimeObj(),
1592 1592 _paramObj
1593 1593 ));
... ... @@ -1613,12 +1613,12 @@ var InternalScheduleObj = function(paramObj, lpArray, factory) {
1613 1613 oLp.fnGetBcChainInfo(1)["e_b"]
1614 1614 );
1615 1615 aOtherBc.push(_factory.createBcObj(
1616   - oLp, "in", oEndBc.isUp(), 1,
  1616 + oLp, "in", !oEndBc.isUp(), 1,
1617 1617 oEndBc.getArrTimeObj(),
1618 1618 _paramObj
1619 1619 ));
1620 1620 aOtherBc.push(_factory.createBcObj(
1621   - oLp, "lc", oEndBc.isUp(), 1,
  1621 + oLp, "lc", !oEndBc.isUp(), 1,
1622 1622 oEndBc.getArrTimeObj(),
1623 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 187 oInternalLp.fnGetBcChainInfo(0)["s_b"]
188 188 );
189 189 oTempBc = _factory.createBcObj(
190   - oLp, "bd", true, 1,
  190 + oLp, "bd", oStartBc.isUp(), 1,
191 191 oStartBc.getFcTimeObj(),
192 192 _paramObj
193 193 );
... ... @@ -213,7 +213,7 @@ var Main_v2 = function() {
213 213 });
214 214  
215 215 oTempBc = _factory.createBcObj(
216   - oLp, "out", true, 1,
  216 + oLp, "out", oStartBc.isUp(), 1,
217 217 oStartBc.getFcTimeObj(),
218 218 _paramObj
219 219 );
... ... @@ -249,7 +249,7 @@ var Main_v2 = function() {
249 249 );
250 250 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
251 251 oTempBc = _factory.createBcObj(
252   - oLp, "in", true, 1,
  252 + oLp, "in", !oEndBc.isUp(), 1,
253 253 oEndBc.getArrTimeObj(),
254 254 _paramObj
255 255 );
... ... @@ -278,7 +278,7 @@ var Main_v2 = function() {
278 278 });
279 279  
280 280 oTempBc = _factory.createBcObj(
281   - oLp, "lc", true, 1,
  281 + oLp, "lc", !oEndBc.isUp(), 1,
282 282 oEndBc.getArrTimeObj(),
283 283 _paramObj
284 284 );
... ... @@ -311,7 +311,7 @@ var Main_v2 = function() {
311 311 oInternalLp.fnGetBcChainInfo(0)["s_b"]
312 312 );
313 313 oTempBc = _factory.createBcObj(
314   - oLp, "bd", true, 1,
  314 + oLp, "bd", oStartBc.isUp(), 1,
315 315 oStartBc.getFcTimeObj(),
316 316 _paramObj
317 317 );
... ... @@ -337,7 +337,7 @@ var Main_v2 = function() {
337 337 });
338 338  
339 339 oTempBc = _factory.createBcObj(
340   - oLp, "out", true, 1,
  340 + oLp, "out", oStartBc.isUp(), 1,
341 341 oStartBc.getFcTimeObj(),
342 342 _paramObj
343 343 );
... ... @@ -373,7 +373,7 @@ var Main_v2 = function() {
373 373 );
374 374 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
375 375 oTempBc = _factory.createBcObj(
376   - oLp, "in", true, 1,
  376 + oLp, "in", !oEndBc.isUp(), 1,
377 377 oEndBc.getArrTimeObj(),
378 378 _paramObj
379 379 );
... ... @@ -408,7 +408,7 @@ var Main_v2 = function() {
408 408 oInternalLp.fnGetBcChainInfo(1)["s_b"]
409 409 );
410 410 oTempBc = _factory.createBcObj(
411   - oLp, "bd", true, 1,
  411 + oLp, "bd", oStartBc.isUp(), 1,
412 412 oStartBc.getFcTimeObj(),
413 413 _paramObj
414 414 );
... ... @@ -434,7 +434,7 @@ var Main_v2 = function() {
434 434 });
435 435  
436 436 oTempBc = _factory.createBcObj(
437   - oLp, "out", true, 1,
  437 + oLp, "out", oStartBc.isUp(), 1,
438 438 oStartBc.getFcTimeObj(),
439 439 _paramObj
440 440 );
... ... @@ -471,7 +471,7 @@ var Main_v2 = function() {
471 471 );
472 472 aFcsj.push("(" + oEndBc.getFcTimeObj().format("HH:mm") + ")");
473 473 oTempBc = _factory.createBcObj(
474   - oLp, "in", true, 1,
  474 + oLp, "in", !oEndBc.isUp(), 1,
475 475 oEndBc.getArrTimeObj(),
476 476 _paramObj
477 477 );
... ... @@ -500,7 +500,7 @@ var Main_v2 = function() {
500 500 });
501 501  
502 502 oTempBc = _factory.createBcObj(
503   - oLp, "lc", true, 1,
  503 + oLp, "lc", !oEndBc.isUp(), 1,
504 504 oEndBc.getArrTimeObj(),
505 505 _paramObj
506 506 );
... ...