潘钊 / bsth_control · Commits

Commit 04edcfd39349c88af7445408111bf88da919fa85

Authored by 娄高锋
1 parent eac986b9
build: skipped

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

Inline Side-by-side
Showing 2 changed files with 102 additions and 157 deletions
src/main/resources/static/pages/forms/statement/scheduleDaily.html
  View file @04edcfd
1   -<link rel="stylesheet" type="text/css" href="/assets/css/formTable/scheduleDaily.css" />
  1 +<style type="text/css">
  2 + .table-bordered {
  3 + border: 1px solid; }
  4 + .table-bordered > thead > tr > th,
  5 + .table-bordered > thead > tr > td,
  6 + .table-bordered > tbody > tr > th,
  7 + .table-bordered > tbody > tr > td,
  8 + .table-bordered > tfoot > tr > th,
  9 + .table-bordered > tfoot > tr > td {
  10 + border: 1px solid;
  11 + text-align: center; }
  12 + .table-bordered > thead > tr > th,
  13 + .table-bordered > thead > tr > td {
  14 + border-bottom-width: 2px; }
  15 +
  16 + .table > tbody + tbody {
  17 + border-top: 1px solid; }
  18 +
2 19  
  20 +
  21 + #ddrbBody tr> td >span{
  22 + word-break: keep-all;white-space:nowrap;
  23 + }
  24 +</style>
3 25  
4 26 <div class="page-head" >
5 27 <div class="page-title">
... ... @@ -41,8 +63,7 @@
41 63 <label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
42 64 <br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
43 65 &nbsp;&nbsp;当班调派:<span id="dbdp"></span></label>
44   - <div style="width: 99%;overflow: auto;">
45   - <table class="table table-bordered table-hover table-checkable" id="forms" style="margin-bottom:0px">
  66 + <table class="table table-bordered table-hover table-checkable" id="forms">
46 67 <thead>
47 68 <tr>
48 69 <th colspan="40"><label id="xlmc"></label>线路调度日报</th>
... ... @@ -109,7 +130,6 @@
109 130 <td colspan="40">&nbsp;</td>
110 131 </tr>
111 132 </table>
112   - </div>
113 133 <!-- <tr>
114 134 <td colspan="40">合计</td>
115 135 </tr>
... ... @@ -158,8 +178,7 @@
158 178 <tr>
159 179 <td colspan="40">&nbsp;</td>
160 180 </tr> -->
161   - <div style="width: 99%;overflow: auto;">
162   - <table class="table table-bordered table-hover table-checkable" id="forms_1" style="margin-bottom:0px;margin-top: 20px;">
  181 + <table class="table table-bordered table-hover table-checkable" id="forms_1">
163 182 <tr>
164 183 <td colspan="2"><label>路牌</label></td>
165 184 <td colspan="2"><label>车号</label></td>
... ... @@ -199,117 +218,56 @@
199 218 <td colspan="40">&nbsp;</td>
200 219 </tr>
201 220 </table>
202   - </div>
203   - <!-- <table class="table table-bordered table-hover table-checkable" id="forms_2">
204   -
  221 + <table class="table table-bordered table-hover table-checkable" id="forms_2">
  222 + <tr>
  223 + <td rowspan="2">路牌</td>
  224 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  225 + <td colspan="4">到达时间</td>
  226 + <td colspan="4">发车时间</td>
  227 + <td colspan="2" rowspan="2">备注</td>
  228 + <td rowspan="2">路牌</td>
  229 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  230 + <td colspan="4">到达时间</td>
  231 + <td colspan="4">发车时间</td>
  232 + <td colspan="2" rowspan="2">备注</td>
  233 + <td rowspan="2">路牌</td>
  234 + <td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
  235 + <td colspan="4">到达时间</td>
  236 + <td colspan="4">发车时间</td>
  237 + <td colspan="2" rowspan="2">备注</td>
  238 + <td>&nbsp;</td>
  239 + </tr>
  240 + <tr>
  241 + <td>应到</td>
  242 + <td>实到</td>
  243 + <td>快</td>
  244 + <td>慢</td>
  245 + <td>应发</td>
  246 + <td>实发</td>
  247 + <td>快</td>
  248 + <td>慢</td>
  249 + <td>应到</td>
  250 + <td>实到</td>
  251 + <td>快</td>
  252 + <td>慢</td>
  253 + <td>应发</td>
  254 + <td>实发</td>
  255 + <td>快</td>
  256 + <td>慢</td>
  257 + <td>应到</td>
  258 + <td>实到</td>
  259 + <td>快</td>
  260 + <td>慢</td>
  261 + <td>应发</td>
  262 + <td>实发</td>
  263 + <td>快</td>
  264 + <td>慢</td>
  265 + <td>&nbsp;</td>
  266 + </tr>
205 267 <tbody class="scheduleDaily_3">
206 268  
207   - </tbody>-->
  269 + </tbody>
208 270 </table>
209   -
210   -
211   - <div id="left_div">
212   - <div id="left_div1">
213   - <table id="left_table1"></table>
214   - </div>
215   - <div id="left_div2">
216   - <table id="left_table2"></table>
217   - </div>
218   - </div>
219   - <div id="right_div">
220   - <div style="overflow:auto;min-width: 889px;" id="staticfw" >
221   - <div id="right_divx">
222   - <table class="table table-bordered table-hover table-checkable">
223   - <tbody class="stx">
224   - <tr>
225   - <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
226   - <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
227   - 起点站
228   - </td>
229   - <td colspan="4">到达时间</td>
230   - <td colspan="4">发车时间</td>
231   - <td colspan="2" rowspan="2">备注</td>
232   - <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
233   - <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
234   - 起点站
235   - </td>
236   - <td colspan="4">到达时间</td>
237   - <td colspan="4">发车时间</td>
238   - <td colspan="2" rowspan="2">备注</td>
239   - <td rowspan="2" style="min-width: 47px;max-width: 47px;width: 47px;">路牌</td>
240   - <td colspan="2" rowspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">
241   - 起点站
242   - </td>
243   - <td colspan="4">到达时间</td>
244   - <td colspan="4">发车时间</td>
245   - <td colspan="2" rowspan="2">备注</td>
246   - <td>&nbsp;</td>
247   - </tr>
248   - <tr class="kfc">
249   - <td>应到</td>
250   - <td>实到</td>
251   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
252   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
253   - <td>应发</td>
254   - <td>实发</td>
255   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
256   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
257   - <td>应到</td>
258   - <td>实到</td>
259   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
260   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
261   - <td>应发</td>
262   - <td>实发</td>
263   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
264   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
265   - <td>应到</td>
266   - <td>实到</td>
267   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
268   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
269   - <td>应发</td>
270   - <td>实发</td>
271   - <td style="min-width: 45px;max-width: 45px;width: 45px;">快</td>
272   - <td style="min-width: 45px;max-width: 45px;width: 45px;">慢</td>
273   - <td>&nbsp;</td>
274   - </tr>
275   - </tbody>
276   - </table>
277   - </div>
278   - </div>
279   - <div id="right_div2">
280   - <table class="table table-bordered table-hover table-checkable">
281   - <tbody class="staticlfwy">
282   - </tbody>
283   - </table>
284   - </div>
285   - </div>
286   -
287   - <div id="left_divy">
288   - <div id="left_div1y">
289   - <table id="left_table1y"></table>
290   - </div>
291   - <div id="left_div2y">
292   - <table id="left_table2y"></table>
293   - </div>
294   - </div>
295   -
296   - <div id="right_divy">
297   - <div style="overflow:auto;min-width: 906px;" id="staticfwy" >
298   - <div id="right_divxy">
299   - <table class="table table-bordered table-hover table-checkable" id="">
300   - <tbody class="">
301   - </tbody>
302   - </table>
303   - </div>
304   - </div>
305   - <div class="table-container" style="overflow:auto;min-width: 906px;" id="right_div2y">
306   - <table class="table table-bordered table-hover table-checkable" id="forms_2">
307   - <tbody class="scheduleDaily_3">
308   - </tbody>
309   - </table>
310   - </div>
311   -
312   - </div>
313 271 </div>
314 272 </div>
315 273 <!-- </div> -->
... ... @@ -318,15 +276,6 @@
318 276  
319 277 <script>
320 278 $(function(){
321   -
322   - var right_div2y = document.getElementById("right_div2y");
323   - right_div2y.onscroll = function(){
324   - var right_div2_topy = this.scrollTop;
325   - var right_div2_lefty = this.scrollLeft;
326   - document.getElementById("left_div2y").scrollTop = right_div2_topy;
327   - document.getElementById("staticfw").scrollLeft = right_div2_lefty;
328   - };
329   -
330 279 // 关闭左侧栏
331 280 if (!$('body').hasClass('page-sidebar-closed'))
332 281 $('.menu-toggler.sidebar-toggler').click();
... ... @@ -654,12 +603,12 @@
654 603 {{if i%3 == 0}}
655 604 <tr>
656 605 {{/if}}
657   - <td style="min-width: 47px;max-width: 47px;width: 47px;">{{obj.lpName}}</td>
658   - <td colspan="2" style="min-width: 115px;max-width: 115px;width: 115px;">{{obj.qdzName}}</td>
  606 + <td>{{obj.lpName}}</td>
  607 + <td colspan="2" style="word-break: keep-all;white-space:nowrap;">{{obj.qdzName}}</td>
659 608 <td>{{obj.zdsj}}</td>
660 609 <td>{{obj.zdsjActual}}</td>
661   - <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast}}</td>
662   - <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow}}</td>
  610 + <td>{{obj.fast}}</td>
  611 + <td>{{obj.slow}}</td>
663 612 <td>{{obj.fcsj}}</td>
664 613 <td>{{obj.fcsjActual}}
665 614 {{if obj.bcType== "in"}}
... ... @@ -668,9 +617,11 @@
668 617 {{if obj.bcType== "out"}}
669 618 (出)
670 619 {{/if}}
  620 + </td>
  621 + <td>{{obj.fast0}}</td>
  622 + <td>{{obj.slow0}}
  623 +
671 624 </td>
672   - <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.fast0}}</td>
673   - <td style="min-width: 45px;max-width: 45px;width: 45px;">{{obj.slow0}}</td>
674 625 <td colspan="2" title="{{obj.remark}}">{{obj.remarks}}</td>
675 626 {{if (i+1)%3 == 0}}
676 627 <td>&nbsp;</td>
... ...
src/main/resources/static/pages/forms/statement/waybill.html
  View file @04edcfd
... ... @@ -131,13 +131,13 @@
131 131 <td colspan="4">时间</td>
132 132 <td colspan="2">误点</td>
133 133 <td rowspan="2" style="min-width:50px;max-width:50px;">里程(公里)计划</td>
134   - <td rowspan="2" style="min-width:70px;max-width:70px;">备注</td>
  134 + <td rowspan="2" style="min-width:116px;max-width:116px;">备注</td>
135 135 </tr>
136 136 <tr>
137   - <td colspan="1" style="min-width:110px;max-width:110px;">司&nbsp;机</td>
138   - <td colspan="1" style="min-width:110px;max-width:110px;">售&nbsp;票</td>
139   - <td colspan="1" style="min-width:124px;max-width:124px;">起点</td>
140   - <td colspan="1" style="min-width:124px;max-width:124px;">终点</td>
  137 + <td colspan="1" style="min-width:95px;max-width:95px;">司&nbsp;机</td>
  138 + <td colspan="1" style="min-width:95px;max-width:95px;">售&nbsp;票</td>
  139 + <td colspan="1" style="min-width:116px;max-width:116px;">起点</td>
  140 + <td colspan="1" style="min-width:116px;max-width:116px;">终点</td>
141 141 <td colspan="1" style="min-width:50px;max-width:50px;">计发</td>
142 142 <td colspan="1" style="min-width:50px;max-width:20px;">实发</td>
143 143 <td colspan="1" style="min-width:50px;max-width:50px;">应到</td>
... ... @@ -147,7 +147,7 @@
147 147 </tr>
148 148 </thead>
149 149 </table>
150   - <div id="overDiv" style="overflow: auto;max-height: 500px">
  150 + <div id="overDiv" style="overflow: auto;max-height: 500px;width: 100%">
151 151 <table class="table table-bordered table-hover table-checkable" id="formsnc" style="margin-bottom: 0px">
152 152 <tbody class="ludan_2">
153 153  
... ... @@ -215,7 +215,6 @@
215 215  
216 216 $.get('/user/companyData', function(result){
217 217 obj = result;
218   - console.log(obj);
219 218 var options = '';
220 219 for(var i = 0; i < obj.length; i++){
221 220 options += '<option value="'+obj[i].companyCode+'">'+obj[i].companyName+'</option>';
... ... @@ -402,23 +401,18 @@
402 401 var ludan_1 = template('ludan_1',result);
403 402 // 把渲染好的模版html文本追加到表格中
404 403 $('#forms .ludan_1').html(ludan_1);
405   - });
406   - $get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
407   - getTime(result);
408   - var ludan_2 = template('ludan_2',{list:result});
409   - // 把渲染好的模版html文本追加到表格中
410   - $('#formsnc .ludan_2').html(ludan_2);
411 404  
412   - $("#headTable").show();
413   - var width = $("#forms").width() + 2;//加2是边框
414   - var height = $("#formsnc").css('height');
415   - var maxHeight = $("#overDiv").css('max-height');
416   - console.log(width);
417   - if(height > maxHeight){
418   - $("#overDiv").css('width', width + 17 + "px");
419   - } else {
420   - $("#overDiv").css('width', width + "px");
421   - }
  405 + $get('/realSchedule/queryListWaybill',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
  406 + getTime(result);
  407 + var ludan_2 = template('ludan_2',{list:result});
  408 + // 把渲染好的模版html文本追加到表格中
  409 + $('#formsnc .ludan_2').html(ludan_2);
  410 +
  411 + $("#headTable").show();
  412 + var width = $("#forms").width() + 1.5;//加1是边框
  413 + var scrollBarWidth = $('#overDiv')[0].offsetWidth - $('#overDiv')[0].scrollWidth;//滚动条宽度
  414 + $("#overDiv").css('width', width + scrollBarWidth + "px");
  415 + });
422 416 });
423 417 $get('/realSchedule/findKMBC',{jGh:jGh,clZbh:params[1],lpName:params[2],date:date,line:line},function(result){
424 418 var ludan_3 = template('ludan_3',result);
... ... @@ -585,15 +579,15 @@
585 579 {{each list as obj i}}
586 580 <tr>
587 581 <td style="min-width:20px;max-width:20px">{{obj.adjustExps}}</td>
588   - <td style="min-width:110px;max-width:110px">{{obj.jGh}}{{obj.jName}}</td>
589   - <td style="min-width:110px;max-width:110px">
  582 + <td style="min-width:95px;max-width:95px">{{obj.jGh}}{{obj.jName}}</td>
  583 + <td style="min-width:95px;max-width:95px">
590 584 {{if obj.sGh !=null}}
591 585 {{obj.sGh}}{{obj.sName}}
592 586 {{/if}}
593 587 </td>
594 588 <td style="min-width:30px;max-width:30px">&nbsp;</td>
595   - <td style="min-width:124px;max-width:124px">{{obj.qdzName}}</td>
596   - <td style="min-width:124px;max-width:124px">{{obj.zdzName}}</td>
  589 + <td style="min-width:116px;max-width:116px">{{obj.qdzName}}</td>
  590 + <td style="min-width:116px;max-width:116px">{{obj.zdzName}}</td>
597 591 <td style="min-width:50px;max-width:50px">{{obj.fcsj}}</td>
598 592 <td style="min-width:50px;max-width:50px">{{obj.fcsjActual}}</td>
599 593 <td style="min-width:50px;max-width:50px">{{obj.zdsj}}</td>
... ... @@ -605,7 +599,7 @@
605 599 {{obj.jhlc}}
606 600 {{/if}}
607 601 </td>
608   - <td style="min-width:70px;max-width:70px;">
  602 + <td style="min-width:116px;max-width:116px;">
609 603 {{obj.remarks}}
610 604 </td>
611 605 </tr>
... ...