Merge branch 'minhang' into pudong

潘钊
2 parents 79c8f581 d407ae71
Showing 10 changed files with 506 additions and 190 deletions
src/main/java/com/bsth/data/gpsdata/arrival/handlers/InOutStationSignalHandle.java
src/main/java/com/bsth/data/schedule/late_adjust/LateAdjustHandle.java
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/inoutstation/inoutstation.html
src/main/resources/static/pages/summary/fast_and_slow/data.html
src/main/resources/static/pages/summary/fast_and_slow/f_a_s_wrap.html
src/main/resources/static/pages/summary/fast_and_slow/main.html
src/main/resources/static/pages/summary/work_hours/list.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/js/utils/dispatch_pattern.js
@@ -358,6 +358,8 @@ public class InOutStationSignalHandle extends SignalHandle{
             //通知客户端
             sendUtils.sendZdsj(sch, lpNext, doneSum);
             logger.info("车辆：" + sch.getClZbh() + " 班次：" + sch.getDfsj() + "到终点， 时间：" + sch.getZdsjActual());
+            //清除车辆误点调整监听
+            LateAdjustHandle.remove(sch.getClZbh());
             //准备执行下一个班次
             if (next != null) {
                 //将gps转换为下一个班次走向的站内信号
@@ -117,6 +117,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
             sch.setLateMinute(0);
             sch.setDfAuto(false);
+            lateSchMap.remove(nbbm);
             logger.info("移除误点调整 nbbm -" + nbbm);
         }
     }
@@ -141,7 +142,7 @@ public class LateAdjustHandle implements ApplicationContextAware{
                 //自动调整待发 到达时间 + 停靠时间
                 long dt = Arith.addLong(gps.getTimestamp(), (sch.getLateMinute() * 60 * 1000));
-                //超过2小时最大阈值，放弃
+                //超过2小时最大阈值，放弃 -临时代码，待删除
                 if(Math.abs(dt - sch.getDfsjT()) > 1000 * 60 * 60 * 2){
                     logger.info(sch.getClZbh() + " 超过误点调整阈值，放弃");
                 }
@@ -5,9 +5,6 @@
 		    text-overflow: ellipsis;
 	   }
-	   #ylbtable  .ps-scrollbar-y{
-	   	 min-height:100px;
-	   }
 </style>
 <div class="page-head">
     <div class="page-title">
@@ -168,7 +165,7 @@
 		</div>
 	</div>
-	<div id="ylbtable" class="portlet-body table-container " style="height: calc(100% - 200px);overflow: hidden;position: absolute;background: #fff;">
+	<div id="ylbtable" class="portlet-body table-container " style="height: calc(100% + 100px);overflow: hidden;position: absolute;background: #fff;">
 		<table
 			class="table table-striped table-bordered table-hover table-checkable"
@@ -70,7 +70,7 @@
 						</div>
 						<div style="display: inline-block; margin-left: 5px;">
 						<input class="btn btn-default" type="button" id="query" value="查询" />
-<!-- 						<input class="btn btn-default" type="button" id="export" value="导出" /> -->
+						<input class="btn btn-default" type="button" id="export" value="导出" />
 					</div>
 					</div>
@@ -127,9 +127,7 @@
 				layer.msg("请选择方向");
 			}else{
 				$get('/report/queryStrinon',{line:line,zd:zdlx},function(result){	
-					console.log(result);
 					$get('/report/queryInOutStrtions',{line:line,date:date,zd:zdlx,lzsj:lzsj},function(result2){
-						console.log(result2);
 // 					    /* getTime(result); */
 						var ludan_ll_1 = template('ludan_ll_1',{lists:result,list:result2});
 // 						// 把渲染好的模版html文本追加到表格中
@@ -172,19 +170,16 @@
 		$("#export").on("click",function(){
-			var rq=$("#date").val();
-			var line=$("#line").val();
-			var nbbm=$("#nbbm").val();
-			var fcsj=$("#fcsj_xx").val();
-			var ddsj=$("#ddsj_xx").val();
-			if(fcsj==""){
-				layer.msg("没数据");
-			}else{
-				$get('/report/exportQueryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
-					window.open("/downloadFile/download?fileName=班次到离站");
-				});
-			}
-			
+			    var curTbl = document.getElementById("forms");
+			    var oXL = new ActiveXObject("Excel.Application");
+			    var oWB = oXL.Workbooks.Add();
+			    var oSheet = oWB.ActiveSheet;
+			    var sel = document.body.createTextRange();
+			    sel.moveToElementText(curTbl);
+			    sel.select();
+			    sel.execCommand("Copy");
+			    oSheet.Paste();
+			    oXL.Visible = true;
 		});
 	});
@@ -193,8 +188,13 @@
 <script type="text/html" id="ludan_ll_1">
 	  {{each list as obj i}}
 		<tr>
-			<td>{{obj.bc}}</td>
-			<td><label>{{obj.nbbm}}</label></td>
+			 {{if i==0}}
+			   <td>序号</td>
+			   <td>内部编码</label></td>
+				{{else}}
+			<td>{{i}}</td>
+			   <td><label>{{obj.nbbm}}</label></td>
+			{{/if}}
 				{{each lists as o j}}
 			 		 {{if i==0}}
 						<td>
@@ -206,8 +206,7 @@
 						<td {{if obj[o.stationCode] =='y'}}style="color: red"{{/if}}>
 							{{if obj[(o.stationCode)+'in']!=''}}
 							<label>	I {{obj[(o.stationCode)+'in']}}</label>
-					{{/if}}
-				<br/>
+					{{/if}}<br/>
 					{{if obj[(o.stationCode)+'out']!=''}}
 				      <label>  O{{obj[(o.stationCode)+'out']}}</label>
 					{{/if}}
+<div class="ct_data_body_wrap">
+    <div class="uk-card uk-card-default uk-card-body ct_rq_left">
+        <ul uk-scrollspy-nav="closest: li; scroll: true; offset: 100"
+            class="uk-nav uk-nav-default tm-nav uk-nav-parent-icon">
+            <li class="uk-active"><a href="#table_20171010">2017-10-10</a></li>
+            <li><a href="#table_20171011">2017-10-11</a></li>
+            <li><a href="#table_20171012">2017-10-12</a></li>
+            <li><a href="#table_20171013">2017-10-13</a></li>
+            <li><a href="#table_20171014">2017-10-14</a></li>
+            <li><a href="#table_20171015">2017-10-15</a></li>
+            <li><a href="#table_20171016">2017-10-16</a></li>
+        </ul>
+    </div>
+
+    <div class="uk-card uk-card-default uk-card-body ct_right_tables">
+        <div id="table_20171010">
+            <table>
+
+            </table>
+        </div>
+    </div>
+
+    <script>
+        (function () {
+            var wrap = '.ct_data_body_wrap';
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                console.log('data init');
+
+            });
+        })();
+    </script>
+</div>
 \ No newline at end of file
+<!-- 快慢误点统计 -->
+<iframe src="/pages/summary/fast_and_slow/main.html?origin=real_control_iframe" frameborder="0" style="height: 100%;width: 100%;"></iframe>
 \ No newline at end of file
+<!DOCTYPE html>
+<html lang="zh-cn">
+
+<head>
+    <meta charset="UTF-8">
+    <link rel="stylesheet" href="/assets/plugins/uk3.0/uikit.min.css"/>
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.css" />
+    <!-- flatpickr -->
+    <link rel="stylesheet" href="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.css">
+    <style>
+        html,body{
+            height: 100%;
+        }
+        .ct_page{
+            padding: 25px 15px;
+            height: 100%;
+            height: calc(100% - 50px);
+        }
+
+        .ct_cont{
+            height: calc(100% - 35px);
+        }
+
+        .ct_cont>div>div.uk-card{
+            height: 99%;
+        }
+
+        .loading{
+            height: 100%;
+            text-align: center;
+        }
+        .loading .uk-spinner{
+            margin-top: 200px;
+        }
+        .loading circle{
+            stroke: red;
+        }
+
+        .ps-container > .ps-scrollbar-x-rail, .ps-container > .ps-scrollbar-y-rail{
+            opacity: 0.6 !important;
+            padding: 0 !important;
+        }
+
+        .ct_search_form_wrap{
+            border-bottom: 1px solid #e5e5e5;
+            padding: 10px 0 25px 10px;
+        }
+        .ct_search_form_wrap .ct_field{
+            display: inline-block;
+            margin: 0 5px;
+        }
+
+        .ct_search_form_wrap .ct_field label{
+            font-size: 14px;
+        }
+
+        .ct_search_form_wrap .ct_field input[type=text]{
+            width: 110px;
+        }
+
+        .ct_search_form_wrap .ct_field select{
+            width: auto;
+            min-width: 100px;
+        }
+
+        .ct_search_form_wrap .uk-button{
+            padding: 0 14px;
+        }
+
+        .ct_search_form_wrap .uk-button i{
+            vertical-align: middle;
+            margin-top: -2px;
+            margin-right: 7px;
+        }
+
+        .ct_field.ct_field_bottom{
+            vertical-align: bottom;
+            font-size: 12px;
+            margin-left: 0;
+        }
+
+        .ct_cont_body{
+            height: calc(100% - 88px);
+            width: 100%;
+            padding-top: 12px;
+        }
+
+        .ct_data_body_wrap{
+            height: 100%;
+            width: 100%;
+        }
+
+        .ct_rq_left{
+            width: 200px;
+            display: inline-block;
+            vertical-align: top;
+            height: 99%;
+            height: calc(100% - 5px);
+        }
+
+        .ct_right_tables{
+            width: calc(100% - 220px);
+            display: inline-block;
+            margin-left: 12px;
+            height: 99%;
+            height: calc(100% - 5px);
+        }
+
+        .tm-nav>li a{
+            position: relative;
+            font-size: 15px;
+        }
+        .tm-nav>li.uk-active>a:before {
+            content: "";
+            position: absolute;
+            width: 15px;
+            border-top: 1px solid #1e87f0;
+            z-index: 9;
+            right: 60px;
+            top: 15px;
+        }
+        .uk-nav-default>li.uk-active>a {
+            color: #222;
+        }
+    </style>
+</head>
+
+<body>
+<div class="loading">
+    <div uk-spinner></div>
+</div>
+<div class="ct_page" style="display: none;">
+    <h3 class="uk-heading-line uk-heading-bullet"><span>快慢误点统计</span></h3>
+    <div class="ct_cont" >
+        <div class="ct_search_form_wrap">
+            <form>
+                <div class="ct_field">
+                    <label>公司：
+                        <select class="uk-select" name="companyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>分公司：
+                        <select class="uk-select" name="subCompanyId_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>线路：
+                        <select class="uk-select" name="lineCode_eq">
+                        </select>
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label>日期范围：
+                        <input class="uk-input" name="rq" style="width: 200px;">
+                    </label>
+                </div>
+                <div class="ct_field">
+                    <label><input class="uk-radio" type="radio" name="type" checked> 全部</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type"> 快误</label>&nbsp;
+                    <label><input class="uk-radio" type="radio" name="type"> 慢误</label>
+                </div>
+                <div class="ct_field">
+                    <button class="uk-button uk-button-primary search"><i uk-icon="icon: search"></i>搜索</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <button class="uk-button uk-button-text" style="padding: 0 5px;">导出数据</button>
+                </div>
+                <div class="ct_field ct_field_bottom">
+                    <span uk-icon="icon: question" title="统计 “正常”、“区间”、“放站” 班次" uk-tooltip="pos: bottom"></span>
+                </div>
+            </form>
+        </div>
+
+        <div class="ct_cont_body">
+        </div>
+    </div>
+</div>
+
+<script src="/metronic_v4.5.4/plugins/jquery.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit.min.js"></script>
+<script src="/assets/plugins/uk3.0/uikit-icons.min.js"></script>
+<script src="/real_control_v2/assets/plugins/perfect-scrollbar/perfect-scrollbar.jquery.js" ></script>
+<!-- EventProxy  -->
+<script src="/assets/js/eventproxy.js"></script>
+<!-- art-template 模版引擎 -->
+<script src="/assets/plugins/template.js"></script>
+<script src="/real_control_v2/assets/plugins/moment/moment.min.js"></script>
+<!-- jquery.serializejson JSON序列化插件 -->
+<script src="/assets/plugins/jquery.serializejson.js"  merge="plugins"></script>
+<!-- flatpickr -->
+<script src="/real_control_v2/assets/plugins/flatpickr/flatpickr.min.js" ></script>
+<script src="/real_control_v2/assets/plugins/flatpickr/l10n/zh.js" ></script>
+<script>
+
+(function () {
+    //var data_dom;
+    var f = $('form', '');
+    var ep = EventProxy.create('query_comps', 'query_lines', function () {
+        $('[name=companyId_eq]', f).trigger('change');//公司change
+        //query();
+
+        $('.loading').remove();
+        $('.ct_page').show();
+    });
+
+    $.get('/pages/summary/fast_and_slow/data.html', function (rs) {
+        $('.ct_cont_body').html(rs);
+    });
+
+    //点击搜索按钮
+    $('.search', f).on('click', function () {
+        $('.ct_data_body_wrap').trigger('init');
+    });
+
+    //日期选择框
+    var fs='YYYY-MM-DD'
+            , ets=moment().format(fs)
+            , sts=moment().subtract(7, 'days').format(fs);
+    flatpickr('.ct_search_form_wrap [name=rq]', {
+        mode: "range", dateFormat: "Y-m-d","locale": "zh", defaultDate: [sts, ets]
+    });
+    var comps;
+    //构建公司级联下拉框
+    $.get('/user/companyData', function (rs) {
+        comps = rs;
+        var opts = '';
+        for(var i=0,obj;obj=comps[i++];){
+            opts += '<option value="'+obj.companyCode+'">'+obj.companyName+'</option>';
+        }
+        $('[name=companyId_eq]', f).html(opts);
+        ep.emit('query_comps');
+    });
+    var lineMapps;
+    //加载线路信息
+    $.get('/line/all', {'destroy_eq': 0}, function (rs) {
+        rs.sort(function (a, b) {
+            return a.name.localeCompare(b.name);
+        });
+        lineMapps={};
+        var k;
+        $.each(rs, function () {
+            k = this.company+'_'+this.brancheCompany;
+            if(!lineMapps[k])
+                lineMapps[k]=[];
+            lineMapps[k].push(this);
+        });
+
+        ep.emit('query_lines');
+    });
+
+    $('[name=companyId_eq]', f).on('change', function () {
+        var code = $(this).val(), subs=[];
+        $.each(comps, function () {
+            if(this.companyCode==code)
+                subs=this.children;
+        });
+
+        var opts='';
+        $.each(subs, function () {
+            opts += '<option value="'+this.code+'">'+this.name+'</option>';
+        });
+        $('[name=subCompanyId_eq]', f).html(opts).trigger('change');
+    });
+
+    $('[name=subCompanyId_eq]', f).on('change', function () {
+        var k = $('[name=companyId_eq]', f).val() + '_' + $(this).val();
+        var array = lineMapps[k];
+        var opts = '';
+        if(array){
+            $.each(array, function () {
+                opts += '<option value="'+this.lineCode+'">'+this.name+'</option>';
+            });
+        }
+        $('[name=lineCode_eq]', f).html(opts);
+    });
+})();
+</script>
+</body>
+</html>
 \ No newline at end of file
@@ -18,7 +18,7 @@
         }
         .ct_cont{
-            height: calc(100% - 41px);
+            height: calc(100% - 35px);
         }
         .ct_cont>div>div.uk-card{
@@ -122,7 +122,7 @@
     <div uk-spinner></div>
 </div>
 <div class="ct_page" style="display: none;">
-    <h2 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h2>
+    <h3 class="uk-heading-line uk-heading-bullet"><span>工时统计</span></h3>
     <div class="ct_cont" >
         <div class="ct_search_form_wrap">
             <form>
@@ -141,7 +141,6 @@
                 <div class="ct_field">
                     <label>线路：
                         <select class="uk-select" name="lineCode_eq">
-                            <option value="81101">航头4路</option>
                         </select>
                     </label>
                 </div>
@@ -264,7 +263,7 @@
     //日期选择器
     $('[name=rq_eq]', f).val('2017-10-10');
-    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-10', minDate: '2017-07-01'});
+    flatpickr('.ct_search_form_wrap [name=rq_eq]', {"locale": "zh", maxDate: '2017-10-16', minDate: '2017-07-01'});
     var comps;
     //构建公司级联下拉框
-<!-- 区间变全程 -->
-<div class="add_range_2_normal">
-    <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,nextSch,f1,tf1,f2,tf2;
-
-            $(wrap).on('init', function (e, data) {
-                e.stopPropagation();
-                sch = data.sch;
-                nextSch = gb_schedule_table.getNextSch(sch);
-
-                if(sch.bcType!='region'){
-                    $(wrap).html('<div class="err_panel">该模板只能应用区间班次！</div>');
-                    return;
-                }
-                f1 = addTaskForm();
-                tf1 = addTaskForm().addClass('temp_service');
-                changeField(f1, tf1);
-
-                //返程也是区间
-                if(nextSch.bcType=='region'){
-                    var u_d_input = '<input name="upDown" type="hidden" value="'+nextSch.xlDir+'">';
-                    tf1.after('<div class="range_2_normal_tt">返程</div>');
-                    tf2 = addTaskForm(u_d_input).addClass('temp_service');
-                    f2 = addTaskForm(u_d_input);
-
-                    changeField(f2, tf2);
-                }
-
-                //设置默认值
-                setDefaultVal();
-            });
-
-            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));
-
-                //班次类型切换
-                $('select[name=type2]', f).trigger('change');
-
-                f.formValidation({
-                    framework: 'uikit',
-                    locale: 'zh_CN'
-                }).on('add_reason_field', function () {
-                    $(this).formValidation('addField', 'reason');
-                });
-
-                $f('type2', f).attr('disabled', 'disabled');
-                return f;
-            }
-
-            function $f(name, f) {
-                return $('[name=' + name + ']', f);
-            }
-            
-            function changeField(f, tf) {
-                $f('type1', tf).val('临加');
-                $f('mileageType', tf).html('<option value="service">临加</option>');
-                $f('destroy', f).parents('.uk-form-controls').hide();
-                $f('destroy', tf).parents('.uk-form-controls').hide();
-            }
-
-            /**
-             * 设置默认值
-             */
-            function setDefaultVal() {
-                $f('startStation', f1).attr('disabled', 'disabled');
-                $f('endStation', f1).val(sch.zdzCode).trigger('change').attr('disabled', 'disabled');
-                $f('startStation', tf1).val(sch.zdzCode).trigger('change');
-
-                //tf1 startDate
-                $f('startDate', tf1).val($f('endDate', f1).val()).trigger('input');
-                if(tf2){
-                    $('[sch_id_inp]', tf2).val(nextSch.id);
-                    $f('endStation', tf2).val(nextSch.qdzCode).trigger('change');
-                }
-                if(f2){
-                    $('[sch_id_inp]', f2).val(nextSch.id);
-                    $f('endStation', f2).val(nextSch.zdzCode).attr('disabled', 'disabled');
-                    $f('startStation', f2).val(nextSch.qdzCode).trigger('change').attr('disabled', 'disabled');
-                    $f('mileage', f2).val(nextSch.jhlc);
-                    $f('startDate', f2).val($f('endDate', tf2).val()).trigger('change');
-                }
-            }
-
-            /**
-             * 备注级联
-             */
-            $(wrap).on('input', '[name=remarks]', function () {
-                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
-                $('[name=remarks]', nfs).val($(this).val());
-            });
-
-
-            //提交
-            $('button[type=submit]', wrap).on('click', function () {
-                $(this).addClass('disabled').attr('disabled','disabled');
-                dataArray = [];
-                $('form.sub_task_form_v2', wrap).data('valid', false)
-                        .formValidation('validate');
-            });
-
-            var dataArray = [];
-            $(wrap).on('success.form.fv', 'form.sub_task_form_v2', function (e) {
-                e.preventDefault();
-
-                dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)));
-                $(this).data('valid', true);
-
-                if (allValidSuccess()) {
-                    var i = 0;
-                    (function () {
-                        var f = arguments.callee;
-                        if (i >= dataArray.length) {
-                            UIkit.modal('#add-sub-task-main-modal').hide();
-                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
-                            return;
-                        }
-                        var data = dataArray[i];
-                        gb_common.$post('/childTask', data, function (rs) {
-                            notify_succ('子任务添加成功');
-                            gb_schedule_table.updateSchedule(rs.t);
-                            i++;
-                            f();
-                        });
-                    })();
-                }
-            });
-            //校验不过
-            $(wrap).on('err.field.fv','form.sub_task_form_v2', function () {
-                $('button[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
-            });
-
-            function allValidSuccess() {
-                var flag = true;
-                $('form.sub_task_form_v2', wrap).each(function (i, f) {
-                    if(!$(f).data('valid')){
-                        flag = false;
-                        return false;
-                    }
-                });
-                return flag;
-            }
-
-        })();
-    </script>
+<!-- 区间变全程 -->
+<div class="add_range_2_normal">
+    <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,nextSch,f1,tf1,f2,tf2;
+
+            $(wrap).on('init', function (e, data) {
+                e.stopPropagation();
+                sch = data.sch;
+                nextSch = gb_schedule_table.getNextSch(sch);
+
+                if(sch.bcType!='region'){
+                    $(wrap).html('<div class="err_panel">该模板只能应用区间班次！</div>');
+                    return;
+                }
+                f1 = addTaskForm();
+                tf1 = addTaskForm().addClass('temp_service');
+                changeField(f1, tf1);
+
+                //返程也是区间
+                if(nextSch.bcType=='region'){
+                    var u_d_input = '<input name="upDown" type="hidden" value="'+nextSch.xlDir+'">';
+                    tf1.after('<div class="range_2_normal_tt">返程</div>');
+                    tf2 = addTaskForm(u_d_input).addClass('temp_service');
+                    f2 = addTaskForm(u_d_input);
+
+                    changeField(f2, tf2);
+                }
+
+                //设置默认值
+                setDefaultVal();
+            });
+
+            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));
+
+                //班次类型切换
+                $('select[name=type2]', f).trigger('change');
+
+                f.formValidation({
+                    framework: 'uikit',
+                    locale: 'zh_CN'
+                }).on('add_reason_field', function () {
+                    $(this).formValidation('addField', 'reason');
+                });
+
+                $f('type2', f).attr('disabled', 'disabled');
+                return f;
+            }
+
+            function $f(name, f) {
+                return $('[name=' + name + ']', f);
+            }
+            
+            function changeField(f, tf) {
+                $f('type1', tf).val('临加');
+                $f('mileageType', tf).html('<option value="service">临加</option>');
+                $f('destroy', f).parents('.uk-form-controls').hide();
+                $f('destroy', tf).parents('.uk-form-controls').hide();
+            }
+
+            /**
+             * 设置默认值
+             */
+            function setDefaultVal() {
+                $f('startStation', f1).attr('disabled', 'disabled');
+                $f('endStation', f1).val(sch.zdzCode).trigger('change').attr('disabled', 'disabled');
+                $f('startStation', tf1).val(sch.zdzCode).trigger('change');
+
+                //tf1 startDate
+                $f('startDate', tf1).val($f('endDate', f1).val()).trigger('input');
+                if(tf2){
+                    $('[sch_id_inp]', tf2).val(nextSch.id);
+                    $f('endStation', tf2).val(nextSch.qdzCode).trigger('change');
+                }
+                if(f2){
+                    $('[sch_id_inp]', f2).val(nextSch.id);
+                    $f('endStation', f2).val(nextSch.zdzCode).attr('disabled', 'disabled');
+                    $f('startStation', f2).val(nextSch.qdzCode).trigger('change').attr('disabled', 'disabled');
+                    $f('mileage', f2).val(nextSch.jhlc);
+                    $f('startDate', f2).val($f('endDate', tf2).val()).trigger('change');
+                }
+            }
+
+            /**
+             * 备注级联
+             */
+            $(wrap).on('input', '[name=remarks]', function () {
+                var nfs = $(this).parents('.sub_task_form_v2').nextAll('.sub_task_form_v2');
+                $('[name=remarks]', nfs).val($(this).val());
+            });
+
+
+            //提交
+            $('button[type=submit]', wrap).on('click', function () {
+                $(this).addClass('disabled').attr('disabled','disabled');
+                dataArray = [];
+                $('form.sub_task_form_v2', wrap).data('valid', false)
+                        .formValidation('validate');
+            });
+
+            var dataArray = [];
+            $(wrap).on('success.form.fv', 'form.sub_task_form_v2', function (e) {
+                e.preventDefault();
+
+                dataArray.push($.extend($(this).serializeJSON(), gb_common.getDisabledVal(this)));
+                $(this).data('valid', true);
+
+                if (allValidSuccess()) {
+                    var i = 0;
+                    (function () {
+                        var f = arguments.callee;
+                        if (i >= dataArray.length) {
+                            UIkit.modal('#add-sub-task-main-modal').hide();
+                            $('#schedule-lj_zrw-modal .main-schedule-table').trigger('refresh', {sch: sch});
+                            return;
+                        }
+                        var data = dataArray[i];
+                        gb_common.$post('/childTask', data, function (rs) {
+                            notify_succ('子任务添加成功');
+                            gb_schedule_table.updateSchedule(rs.t);
+                            i++;
+                            f();
+                        });
+                    })();
+                }
+            });
+            //校验不过
+            $(wrap).on('err.field.fv','form.sub_task_form_v2', function () {
+                $('button[type=submit]', wrap).removeClass('disabled').removeAttr('disabled');
+            });
+
+            function allValidSuccess() {
+                var flag = true;
+                $('form.sub_task_form_v2', wrap).each(function (i, f) {
+                    if(!$(f).data('valid')){
+                        flag = false;
+                        return false;
+                    }
+                });
+                return flag;
+            }
+
+        })();
+    </script>
 </div>
 \ No newline at end of file
 /** 调度模式 */
+//主调和监控模式
+var operationMode = window.localStorage.getItem('operationMode');
 var gb_dp_initHttpIntercept = function () {
-    //主调和监控模式
-    var operationMode = window.localStorage.getItem('operationMode');
     $(document).off('ajaxSend', interceptPOST);
     $('body>.north').removeClass('monitor main');
     if (operationMode == 0) {