Commit aed3442caf94b039b954a714035347a454336560
1 parent
431db066
update...
Showing
3 changed files
with
19 additions
and
4 deletions
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_turn.html
| @@ -55,7 +55,7 @@ | @@ -55,7 +55,7 @@ | ||
| 55 | $(wrap).on('init', function (e, data) { | 55 | $(wrap).on('init', function (e, data) { |
| 56 | e.stopPropagation(); | 56 | e.stopPropagation(); |
| 57 | sch = data.sch; | 57 | sch = data.sch; |
| 58 | - nextSch = gb_schedule_table.getNextSch(sch); | 58 | + nextSch = gb_schedule_table.getNextNormalSch(sch); |
| 59 | if(!nextSch || nextSch.bcType!='normal'){ | 59 | if(!nextSch || nextSch.bcType!='normal'){ |
| 60 | $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>'); | 60 | $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>'); |
| 61 | return; | 61 | return; |
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
| @@ -557,6 +557,20 @@ var gb_schedule_table = (function () { | @@ -557,6 +557,20 @@ var gb_schedule_table = (function () { | ||
| 557 | } | 557 | } |
| 558 | }; | 558 | }; |
| 559 | 559 | ||
| 560 | + /* 下一个班次普通班次 */ | ||
| 561 | + var getNextNormalSch = function (sch) { | ||
| 562 | + | ||
| 563 | + var array = gb_common.get_vals(line2Schedule[sch.xlBm]).filter(function (a) { | ||
| 564 | + return a.clZbh == sch.clZbh && a.bcType=='normal'; | ||
| 565 | + }).sort(schedule_sort); | ||
| 566 | + | ||
| 567 | + for (var i = 0, item; item = array[i++];) { | ||
| 568 | + if (array[i].id == sch.id) { | ||
| 569 | + return i < array.length ? array[i + 1] : null; | ||
| 570 | + } | ||
| 571 | + } | ||
| 572 | + }; | ||
| 573 | + | ||
| 560 | /** 添加备注信息 */ | 574 | /** 添加备注信息 */ |
| 561 | var addRemarks = function (list, remarks) { | 575 | var addRemarks = function (list, remarks) { |
| 562 | //if(!list || list) | 576 | //if(!list || list) |
| @@ -630,6 +644,7 @@ var gb_schedule_table = (function () { | @@ -630,6 +644,7 @@ var gb_schedule_table = (function () { | ||
| 630 | reLoadAndRefresh: reLoadAndRefresh, | 644 | reLoadAndRefresh: reLoadAndRefresh, |
| 631 | showLateBadge: showLateBadge, | 645 | showLateBadge: showLateBadge, |
| 632 | cancelLateBadge: cancelLateBadge, | 646 | cancelLateBadge: cancelLateBadge, |
| 633 | - refreshAll: refreshAll | 647 | + refreshAll: refreshAll, |
| 648 | + getNextNormalSch: getNextNormalSch | ||
| 634 | }; | 649 | }; |
| 635 | })(); | 650 | })(); |
src/main/resources/static/real_control_v2/js/main.js
| @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) { | @@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) { | ||
| 169 | function showUpdateDescription() { | 169 | function showUpdateDescription() { |
| 170 | //更新说明 | 170 | //更新说明 |
| 171 | var updateDescription = { | 171 | var updateDescription = { |
| 172 | - date: '2017-06-22', | ||
| 173 | - text: '<h5>优化了轨迹回放，可放大缩小窗口、可拖动进度条、手动呼出线路配车...</h5>' | 172 | + date: '2017-07-05', |
| 173 | + text: '<h5>稍微调整了添加子任务的界面</h5><h5>1、现在进出场子任务也必须选择进场原因</h5><h5>2、现在进出场子任务可以勾选 “无售票员” 如果是无人售票线路，请忽略这个选项</h5><h5>3、现在做中途进场子任务时，可以勾选“换车出场至中途站继续营运”</h5>' | ||
| 174 | }; | 174 | }; |
| 175 | 175 | ||
| 176 | var storage = window.localStorage | 176 | var storage = window.localStorage |