潘钊 / bsth_control · Commits

Commit 2da98943915c1f68919644e78bd37114a01f7aaa

Authored by 廖磊
1 parent c3f302f7
build: skipped

报表

Inline Side-by-side
Showing 4 changed files with 39 additions and 3 deletions
src/main/resources/static/pages/forms/statement/shifday.html
  View file @2da9894
... ... @@ -42,7 +42,7 @@
42 42 </div>
43 43 </form>
44 44 </div>
45   - <div>
  45 + <div style="display: none">
46 46 <h3>数据显示</h3>
47 47 <a>驾驶员 售票员 路牌</a>&nbsp;&nbsp;
48 48 <a>售票员 路牌 车辆</a>&nbsp;&nbsp;
... ...
src/main/resources/static/pages/report/inoutstation.html
  View file @2da9894
... ... @@ -95,7 +95,10 @@
95 95 </tbody>
96 96 </table>
97 97 </div>
  98 + <div>
  99 + <span style="font-size: 20px" class="item-label" id="dlzmx"> </span>
98 100  
  101 + </div>
99 102 <div style="margin-top: 20px; " id="forms1Div">
100 103 <table class="table table-bordered table-checkable" id="forms1">
101 104 <thead>
... ... @@ -314,6 +317,11 @@
314 317 var nbbm=$("#nbbm").val();
315 318  
316 319 $post('/report/queryListZdxx',{clzbh:nbbm,date:rq,line:line,fcsj:fcsj,ddsj:ddsj},function(result){
  320 + var xlmc="线路: "+$("#select2-line-container").html();
  321 + var clmc="车辆: "+nbbm;
  322 + var rqmc="日期: "+rq;
  323 + var bcmc="班次: "+fcsj+"-"+ddsj;
  324 + $("#dlzmx").html("到离站详细 "+xlmc+" "+clmc+" "+rqmc+" "+bcmc);
317 325 console.log(result);
318 326 var ludan_ll_1 = template('ludan_ll_1',{list:result});
319 327 // 把渲染好的模版html文本追加到表格中
... ... @@ -338,6 +346,16 @@
338 346 }else if(zdlx=="" || zdlx==null){
339 347 layer.msg("请选择方向");
340 348 }else{
  349 + var xlmc="线路: "+$("#select2-line-container").html();
  350 + var rqmc="日期: "+date1+"-"+date2;
  351 + var sxmc="上下行: "+ zdlx;
  352 + var zdmc="";
  353 + if(zd==null || zd==""){
  354 + zdmc="站点: "
  355 + }else{
  356 + zdmc="站点: "+$("#select2-zd-container").html();
  357 + }
  358 + $("#dlzmx").html("到离站详细 "+xlmc+" "+rqmc+" "+sxmc+" "+zdmc);
341 359 $post('/report/queryListClzd',{zd:zd,zdlx:zdlx,line:line,fcsj:date1,ddsj:date2},function(result){
342 360 console.log(result);
343 361 var ludan_ll_1 = template('ludan_ll_1',{list:result});
... ...
src/main/resources/static/pages/report/message/message.html
  View file @2da9894
... ... @@ -102,6 +102,15 @@
102 102 format : 'YYYY-MM-DD',
103 103 locale : 'zh-cn'
104 104 });
  105 + var d = new Date();
  106 + var year = d.getFullYear();
  107 + var month = d.getMonth() + 1;
  108 + var day = d.getDate();
  109 + if(month > 9){
  110 + $("#date").val(year + "-" + month + "-" + day);
  111 + } else {
  112 + $("#date").val(year + "-0" + month + "-" + day);
  113 + }
105 114  
106 115 $('#line').select2({
107 116 ajax: {
... ... @@ -246,7 +255,7 @@
246 255 {{/each}}
247 256 {{if list.length == 0}}
248 257 <tr>
249   - <td colspan="3"><h6 class="muted">没有找到相关数据</h6></td>
  258 + <td colspan="4"><h6 class="muted">没有找到相关数据</h6></td>
250 259 </tr>
251 260 {{/if}}
252 261 </script>
... ...
src/main/resources/static/pages/report/oil/oilListMonth.html
  View file @2da9894
... ... @@ -93,6 +93,15 @@
93 93 format : 'YYYY-MM-DD',
94 94 locale : 'zh-cn'
95 95 });
  96 + var d = new Date();
  97 + var year = d.getFullYear();
  98 + var month = d.getMonth() + 1;
  99 + var day = d.getDate();
  100 + if(month > 9){
  101 + $("#date").val(year + "-" + month + "-" + day);
  102 + } else {
  103 + $("#date").val(year + "-0" + month + "-" + day);
  104 + }
96 105  
97 106 $('#line').select2({
98 107 ajax: {
... ... @@ -161,7 +170,7 @@
161 170 {{/each}}
162 171 {{if list.length == 0}}
163 172 <tr>
164   - <td colspan="15"><h6 class="muted">没有找到相关数据</h6></td>
  173 + <td colspan="20"><h6 class="muted">没有找到相关数据</h6></td>
165 174 </tr>
166 175 {{/if}}
167 176 </script>
168 177 \ No newline at end of file
... ...