Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

潘钊
2 parents 6a16ab43 60ac9bcf
Showing 3 changed files with 179 additions and 183 deletions
src/main/resources/static/pages/oil/list_ph.html
src/main/resources/static/pages/report/inoutstation/inoutstation.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/sub_task_v2/add_range_normal.html
@@ -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="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