潘钊 / bsth_control · Commits

Commit 73d9e104c93f896d691f1efb829a062b676ff08a

Authored by 潘钊
2 parents 8bb66556 e4c08b41
build: skipped

Merge branch 'pudong' of http://222.66.0.204:8090/panzhaov5/bsth_control into pudong

Inline Side-by-side
Showing 2 changed files with 26 additions and 3 deletions
src/main/resources/static/pages/forms/statement/firstAndLastBus_delay.html
  View file @73d9e10
@@ -81,7 +81,7 @@ @@ -81,7 +81,7 @@
81 </div> 81 </div>
82 </div> 82 </div>
83 83
84 -<script type="text/javascript" src="js/jquery.table2excel.min.js"></script> 84 +<script type="text/javascript" src="/pages/forms/statement/js/jquery.table2excel.min.js"></script>
85 <script> 85 <script>
86 $(function(){ 86 $(function(){
87 $('#export').attr('disabled', "true"); 87 $('#export').attr('disabled', "true");
@@ -220,7 +220,13 @@ @@ -220,7 +220,13 @@
220 $("#sumMap tr").addClass("hidden"); 220 $("#sumMap tr").addClass("hidden");
221 $get('/pcpc/firstAndLastBus_sum', params, function(result){ 221 $get('/pcpc/firstAndLastBus_sum', params, function(result){
222 // 把数据填充到模版中 222 // 把数据填充到模版中
223 - var tbodyHtml = template('list_firstAndLastBus_delay',{list:result[result.length - 1].map}); 223 + var list;
  224 + if(result.length - 1 > 0){
  225 + list = result[result.length - 1].map;
  226 + } else {
  227 + list = result;
  228 + }
  229 + var tbodyHtml = template('list_firstAndLastBus_delay',{list:list});
224 // 把渲染好的模版html文本追加到表格中 230 // 把渲染好的模版html文本追加到表格中
225 $('#forms tbody').html(tbodyHtml); 231 $('#forms tbody').html(tbodyHtml);
226 232
@@ -262,4 +268,9 @@ @@ -262,4 +268,9 @@
262 <td>{{obj.remarks1}}</td> 268 <td>{{obj.remarks1}}</td>
263 </tr> 269 </tr>
264 {{/each}} 270 {{/each}}
  271 + {{if list.length == 0}}
  272 + <tr>
  273 + <td colspan="20"><h6 class="muted">没有相关数据</h6></td>
  274 + </tr>
  275 + {{/if}}
265 </script> 276 </script>
266 \ No newline at end of file 277 \ No newline at end of file
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
  View file @73d9e10
@@ -135,7 +135,7 @@ @@ -135,7 +135,7 @@
135 </div> 135 </div>
136 </div> 136 </div>
137 137
138 -<script type="text/javascript" src="js/jquery.table2excel.min.js"></script> 138 +<script type="text/javascript" src="/pages/forms/statement/js/jquery.table2excel.min.js"></script>
139 <script> 139 <script>
140 $(function(){ 140 $(function(){
141 $('#export').attr('disabled', "true"); 141 $('#export').attr('disabled', "true");
@@ -302,6 +302,8 @@ @@ -302,6 +302,8 @@
302 $("#forms .hidden").removeClass("hidden"); 302 $("#forms .hidden").removeClass("hidden");
303 $("#map tr").addClass("hidden"); 303 $("#map tr").addClass("hidden");
304 $("#sumMap tr").addClass("hidden"); 304 $("#sumMap tr").addClass("hidden");
  305 + $("#exportMap").addClass("hidden");
  306 + $("#exportSumMap").addClass("hidden");
305 $get('/pcpc/firstAndLastBus_sum', params, function(result){ 307 $get('/pcpc/firstAndLastBus_sum', params, function(result){
306 // 把数据填充到模版中 308 // 把数据填充到模版中
307 var tbodyHtml = template('list_firstAndLastBus_sum',{list:result}); 309 var tbodyHtml = template('list_firstAndLastBus_sum',{list:result});
@@ -432,6 +434,11 @@ @@ -432,6 +434,11 @@
432 {{/if}} 434 {{/if}}
433 </tr> 435 </tr>
434 {{/each}} 436 {{/each}}
  437 + {{if list.length == 0}}
  438 + <tr>
  439 + <td colspan="20"><h6 class="muted">没有相关数据</h6></td>
  440 + </tr>
  441 + {{/if}}
435 </script> 442 </script>
436 <script type="text/html" id="list_sumMaps"> 443 <script type="text/html" id="list_sumMaps">
437 {{each list as obj i}} 444 {{each list as obj i}}
@@ -447,4 +454,9 @@ @@ -447,4 +454,9 @@
447 <td>{{obj.remarks1}}</td> 454 <td>{{obj.remarks1}}</td>
448 </tr> 455 </tr>
449 {{/each}} 456 {{/each}}
  457 + {{if list.length == 0}}
  458 + <tr>
  459 + <td colspan="20"><h6 class="muted">没有相关数据</h6></td>
  460 + </tr>
  461 + {{/if}}
450 </script> 462 </script>
451 \ No newline at end of file 463 \ No newline at end of file