Commit 12c1e0047135de730ff79742fc420a54abe9f3f5
1 parent
a54badcc
获取电量加分公司匹配 导入加入驾驶员
调度日报统计日报样式调整
Showing
1 changed file
with
8 additions
and
8 deletions
src/main/resources/static/pages/forms/statement/statisticsDaily.html
| ... | ... | @@ -32,9 +32,9 @@ |
| 32 | 32 | </div> |
| 33 | 33 | </div> |
| 34 | 34 | |
| 35 | -<div class="row"> | |
| 36 | - <div class="col-md-12"> | |
| 37 | - <div class="portlet light porttlet-fit bordered"> | |
| 35 | +<!-- <div class="row"> --> | |
| 36 | + <div class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)"> | |
| 37 | +<!-- <div> --> | |
| 38 | 38 | <div class="portlet-title"> |
| 39 | 39 | <form class="form-inline" action=""> |
| 40 | 40 | <div style="display: inline-block; " id="gsdmDiv"> |
| ... | ... | @@ -64,8 +64,8 @@ |
| 64 | 64 | </div> |
| 65 | 65 | </form> |
| 66 | 66 | </div> |
| 67 | - <div class="portlet-body"> | |
| 68 | - <div class="table-container" id="tjrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px"> | |
| 67 | + <div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)"> | |
| 68 | + <div class="table-container" style="margin-top: 10px;min-width: 906px"> | |
| 69 | 69 | <label>早高峰:6:31~8:30 晚高峰:16:01~18:00</label> |
| 70 | 70 | <table class="table table-bordered table-hover table-checkable" id="forms"> |
| 71 | 71 | <thead> |
| ... | ... | @@ -80,7 +80,7 @@ |
| 80 | 80 | </tr> |
| 81 | 81 | <tr> |
| 82 | 82 | <td rowspan="2"><label>计划总</label> |
| 83 | - <label>公里</label></td> | |
| 83 | + <label>公里 </label></td> | |
| 84 | 84 | <td rowspan="2"><label>计划营</label><label>运公里</label></td> |
| 85 | 85 | <td rowspan="2"><label>计划空</label><label>驶公里</label></td> |
| 86 | 86 | <td rowspan="2"><label>实际</label><label>总公里</label></td> |
| ... | ... | @@ -262,7 +262,7 @@ |
| 262 | 262 | layer.msg("请选择时间范围!"); |
| 263 | 263 | return; |
| 264 | 264 | } |
| 265 | - $("#tjrbBody").height($(window).height()-100); | |
| 265 | +// $("#tjrbBody").height($(window).height()-100); | |
| 266 | 266 | line = $("#line").val(); |
| 267 | 267 | xlName = $("#select2-line-container").html(); |
| 268 | 268 | date = $("#date").val(); |
| ... | ... | @@ -297,7 +297,7 @@ |
| 297 | 297 | } |
| 298 | 298 | |
| 299 | 299 | }); |
| 300 | - $("#tjrbBody").height($(window).height()-100); | |
| 300 | +// $("#tjrbBody").height($(window).height()-100); | |
| 301 | 301 | $("#export").on("click",function(){ |
| 302 | 302 | var params = {}; |
| 303 | 303 | params['gsdm'] = gsdm; | ... | ... |