update...

潘钊
1 parent d91fbcf1
Showing 8 changed files with 99 additions and 34 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/resources/static/real_control_v2/css/main.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_custom.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_in_out.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_normal.html
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/line_schedule/context_menu.js
@@ -482,7 +482,7 @@ public class InOutStationSignalHandle extends SignalHandle{
         boolean limitPark = StringUtils.isNotEmpty(park);
-        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().equals(0))
+        if (next.getBcType().equals("in") && config.getOutConfig() == 2 && (next.getBcsj()==0 || next.getJhlcOrig().intValue()==0)
                 && (!limitPark || park.equals(next.getZdzCode()))) {
             next.setFcsjActualAll(sch.getZdsjActualTime());
@@ -1411,10 +1411,11 @@ ul.left_tabs_lg li{
     border-bottom: none;
 }
-.add_range_wrap>.err_panel{
-    font-size: 16px;
-    color: #a44a4a;
+.err_panel{
+    font-size: 12px;
+    color: #7e7d7d;
     font-family: 微软雅黑;
+    margin-top: 5px;
 }
 #schedule-lp_change-modal .ct_table dl{
@@ -1458,6 +1459,16 @@ ul.left_tabs_lg li{
     background: #ffffff;
 }
+.sub_task_form_v2.service_form.temp_service:before{
+    content: '营运 (临加)';
+    color: #9C27B0;
+    background: #ffffff;
+}
+
+.sub_task_form_v2.service_form.temp_service {
+    background: #faf0fd;
+}
+
 .sub_task_form_v2.empty_form:before{
     content: '空驶';
     color: #928f92;
@@ -3,7 +3,7 @@
     <span class="plus_icon_span">
         <i class="uk-icon-plus"></i>
     </span>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -14,7 +14,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -76,7 +76,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
+                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
                 $(this).data('valid', true);
                 if(allValidSuccess()){
@@ -93,21 +93,21 @@
                         }
                         var data = dataArray[i];
                         //营运里程为0的不保存
-                        if(data.mileageType == 'service' && data.mileage==0){
+                        /*if(data.mileageType == 'service' && data.mileage==0){
                             i++;
                             f();
                         }
-                        else{
+                        else{*/
                             //营运子任务不写备注
-                            if(data.mileageType == 'service' && !data.destroy)
-                                data.remarks = '';
+                            /*if(data.mileageType == 'service' && !data.destroy)
+                                data.remarks = '';*/
                             gb_common.$post('/childTask', data, function (rs) {
                                 notify_succ('子任务添加成功');
                                 rst = rs.t;
                                 i++;
                                 f();
                             });
-                        }
+                        //}
                     })();
                 }
             });
 <div class="add_inOut_wrap">
     <div class="forms"></div>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -11,7 +11,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -276,7 +276,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val(), 'schedule.id': sch.id}));
+                        , {/*remarks: $('#form-s-t',wrap).val(), */'schedule.id': sch.id}));
                 $(this).data('valid', true);
                 if(allValidSuccess()){
@@ -299,8 +299,8 @@
                         }
                         else{
                             //营运子任务不写备注
-                            if(data.mileageType == 'service' && !data.destroy)
-                                data.remarks = '';
+                            /*if(data.mileageType == 'service' && !data.destroy)
+                                data.remarks = '';*/
                             gb_common.$post('/childTask', data, function (rs) {
                                 notify_succ('子任务添加成功');
                                 rst = rs.t;
+<!-- 区间变全程 -->
+<div class="add_range_2_normal">
+    <div class="err_panel">暂不开放使用</div>
+    <!--<div class="forms"></div>
+
+    <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
+        <button type="button" class="uk-button uk-modal-close">取消</button>
+        <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
+    </div>
+    <script>
+        (function () {
+            var wrap = '#add-sub-task-main-modal .add_range_2_normal',
+                    sch,f1,tf1;
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+
+                f1 = addTaskForm();
+                tf1 = addTaskForm();
+                tf1.addClass('temp_service');
+            });
+
+            function addTaskForm() {
+                var htmlStr = template('sub-task-v2-form-temp', {sch: sch});
+                var f = $(htmlStr);
+                $('.forms', wrap).append(f);
+                //字典转换
+                dictionaryUtils.transformDom($('.nt-dictionary', f));
+
+                //班次类型切换
+                $('select[name=type2]', f).trigger('change');
+
+                //滚动条到底
+                $('.forms', wrap).scrollTop($('.forms', wrap)[0].scrollHeight);
+
+                f.formValidation({
+                    framework: 'uikit',
+                    locale: 'zh_CN'
+                }).on('add_reason_field', function () {
+                    $(this).formValidation('addField', 'reason');
+                });
+                return f;
+            }
+        })();
+    </script>-->
+</div>
 \ No newline at end of file
@@ -30,7 +30,7 @@
     </div>
     <div class="forms"></div>
-    <form class="uk-form remarks_form">
+<!--    <form class="uk-form remarks_form">
         <div class="uk-grid">
             <div class="uk-width-1-1">
                 <div class="uk-form-row ct-stacked">
@@ -41,7 +41,7 @@
                 </div>
             </div>
         </div>
-    </form>
+    </form>-->
     <div class="uk-modal-footer uk-text-right" style="margin-top: 5px;">
         <button type="button" class="uk-button uk-modal-close">取消</button>
         <button type="submit" class="uk-button uk-button-primary"><i class="uk-icon-check"></i> &nbsp;保存</button>
@@ -55,9 +55,9 @@
             $(wrap).on('init', function (e, data) {
                 e.stopPropagation();
                 sch = data.sch;
-                nextSch = gb_schedule_table.getNextNormalSch(sch);
-                if(!nextSch || nextSch.bcType!='normal'){
-                    $(wrap).html('<div class="err_panel">无法做区间调头，原因是没有找到返程班次！</div>');
+                nextSch = gb_schedule_table.getNextSch(sch);
+                if(!nextSch || nextSch.bcType=='in' || nextSch.bcType=='out'){
+                    $(wrap).html('<div class="err_panel">当前班次类型不支持直接应用区间调头模板！</div>');
                     return;
                 }
@@ -67,7 +67,7 @@
                 }), 'directions');
                 //第一段营运
                 f1 = addTaskForm();
-                $f('startStation', f1).trigger('change');
+                $f('startStation', f1).val(sch.qdzCode).trigger('change');
                 disabled_form(f1);
                 $('.domains', f1).empty();
@@ -247,7 +247,7 @@
                 e.preventDefault();
                 dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)
-                        , {remarks: $('#form-s-t',wrap).val()}));
+                        /*, {remarks: $('#form-s-t',wrap).val()}*/));
                 $(this).data('valid', true);
                 if (allValidSuccess()) {
@@ -267,8 +267,8 @@
                         }
                         var data = dataArray[i];
                         //营运子任务不写备注
-                        if(data.mileageType == 'service' && !data.destroy)
-                            data.remarks = '';
+                        /*if(data.mileageType == 'service' && !data.destroy)
+                            data.remarks = '';*/
                         gb_common.$post('/childTask', data, function (rs) {
                             notify_succ('子任务添加成功');
                             gb_schedule_table.updateSchedule(rs.t);
@@ -10,7 +10,7 @@
                     <li name="normal"><a>1、子任务</a></li>
                     <li name="in_out"><a>2、进出场</a></li>
                     <li name="range_turn"><a>3、区间调头</a></li>
-                    <!--<li name="range_to_normal"><a>4、区间变全程</a></li>-->
+                    <li name="range_to_normal"><a>4、区间变全程</a></li>
                 </ul>
             </div>
             <div class="uk-width-8-10">
@@ -18,7 +18,7 @@
                     <li class="tab_cont normalCont"></li>
                     <li class="tab_cont inOutCont"></li>
                     <li class="tab_cont rangeTurnCont"></li>
-                    <!--<li class="tab_cont rangeToNormal"></li>-->
+                    <li class="tab_cont rangeToNormal"></li>
                 </ul>
             </div>
         </div>
@@ -95,10 +95,12 @@
                 </div>
                 <div class="uk-width-1-3">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">公里数</label>
+                        <label class="uk-form-label">公里</label>
                         <div class="uk-form-controls">
                             <input class="form-control" name="mileage" max=222 data-fv-lessthan-inclusive="false"
-                                   required>
+                                   required style="width: 42%;">
+                            <select class="form-control nt-dictionary" required name="mileageType"
+                                    data-group="MileageType" style="width: 52%;"></select>
                         </div>
                     </div>
                 </div>
@@ -108,10 +110,10 @@
                 <div class="uk-width-2-3 domains"></div>
                 <div class="uk-width-1-3">
                     <div class="uk-form-row">
-                        <label class="uk-form-label">里程类型</label>
+                        <label class="uk-form-label">备注</label>
                         <div class="uk-form-controls">
-                            <select class="form-control nt-dictionary" required name="mileageType"
-                                    data-group="MileageType"></select>
+                            <!--<select class="form-control nt-dictionary" required name="remarks"></select>-->
+                            <input class="form-control" name="remarks" data-fv-stringlength-max="50" data-fv-stringlength="true">
                         </div>
                     </div>
                 </div>
@@ -245,6 +247,8 @@
                     $('.rangeTurnCont', modal).html(st_doms.range_dom);
                     $('.add_range_wrap', modal).trigger('init', data);
                     //区间变全程
+                    $('.rangeToNormal', modal).html(st_doms.range_2_normal_dom);
+                    //$('.add_range_2_normal', modal).trigger('init', data);
                 }
             });
@@ -505,7 +509,7 @@
                 }
                 else {
                     var cont = f.parents('li.tab_cont'),
-                            remInput = $('.remarks_form [name=remarks]', cont);
+                            remInput = $('[name=remarks]', cont);
                     if(remInput.val()==reason + ',')
                         return;
@@ -19,6 +19,9 @@ var gb_schedule_context_menu = (function () {
     $.get(folder + '/sub_task_v2/add_range_turn.html', function (dom) {
         st_doms.range_dom=dom;
     });
+    $.get(folder + '/sub_task_v2/add_range_normal.html', function (dom) {
+        st_doms.range_2_normal_dom=dom;
+    });
     //提前缓存临加的片段页面
     var add_sch_doms={};
     $.get(folder + '/temp_sch/add_normal.html', function (dom) {