适应屏幕调整表格高度

娄高锋
1 parent fd0e1faf
Showing 3 changed files with 12 additions and 6 deletions
src/main/resources/static/pages/forms/statement/historyMessage.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
src/main/resources/static/pages/forms/statement/waybill.html
@@ -46,7 +46,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;max-height: 520px;">
+				<div class="table-container" id="table" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
 							<tr class="hidden">
@@ -80,6 +80,7 @@
 			format : 'YYYY-MM-DD',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-280);
 		$.get('/basic/lineCode2Name',function(result){
 			var data=[];
@@ -57,7 +57,7 @@
 						<span class="item-label" style="width: 80px;">选择线路: </span>
 						<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 10px">
+					<div style="display: inline-block; margin-left: 10px; display: none;">
 						<span class="item-label" style="width: 80px;">时刻类型: </span>
 						<select class="form-control" name="model" id="model" style="width: 165px;">
 							<option value="">请选择...</option>
@@ -93,7 +93,7 @@
 				</form>
 			</div>
 			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;">
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -135,6 +135,7 @@
 			format : 'HH:mm',
 			locale : 'zh-cn'
 		});
+		$("#table").height($(window).height()-320);
 		var d = new Date();
 		var year = d.getFullYear();
@@ -239,6 +240,7 @@
 		$("#subCompany").on("change",initXl);
 		function initXl(){
 			var data=[];
+			data.push({id:" ", text:"全部线路"});
 			if(fage){
 				$("#line").select2("destroy").html('');
 			}
@@ -310,6 +312,8 @@
 			}
 			var reason = $("input[name='reason']");
 			var params = {};
+			if(line == " ")
+				line = "";
 // 			line = $("#line").val();
 			startDate = $("#startDate").val();
 			endDate = $("#endDate").val();
@@ -454,7 +458,7 @@
 <thead>
 	<tr>
 		<th class="hidden"></th>
-		<th rowspan="3">日期</th>
+		<th rowspan="3" style=" width:120px;">日期</th>
 		<th rowspan="3">时段</th>
 		<th rowspan="3">公司</th>
 		<th rowspan="3">分公司</th>
@@ -71,7 +71,7 @@
 						</div>
 					</div>
 					<div class="col-md-9"  id="printArea">
-						<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 520px">
+						<div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
 							<table class="table table-bordered table-checkable" id="forms">
 								<tbody class="ludan_1">
@@ -106,6 +106,7 @@
 			locale : 'zh-cn'
 		});
+		$("#xcld_height").height($(window).height()-100);
 		var d = new Date();
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
@@ -257,7 +258,7 @@
 			if($(this).children().size() < 2){
 				return;
 			}
-			
+			$("#xcld_height").height($(window).height()-100);
 			$(this).children().each(function(index){
 				params[index] = $(this).text();
 			});