update...

潘钊
1 parent 431db066
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
src/main/resources/static/real_control_v2/js/line_schedule/sch_table.js
src/main/resources/static/real_control_v2/js/main.js
@@ -55,7 +55,7 @@
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
-                nextSch = gb_schedule_table.getNextSch(sch);
+                nextSch = gb_schedule_table.getNextNormalSch(sch);
                 if(!nextSch || nextSch.bcType!='normal'){
                     $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>');
                     return;
@@ -557,6 +557,20 @@ var gb_schedule_table = (function () {
         }
     };
  
+    /* 下一个班次普通班次 */
+    var getNextNormalSch = function (sch) {
+
+        var array = gb_common.get_vals(line2Schedule[sch.xlBm]).filter(function (a) {
+            return a.clZbh == sch.clZbh && a.bcType=='normal';
+        }).sort(schedule_sort);
+
+        for (var i = 0, item; item = array[i++];) {
+            if (array[i].id == sch.id) {
+                return i < array.length ? array[i + 1] : null;
+            }
+        }
+    };
+
     /** 添加备注信息 */
     var addRemarks = function (list, remarks) {
         //if(!list || list)
@@ -630,6 +644,7 @@ var gb_schedule_table = (function () {
         reLoadAndRefresh: reLoadAndRefresh,
         showLateBadge: showLateBadge,
         cancelLateBadge: cancelLateBadge,
-        refreshAll: refreshAll
+        refreshAll: refreshAll,
+        getNextNormalSch: getNextNormalSch
     };
 })();
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-06-22',
-        text: '<h5>优化了轨迹回放，可放大缩小窗口、可拖动进度条、手动呼出线路配车...</h5>'
+        date: '2017-07-05',
+        text: '<h5>稍微调整了添加子任务的界面</h5><h5>1、现在进出场子任务也必须选择进场原因</h5><h5>2、现在进出场子任务可以勾选 “无售票员” 如果是无人售票线路，请忽略这个选项</h5><h5>3、现在做中途进场子任务时，可以勾选“换车出场至中途站继续营运”</h5>'
     };
  
     var storage = window.localStorage