update...

潘钊
1 parent a5ef1942
Showing 10 changed files with 64 additions and 12 deletions
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_major.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/bc_type_venting.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/dftz.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/tzrc.html
src/main/resources/static/real_control_v2/js/line_schedule/context_menu.js
src/main/resources/static/real_control_v2/js/line_schedule/dbclick.js
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/tabs.js
@@ -226,6 +226,13 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             ScheduleRealInfo schedule = dayOfSchedule.get(id);
+            if(schedule.getStatus() > 0){
+                map.put("status", ResponseCode.SUCCESS);
+                map.put("flag", "4008");
+                map.put("t", schedule);
+                return map;
+            }
+
             LineConfig config = lineConfigData.get(schedule.getXlBm());
             //小于线路开始运营时间，则默认跨过24点
             if (dfsj.compareTo(config.getStartOpt()) < 0) {
@@ -59,7 +59,7 @@
     <script>
         (function () {
             var modal = '#bctype-major-modal'
-                    , sch, stationRoutes, parentModal;
+                    , sch, stationRoutes, parentModal, _dfsj;
             $('[name=sendDirective]', modal).on('click', function () {
                 if ($(this)[0].checked)
@@ -134,6 +134,8 @@
                 e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
+                if(data._dfsj)
+                    sch.dfsj = data._dfsj;
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -131,6 +131,8 @@
                 e.stopPropagation();
                 sch = data.sch;
                 parentModal = data.parentModal;
+                if(data._dfsj)
+                    sch.dfsj = data._dfsj;
                 //submit
                 var f = $('form', modal).formValidation(gb_form_validation_opts);
@@ -185,7 +185,7 @@
                         $(document.body).append(htmlStr);
                         UIkit.modal(detailModal, {bgclose: true,modal:false}).show();
-                        $(detailModal).trigger('init', {sch: sch, parentModal: modal});
+                        $(detailModal).trigger('init', {sch: sch, parentModal: modal, _dfsj: $('[name=dfsj]', modal).val()});
                     })
                 });
             });
@@ -169,7 +169,7 @@
                 half_form.addClass('repeat_main destroy_form');
                 //字典转换
                 dictionaryUtils.transformDom($('.nt-dictionary', half_form));
-                sf.after(half_form);
+                inf.after(half_form);
                 //班次类型切换
@@ -108,8 +108,8 @@
                 {{/if}}
             </dd>
             <dd>{{sch.clZbh}}</dd>
-            <dd>{{sch.jGh}}/{{sch.jName}}</dd>
-            <dd>{{sch.sGh}}/{{sch.sName}}</dd>
+            <dd data-old="{{sch.jGh}}/{{sch.jName}}">{{sch.jGh}}/{{sch.jName}}</dd>
+            <dd data-old="{{sch.sGh}}/{{sch.sName}}">{{sch.sGh}}/{{sch.sName}}</dd>
             <dd>
                 {{if sch.status==2}}
                 <span class="ct_zt_yzx">已执行</span>
@@ -160,20 +160,26 @@
                     $('.tzrc-table-wrap', modal).perfectScrollbar('update');
                 });
+
+                writeSch2Form(sch);
                 $(modal).on('click', '.sch-tzrc-table .ct_table_body dl', function () {
                     var cbox = $('input[type=checkbox]',this)[0];
                     //var active = $();
                     if(!$(this).hasClass('active')){
                         $(this).addClass('active');
                         cbox.checked = true;
-                        var lineCode = $('[name=lineSelect]', modal).val();
-                        var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
-
-                        writeSch2Form(sch);
+                        //var lineCode = $('[name=lineSelect]', modal).val();
+                        //var sch = gb_schedule_table.findScheduleByLine(lineCode)[$(this).data('id')];
+                        renderCell();
                     }
                     else{
                         $(this).removeClass('active');
                         cbox.checked = false;
+                        //$(this).find('dd[data-old]').text()
+                        var $jsyCell = $($($(this).find('dd')[2]));
+                        var $spyCell = $($($(this).find('dd')[3]));
+                        $jsyCell.text($jsyCell.data('old'));
+                        $spyCell.text($spyCell.data('old'));
                     }
                 });
@@ -236,8 +242,34 @@
                     });
                     return false;
                 });
+
+                /**
+                 * 驾驶员/售票员文本框改变事件
+                 */
+                var renderRunFlag;
+                $('input[name=jsy],input[name=spy]', modal).on('input change', function () {
+                    if(renderRunFlag)
+                        return;
+                    renderRunFlag = true;
+                    setTimeout(function () {
+                        renderCell();
+                        renderRunFlag = false;
+                    }, 200);
+                });
             });
+            
+            function renderCell() {
+                var jsy = $('input[name=jsy]', modal).val();
+                var spy = $('input[name=spy]', modal).val();
+                $('.sch-tzrc-table .ct_table_body>dl.active').each(function () {
+                    var jsyCell = $(this).find('dd')[2];
+                    var spyCell = $(this).find('dd')[3];
+                    $(jsyCell).text(jsy);
+                    $(spyCell).text(spy);
+                });
+            }
+
             function writeSch2Form(sch) {
                 var f = $('.tzrc_form', modal);
                 $('input[name=clZbh]', f).val(sch.clZbh).trigger('input');
@@ -40,6 +40,10 @@ var gb_schedule_context_menu = (function () {
             return add_sch_doms;
         },
         dftz: function (sch) {
+            if(sch.status > 0){
+                notify_err((sch.status==1?'已发出':'已执行') + '的班次不能修改待发');
+                return;
+            }
             open_modal(folder + '/dftz.html', {
                 sch: sch
             }, modal_opts);
@@ -21,6 +21,11 @@ var gb_schedule_table_dbclick = (function() {
                 remarks: '',
                 opType: '0'
             }, function(rs) {
+                if(rs.flag && rs.flag==4008){
+                    notify_err('已发出的班次不能调整待发');
+                    gb_schedule_table.updateSchedule(rs.t);
+                    return;
+                }
                 gb_schedule_table.updateSchedule(rs.ts);
                 notify_succ('待发调整成功！');
                 //重新计算应发未发
@@ -47,7 +47,7 @@ var gb_main_ep = new EventProxy(),
                 $('li.map-panel', '#main-tab-content').load('/real_control_v2/mapmonitor/real.html');
             }, 1000);
             //弹出更新说明
-            showUpdateDescription();
+            //showUpdateDescription();
         });
         function g_emit(id) {
@@ -18,12 +18,12 @@ var gb_tabs = (function() {
             $('.main-container').html(tabContentHtmlStr);
             setTimeout(renderStyle, 4000);
-            /*//地图选项卡初始点击
+            //地图选项卡初始点击
             $('#north_tabs_map_btn').one('click', function () {
                 if(typeof(gb_map_overlay_mge)!="undefined"){
                     gb_map_overlay_mge.centerToRational();
                 }
-            });*/
+            });
             //班次选项卡第一次点击，更新滚动条高度
             $('.north-tabs .uk-tab li.tab-line').one('click', function(e){