行车路单样式调整；调度日报还原到固定表头前的样式

娄高锋
1 parent eac986b9
Showing 2 changed files with 102 additions and 157 deletions
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/waybill.html
-<link rel="stylesheet" type="text/css" href="/assets/css/formTable/scheduleDaily.css" />
+<style type="text/css">
+	.table-bordered {
+	  border: 1px solid; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td,
+	  .table-bordered > tbody > tr > th,
+	  .table-bordered > tbody > tr > td,
+	  .table-bordered > tfoot > tr > th,
+	  .table-bordered > tfoot > tr > td {
+	    border: 1px solid;
+	    text-align: center; }
+	  .table-bordered > thead > tr > th,
+	  .table-bordered > thead > tr > td {
+	    border-bottom-width: 2px; }
+	 
+	 .table > tbody + tbody {
+	   border-top: 1px solid; }
+	   
+	  
+	   #ddrbBody   tr> td >span{
+	     word-break: keep-all;white-space:nowrap; 
+	   }
+</style>
 <div class="page-head" >
 	<div class="page-title">
@@ -41,8 +63,7 @@
 					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
 					&nbsp;&nbsp;当班调派:<span id="dbdp"></span></label>
-					<div style="width: 99%;overflow: auto;">
-					<table class="table table-bordered table-hover table-checkable" id="forms" style="margin-bottom:0px">
+					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr>
 								<th colspan="40"><label id="xlmc"></label>线路调度日报</th>
@@ -109,7 +130,6 @@
 							<td colspan="40">&nbsp;</td>
 						</tr>
 						</table>
-						</div>
 						<!-- <tr>
 							<td colspan="40">合计</td>
 						</tr>
@@ -158,8 +178,7 @@
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
-						<div style="width: 99%;overflow: auto;">
-						<table class="table table-bordered table-hover table-checkable" id="forms_1" style="margin-bottom:0px;margin-top: 20px;">
+						<table class="table table-bordered table-hover table-checkable" id="forms_1">
 						<tr>
 							<td colspan="2"><label>路牌</label></td>
 							<td colspan="2"><label>车号</label></td>
@@ -199,117 +218,56 @@
 							<td colspan="40">&nbsp;</td>
 						</tr>
 						</table>
-						</div>
-					<!--	<table class="table table-bordered table-hover table-checkable" id="forms_2">
-					
+						<table class="table table-bordered table-hover table-checkable" id="forms_2">
+						<tr>
+							<td rowspan="2">路牌</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
+							<td colspan="4">到达时间</td>
+							<td colspan="4">发车时间</td>
+							<td colspan="2" rowspan="2">备注</td>
+							<td rowspan="2">路牌</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
+							<td colspan="4">到达时间</td>
+							<td colspan="4">发车时间</td>
+							<td colspan="2" rowspan="2">备注</td>
+							<td rowspan="2">路牌</td>
+							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
+							<td colspan="4">到达时间</td>
+							<td colspan="4">发车时间</td>
+							<td colspan="2" rowspan="2">备注</td>
+							<td>&nbsp;</td>
+						</tr>
+						<tr>
+							<td>应到</td>
+							<td>实到</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>应发</td>
+							<td>实发</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>应到</td>
+							<td>实到</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>应发</td>
+							<td>实发</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>应到</td>
+							<td>实到</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>应发</td>
+							<td>实发</td>
+							<td>快</td>
+							<td>慢</td>
+							<td>&nbsp;</td>
+						</tr>
 						<tbody class="scheduleDaily_3">
-						</tbody>-->
+						</tbody>
 					</table>
-
-
-					<div id="left_div">
-						<div id="left_div1">
-							<table id="left_table1"></table>
-						</div>
-						<div id="left_div2">
-							<table id="left_table2"></table>
-						</div>
-					</div>
-					<div  id="right_div">
-						<div  style="overflow:auto;min-width: 889px;" id="staticfw" >
-							<div id="right_divx">
-								<table class="table table-bordered table-hover table-checkable">
-									<tbody class="stx">
-									<tr>
-										<td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
-										<td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
-											起点站
-										</td>
-										<td colspan="4">到达时间</td>
-										<td colspan="4">发车时间</td>
-										<td colspan="2" rowspan="2">备注</td>
-										<td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
-										<td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
-											起点站
-										</td>
-										<td colspan="4">到达时间</td>
-										<td colspan="4">发车时间</td>
-										<td colspan="2" rowspan="2">备注</td>
-										<td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
-										<td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
-											起点站
-										</td>
-										<td colspan="4">到达时间</td>
-										<td colspan="4">发车时间</td>
-										<td colspan="2" rowspan="2">备注</td>
-										<td>&nbsp;</td>
-									</tr>
-									<tr class="kfc">
-										<td>应到</td>
-										<td>实到</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>应发</td>
-										<td>实发</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>应到</td>
-										<td>实到</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>应发</td>
-										<td>实发</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>应到</td>
-										<td>实到</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>应发</td>
-										<td>实发</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
-										<td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
-										<td>&nbsp;</td>
-									</tr>
-									</tbody>
-								</table>
-							</div>
-						</div>
-						<div id="right_div2">
-							<table class="table table-bordered table-hover table-checkable">
-								<tbody class="staticlfwy">
-								</tbody>
-							</table>
-						</div>
-					</div>
-
-					<div id="left_divy">
-						<div id="left_div1y">
-							<table id="left_table1y"></table>
-						</div>
-						<div id="left_div2y">
-							<table id="left_table2y"></table>
-						</div>
-					</div>
-
-					<div id="right_divy">
-						<div  style="overflow:auto;min-width: 906px;" id="staticfwy" >
-							<div id="right_divxy">
-								<table class="table table-bordered table-hover table-checkable" id="">
-									<tbody class="">
-									</tbody>
-								</table>
-							</div>
-						</div>
-						<div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y">
-							<table class="table table-bordered table-hover table-checkable" id="forms_2">
-								<tbody class="scheduleDaily_3">
-								</tbody>
-							</table>
-						</div>
-
-					</div>
 				</div>
 			</div>
 <!-- 		</div> -->
@@ -318,15 +276,6 @@
 <script>
 	$(function(){
-
-		var right_div2y = document.getElementById("right_div2y");
-		right_div2y.onscroll = function(){
-			var right_div2_topy = this.scrollTop;
-			var right_div2_lefty = this.scrollLeft;
-			document.getElementById("left_div2y").scrollTop = right_div2_topy;
-			document.getElementById("staticfw").scrollLeft = right_div2_lefty;
-		};
-		
 		// 关闭左侧栏
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
@@ -654,12 +603,12 @@
 		{{if i%3 == 0}}
 			<tr>
 		{{/if}}
-				<td style="min-width: 47px;max-width: 47px;width: 47px;">{{obj.lpName}}</td>
-				<td colspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">{{obj.qdzName}}</td>
+				<td>{{obj.lpName}}</td>
+				<td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
 				<td>{{obj.zdsj}}</td>
 				<td>{{obj.zdsjActual}}</td>
-				<td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast}}</td>
-				<td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow}}</td>
+				<td>{{obj.fast}}</td>
+				<td>{{obj.slow}}</td>
 				<td>{{obj.fcsj}}</td>
 				<td>{{obj.fcsjActual}}
 				{{if obj.bcType== "in"}}
@@ -668,9 +617,11 @@
 					{{if obj.bcType== "out"}}
 						(出)
 					{{/if}}
+			</td>
+				<td>{{obj.fast0}}</td>
+				<td>{{obj.slow0}}
+					
 				</td>
-				<td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast0}}</td>
-				<td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow0}}</td>
 				<td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
@@ -131,13 +131,13 @@
 								          <td colspan="4">时间</td>
 								          <td colspan="2">误点</td>
 								          <td rowspan="2" style="min-width:50px;max-width:50px;">里程(公里)计划</td>
-								          <td rowspan="2" style="min-width:70px;max-width:70px;">备注</td>
+								          <td rowspan="2" style="min-width:116px;max-width:116px;">备注</td>
 								      </tr>
 								      <tr>
-								          <td colspan="1" style="min-width:110px;max-width:110px;">司&nbsp;机</td>
-								          <td colspan="1" style="min-width:110px;max-width:110px;">售&nbsp;票</td>
-								          <td colspan="1" style="min-width:124px;max-width:124px;">起点</td>
-								          <td colspan="1" style="min-width:124px;max-width:124px;">终点</td>
+								          <td colspan="1" style="min-width:95px;max-width:95px;">司&nbsp;机</td>
+								          <td colspan="1" style="min-width:95px;max-width:95px;">售&nbsp;票</td>
+								          <td colspan="1" style="min-width:116px;max-width:116px;">起点</td>
+								          <td colspan="1" style="min-width:116px;max-width:116px;">终点</td>
 								          <td colspan="1" style="min-width:50px;max-width:50px;">计发</td>
 								          <td colspan="1" style="min-width:50px;max-width:20px;">实发</td>
 								          <td colspan="1" style="min-width:50px;max-width:50px;">应到</td>
@@ -147,7 +147,7 @@
 								      </tr>
 									</thead>
 								</table>
-								<div id="overDiv" style="overflow: auto;max-height: 500px">
+								<div id="overDiv" style="overflow: auto;max-height: 500px;width: 100%">
 									<table class="table table-bordered table-hover table-checkable" id="formsnc" style="margin-bottom: 0px">
 										<tbody class="ludan_2">
@@ -215,7 +215,6 @@
 			$.get('/user/companyData', function(result){
 				obj = result;
-				console.log(obj);
 				var options = '';
 				for(var i = 0; i < obj.length; i++){
 					options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
@@ -402,23 +401,18 @@
 				var ludan_1 = template('ludan_1',result);
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms .ludan_1').html(ludan_1);
-			});
-			$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
-			    getTime(result);
-				var ludan_2 = template('ludan_2',{list:result});
-				// 把渲染好的模版html文本追加到表格中
-				$('#formsnc .ludan_2').html(ludan_2);
-				$("#headTable").show();
-				var width = $("#forms").width() + 2;//加2是边框
-				var height = $("#formsnc").css('height');
-				var maxHeight = $("#overDiv").css('max-height');
-				console.log(width);
-				if(height > maxHeight){
-					$("#overDiv").css('width', width + 17 + "px");
-				} else {
-					$("#overDiv").css('width', width + "px");
-				}
+				$get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
+				    getTime(result);
+					var ludan_2 = template('ludan_2',{list:result});
+					// 把渲染好的模版html文本追加到表格中
+					$('#formsnc .ludan_2').html(ludan_2);
+					
+					$("#headTable").show();
+					var width = $("#forms").width() + 1.5;//加1是边框
+					var scrollBarWidth = $('#overDiv')[0].offsetWidth - $('#overDiv')[0].scrollWidth;//滚动条宽度
+					$("#overDiv").css('width', width + scrollBarWidth + "px");
+				});
 			});
 			$get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
 			    var ludan_3 = template('ludan_3',result);
@@ -585,15 +579,15 @@
 	{{each list as obj i}}
 		<tr>
 			<td style="min-width:20px;max-width:20px">{{obj.adjustExps}}</td>
-			<td style="min-width:110px;max-width:110px">{{obj.jGh}}{{obj.jName}}</td>
-			<td style="min-width:110px;max-width:110px">
+			<td style="min-width:95px;max-width:95px">{{obj.jGh}}{{obj.jName}}</td>
+			<td style="min-width:95px;max-width:95px">
 				{{if obj.sGh !=null}}
 				{{obj.sGh}}{{obj.sName}}
 				{{/if}}
 			</td>
 			<td style="min-width:30px;max-width:30px">&nbsp;</td>
-			<td style="min-width:124px;max-width:124px">{{obj.qdzName}}</td>
-			<td style="min-width:124px;max-width:124px">{{obj.zdzName}}</td>
+			<td style="min-width:116px;max-width:116px">{{obj.qdzName}}</td>
+			<td style="min-width:116px;max-width:116px">{{obj.zdzName}}</td>
 			<td style="min-width:50px;max-width:50px">{{obj.fcsj}}</td>
 			<td style="min-width:50px;max-width:50px">{{obj.fcsjActual}}</td>
 			<td style="min-width:50px;max-width:50px">{{obj.zdsj}}</td>
@@ -605,7 +599,7 @@
 				{{obj.jhlc}}
 			{{/if}}
 			</td>
-			<td style="min-width:70px;max-width:70px;">
+			<td style="min-width:116px;max-width:116px;">
              	{{obj.remarks}}
 			</td>
 		</tr>