潘钊 / bsth_control · Commits

Commit eb21128f0c709516f24e88e6fcd68da8f1828e10

Authored by 娄高锋
1 parent f2cbc8e7

lgf

Inline Side-by-side
Showing 1 changed file with 21 additions and 24 deletions
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
  View file @eb21128
@@ -87,14 +87,15 @@ @@ -87,14 +87,15 @@
87 <table class="table table-bordered table-hover table-checkable" id="forms"> 87 <table class="table table-bordered table-hover table-checkable" id="forms">
88 <thead> 88 <thead>
89 <tr class="hidden"> 89 <tr class="hidden">
90 - <th >公司</th> 90 +<!-- <th >公司</th> -->
91 <th width="30%">日期分段</th> 91 <th width="30%">日期分段</th>
92 - <th >时段</th> 92 + <th>时段</th>
93 <th width="20%">线路</th> 93 <th width="20%">线路</th>
94 - <th >路牌</th> 94 + <th>路牌</th>
95 <th width="20%">站点</th> 95 <th width="20%">站点</th>
96 - <th >计划发车班次数</th>  
97 - <th>实际完成班次数</th> 96 + <th>班次数</th>
  97 +<!-- <th>计划发车班次数</th> -->
  98 +<!-- <th>实际完成班次数</th> -->
98 </tr> 99 </tr>
99 </thead> 100 </thead>
100 <tbody> 101 <tbody>
@@ -120,10 +121,11 @@ @@ -120,10 +121,11 @@
120 <tr class="hidden"> 121 <tr class="hidden">
121 <th rowspan="2">日期</th> 122 <th rowspan="2">日期</th>
122 <th colspan="4">到达时间</th> 123 <th colspan="4">到达时间</th>
  124 + <th rowspan="2">误点分钟</th>
123 <th colspan="4">发车时间</th> 125 <th colspan="4">发车时间</th>
124 <th rowspan="2">误点分钟</th> 126 <th rowspan="2">误点分钟</th>
125 - <th colspan="5">运送时间</th>  
126 - <th colspan="5">停站时间</th> 127 + <th colspan="3">运送时间</th>
  128 + <th colspan="3">停站时间</th>
127 </tr> 129 </tr>
128 <tr class="hidden"> 130 <tr class="hidden">
129 <th>计划</th> 131 <th>计划</th>
@@ -136,13 +138,13 @@ @@ -136,13 +138,13 @@
136 <th>平均延误</th> 138 <th>平均延误</th>
137 <th>计划</th> 139 <th>计划</th>
138 <th>实际</th> 140 <th>实际</th>
139 - <th>最快</th>  
140 - <th>最慢</th> 141 +<!-- <th>最快</th> -->
  142 +<!-- <th>最慢</th> -->
141 <th>平均</th> 143 <th>平均</th>
142 <th>计划</th> 144 <th>计划</th>
143 <th>实际</th> 145 <th>实际</th>
144 - <th>最大</th>  
145 - <th>最小</th> 146 +<!-- <th>最大</th> -->
  147 +<!-- <th>最小</th> -->
146 <th>平均</th> 148 <th>平均</th>
147 </tr> 149 </tr>
148 </thead> 150 </thead>
@@ -406,7 +408,7 @@ @@ -406,7 +408,7 @@
406 } 408 }
407 }); 409 });
408 $.each(list, function(i, g){ 410 $.each(list, function(i, g){
409 - if(g.line == params[3] && g.lp == params[4] &&g.station　== params[5]){ 411 + if(g.line == params[2] && g.lp == params[3] &&g.station　== params[4]){
410 var tbodyHtml = template('list_workList',{list:g}); 412 var tbodyHtml = template('list_workList',{list:g});
411 $('#works tbody').html(tbodyHtml); 413 $('#works tbody').html(tbodyHtml);
412 $("#works_hidden").removeClass("hidden"); 414 $("#works_hidden").removeClass("hidden");
@@ -483,14 +485,12 @@ @@ -483,14 +485,12 @@
483 <script type="text/html" id="list_lineTimeAnaly"> 485 <script type="text/html" id="list_lineTimeAnaly">
484 {{each list as obj i}} 486 {{each list as obj i}}
485 <tr> 487 <tr>
486 - <td>{{obj.company}}</td>  
487 <td>{{obj.dates}}</td> 488 <td>{{obj.dates}}</td>
488 <td>{{obj.times}}</td> 489 <td>{{obj.times}}</td>
489 <td>{{obj.line}}</td> 490 <td>{{obj.line}}</td>
490 <td>{{obj.lp}}</td> 491 <td>{{obj.lp}}</td>
491 <td>{{obj.station}}</td> 492 <td>{{obj.station}}</td>
492 - <td>{{obj.jhbc}}</td>  
493 - <td>{{obj.sjbc}}</td> 493 + <td>{{obj.bcs}}</td>
494 </tr> 494 </tr>
495 {{/each}} 495 {{/each}}
496 {{if list.length == 0}} 496 {{if list.length == 0}}
@@ -503,30 +503,27 @@ @@ -503,30 +503,27 @@
503 {{each list.workList as obj i}} 503 {{each list.workList as obj i}}
504 <tr> 504 <tr>
505 <td>{{obj.date}}</td> 505 <td>{{obj.date}}</td>
506 - <td>{{obj.jhdf}}</td>  
507 - <td>{{obj.sjdf}}</td> 506 + <td>{{obj.jhdd}}</td>
  507 + <td>{{obj.sjdd}}</td>
508 {{if i == 0}} 508 {{if i == 0}}
509 - <td rowspan="{{list.workList.length}}" class="merge">{{list.wddf1}}</td>  
510 - <td rowspan="{{list.workList.length}}" class="merge">{{list.wddf2}}</td> 509 + <td rowspan="{{list.workList.length}}" class="merge">{{list.ddwd1}}</td>
  510 + <td rowspan="{{list.workList.length}}" class="merge">{{list.ddwd2}}</td>
511 {{/if}} 511 {{/if}}
  512 + <td class="merge">{{obj.ddwd}}</td>
512 <td>{{obj.jhfc}}</td> 513 <td>{{obj.jhfc}}</td>
513 <td>{{obj.sjfc}}</td> 514 <td>{{obj.sjfc}}</td>
514 {{if i == 0}} 515 {{if i == 0}}
515 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td> 516 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc1}}</td>
516 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td> 517 <td rowspan="{{list.workList.length}}" class="merge">{{list.wdfc2}}</td>
517 {{/if}} 518 {{/if}}
518 - <td class="merge">{{obj.wdfz}}</td> 519 + <td class="merge">{{obj.fcwd}}</td>
519 <td>{{obj.jhys}}</td> 520 <td>{{obj.jhys}}</td>
520 <td>{{obj.sjys}}</td> 521 <td>{{obj.sjys}}</td>
521 - <td>{{obj.yssjMin}}</td>  
522 - <td>{{obj.yssjMax}}</td>  
523 {{if i == 0}} 522 {{if i == 0}}
524 <td rowspan="{{list.workList.length}}" class="merge">{{list.pjys}}</td> 523 <td rowspan="{{list.workList.length}}" class="merge">{{list.pjys}}</td>
525 {{/if}} 524 {{/if}}
526 <td>{{obj.jhtz}}</td> 525 <td>{{obj.jhtz}}</td>
527 <td>{{obj.sjtz}}</td> 526 <td>{{obj.sjtz}}</td>
528 - <td>{{obj.tzsjMax}}</td>  
529 - <td>{{obj.tzsjMin}}</td>  
530 {{if i == 0}} 527 {{if i == 0}}
531 <td rowspan="{{list.workList.length}}" class="merge">{{list.pjtz}}</td> 528 <td rowspan="{{list.workList.length}}" class="merge">{{list.pjtz}}</td>
532 {{/if}} 529 {{/if}}