潘钊 / bsth_control · Commits

Commit 785fcf0a925031a24bf8f6f275518c0f72aab140

Authored by 娄高锋
1 parent fd0e1faf

适应屏幕调整表格高度

Inline Side-by-side
Showing 3 changed files with 12 additions and 6 deletions
src/main/resources/static/pages/forms/statement/historyMessage.html
  View file @785fcf0
... ... @@ -46,7 +46,7 @@
46 46 </form>
47 47 </div>
48 48 <div class="portlet-body">
49   - <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;max-height: 520px;">
  49 + <div class="table-container" id="table" style="margin-top: 10px;overflow:auto;min-width: 906px;">
50 50 <table class="table table-bordered table-hover table-checkable" id="forms">
51 51 <thead>
52 52 <tr class="hidden">
... ... @@ -80,6 +80,7 @@
80 80 format : 'YYYY-MM-DD',
81 81 locale : 'zh-cn'
82 82 });
  83 + $("#table").height($(window).height()-280);
83 84  
84 85 $.get('/basic/lineCode2Name',function(result){
85 86 var data=[];
... ...
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @785fcf0
... ... @@ -57,7 +57,7 @@
57 57 <span class="item-label" style="width: 80px;">选择线路: </span>
58 58 <select class="form-control" name="line" id="line" style="width: 150px;"></select>
59 59 </div>
60   - <div style="display: inline-block; margin-left: 10px">
  60 + <div style="display: inline-block; margin-left: 10px; display: none;">
61 61 <span class="item-label" style="width: 80px;">时刻类型: </span>
62 62 <select class="form-control" name="model" id="model" style="width: 165px;">
63 63 <option value="">请选择...</option>
... ... @@ -93,7 +93,7 @@
93 93 </form>
94 94 </div>
95 95 <div class="portlet-body">
96   - <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
  96 + <div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;">
97 97 <table class="table table-bordered table-hover table-checkable" id="forms">
98 98 <thead>
99 99  
... ... @@ -135,6 +135,7 @@
135 135 format : 'HH:mm',
136 136 locale : 'zh-cn'
137 137 });
  138 + $("#table").height($(window).height()-320);
138 139  
139 140 var d = new Date();
140 141 var year = d.getFullYear();
... ... @@ -239,6 +240,7 @@
239 240 $("#subCompany").on("change",initXl);
240 241 function initXl(){
241 242 var data=[];
  243 + data.push({id:" ", text:"全部线路"});
242 244 if(fage){
243 245 $("#line").select2("destroy").html('');
244 246 }
... ... @@ -310,6 +312,8 @@
310 312 }
311 313 var reason = $("input[name='reason']");
312 314 var params = {};
  315 + if(line == " ")
  316 + line = "";
313 317 // line = $("#line").val();
314 318 startDate = $("#startDate").val();
315 319 endDate = $("#endDate").val();
... ... @@ -454,7 +458,7 @@
454 458 <thead>
455 459 <tr>
456 460 <th class="hidden"></th>
457   - <th rowspan="3">日期</th>
  461 + <th rowspan="3" style=" width:120px;">日期</th>
458 462 <th rowspan="3">时段</th>
459 463 <th rowspan="3">公司</th>
460 464 <th rowspan="3">分公司</th>
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @785fcf0
... ... @@ -71,7 +71,7 @@
71 71 </div>
72 72 </div>
73 73 <div class="col-md-9" id="printArea">
74   - <div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px;height: 520px">
  74 + <div class="table-container" id="xcld_height" style="margin-top: 10px;overflow:auto;min-width: 906px;">
75 75 <table class="table table-bordered table-checkable" id="forms">
76 76 <tbody class="ludan_1">
77 77  
... ... @@ -106,6 +106,7 @@
106 106 locale : 'zh-cn'
107 107 });
108 108  
  109 + $("#xcld_height").height($(window).height()-100);
109 110 var d = new Date();
110 111 var year = d.getFullYear();
111 112 var month = d.getMonth() + 1;
... ... @@ -257,7 +258,7 @@
257 258 if($(this).children().size() < 2){
258 259 return;
259 260 }
260   -
  261 + $("#xcld_height").height($(window).height()-100);
261 262 $(this).children().each(function(index){
262 263 params[index] = $(this).text();
263 264 });
... ...