修复区间调头公里提示错误问题

潘钊
1 parent ecad1f45
Showing 3 changed files with 59 additions and 32 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/fragments/line_schedule/context_menu/sub_task_v2/main.html
src/main/resources/static/real_control_v2/js/main.js
@@ -85,10 +85,13 @@
             });
  
  
-            function addTaskForm() {
+            function addTaskForm(upDownInput) {
                 var htmlStr = template('sub-task-v2-form-temp', {sch: sch});
                 var f = $(htmlStr);
                 $('.forms', wrap).append(f);
+
+                if(upDownInput)
+                    f.append(upDownInput);
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', f));
  
@@ -110,8 +113,8 @@
             function disabled_form(f) {
                 //$('input,select',f).attr('disabled', 'disabled');
                 $f('type2', f).attr('disabled', 'disabled');
-                $f('startStation', f).attr('disabled', 'disabled');
-                $f('endStation', f).attr('disabled', 'disabled');
+                //$f('startStation', f).attr('disabled', 'disabled');
+                //$f('endStation', f).attr('disabled', 'disabled');
                 $f('mileageType', f).attr('disabled', 'disabled');
                 $f('destroy', f).attr('disabled', 'disabled');
                 return f;
@@ -138,10 +141,12 @@
  
                 //烂班1
                 df1 = destroyForm(disabled_form(addTaskForm()));
+
+                var u_d_input = '<input name="upDown" type="hidden" value="'+nextSch.xlDir+'">';
                 //烂班2
-                df2 = destroyForm(disabled_form(addTaskForm()));
+                df2 = destroyForm(disabled_form(addTaskForm(u_d_input)));
                 //营运2
-                f2 = disabled_form(addTaskForm());
+                f2 = disabled_form(addTaskForm(u_d_input));
                 $('.domains', f2).empty();
  
  
@@ -149,16 +154,19 @@
                 $f('endStation', f1).val(eCode).trigger('change');
                 //烂班1起点
                 $f('startStation', df1).val(eCode).trigger('change');
+
+                //nextSch
+                var d_code = searchParallelStation($('#turnStationSelect>option:selected', topf).text());
                 //烂班2
-                $f('startStation', df2).val(sch.zdzCode);
-                $f('endStation', df2).val(eCode);
-                $f('mileage', df2).val($f('mileage', df1).val()).trigger('input');
+                $f('startStation', df2).val(nextSch.qdzCode);
+                $f('endStation', df2).val(d_code).trigger('change');
+                //$f('mileage', df2).val($f('mileage', df1).val()).trigger('input');
                 $('[sch_id_inp]', df2).val(nextSch.id);
                 //营运2
-                $f('startStation', f2).val(eCode);
-                $f('endStation', f2).val(sch.qdzCode);
-                $f('startDate',f2).val($f('endDate',f1).val());
-                $f('mileage', f2).val($f('mileage', f1).val()).trigger('input');
+                $f('startStation', f2).val(d_code).trigger('change');
+                $f('endStation', f2).val(nextSch.zdzCode);
+                //$f('startDate',f2).val($f('endDate',f1).val());
+                //$f('mileage', f2).val($f('mileage', f1).val()).trigger('input');
                 $('[sch_id_inp]', f2).val(nextSch.id);
  
                 //set css
@@ -285,6 +293,18 @@
                 });
                 return flag;
             }
+
+
+            //返回另一个走向对应的站点
+            function searchParallelStation(stationName) {
+                var routes = stationRoutes[nextSch.xlDir]
+                        , len = routes.length;
+
+                for (var i = 0; i < len; i++) {
+                    if (routes[i].stationName == stationName)
+                        return routes[i].stationCode;
+                }
+            }
         })();
     </script>
 </div>
 \ No newline at end of file
@@ -59,7 +59,7 @@
                     <div class="uk-form-row">
                         <label class="uk-form-label">起点 </label>
                         <div class="uk-form-controls">
-                            <select name="startStation" ></select>
+                            <select name="startStation" required></select>
                         </div>
                     </div>
                 </div>
@@ -67,7 +67,7 @@
                     <div class="uk-form-row">
                         <label class="uk-form-label">终点</label>
                         <div class="uk-form-controls">
-                            <select name="endStation" ></select>
+                            <select name="endStation" required></select>
                         </div>
                     </div>
                 </div>
@@ -300,8 +300,10 @@
              */
             function reCalcInputs_type() {
                 var f = $(this).parents('.sub_task_form_v2');
-
-                var routes = stationRoutes[sch.xlDir]
+                var upDown = sch.xlDir;
+                if($('[name=upDown]', f).length>0)
+                    upDown = $('[name=upDown]', f).val();
+                var routes = stationRoutes[upDown]
                         , lastCode = routes[routes.length - 1].stationCode
                         , opts = '', park_opts = '';
                 //station options
@@ -374,7 +376,9 @@
                         upDown = inout_updown(zdzCode, sch);
                         break;
                     default:
-                        upDown = sch.xlDir
+                        upDown = sch.xlDir;
+                        if($('[name=upDown]',f).length>0)
+                            upDown = $('[name=upDown]',f).val();
                 }
  
                 //从站到场里获取数据
@@ -572,22 +576,25 @@
                 if(!st_park_data)
                     return;
                 var stp;
-                var qdSelect=$f('startStation', f)[0],zdSelect=$f('endStation', f)[0];
+                try{
+                    var qdSelect=$f('startStation', f)[0],zdSelect=$f('endStation', f)[0];
  
-                var qdzName=qdSelect.options[qdSelect.options.selectedIndex].text,
-                        zdzName=zdSelect.options[zdSelect.options.selectedIndex].text,
-                        type2 = $f('type2', f).val();
+                    var qdzName=qdSelect.options[qdSelect.options.selectedIndex].text,
+                            zdzName=zdSelect.options[zdSelect.options.selectedIndex].text,
+                            type2 = $f('type2', f).val();
  
-                if(type2!=2 && type2!=3)
-                    return;
+                    if(type2!=2 && type2!=3)
+                        return;
  
-                $.each(st_park_data, function () {
-                    if((type2==2 && this.stationName==qdzName && this.parkName==zdzName)
-                            || (type2==3 && this.stationName==zdzName && this.parkName==qdzName)){
-                        stp = this;
-                        return false;
-                    }
-                });
+                    $.each(st_park_data, function () {
+                        if((type2==2 && this.stationName==qdzName && this.parkName==zdzName)
+                                || (type2==3 && this.stationName==zdzName && this.parkName==qdzName)){
+                            stp = this;
+                            return false;
+                        }
+                    });
+                }catch (e){
+                    console.log(e);}
  
                 return stp;
             }
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-07-26',
-        text: '<h5>1、修复一个临时性的小问题，这个问题导致26号上午，起点站和第2站缓冲区重叠的几条线路发不出去！</h5>'
+        date: '2017-08-13',
+        text: '<h5>1、修复了 “子任务-区间调头” 当上下行里程不等时，站间距公里提示错误的问题！</h5>'
     };
  
     var storage = window.localStorage