Commit b7c579bba68fd28ef751ff473722c5bf895f0577

Authored by 娄高锋
1 parent 5cfa7b7a

调度日报加导出 LGF

src/main/resources/static/pages/forms/statement/scheduleDaily.html
... ... @@ -37,7 +37,7 @@
37 37 </div>
38 38 <div class="form-group">
39 39 <input class="btn btn-default" type="button" id="query" value="查询"/>
40   -<!-- <input class="btn btn-default" type="button" id="export" value="导出"/> -->
  40 + <input class="btn btn-default" type="button" id="export" value="导出"/>
41 41 </div>
42 42 </form>
43 43 </div>
... ... @@ -51,14 +51,15 @@
51 51 </tr>
52 52 <tr>
53 53 <td rowspan="3">路线别</td>
54   - <td colspan="15">全日营运里程(公里)</td>
  54 + <td colspan="16">全日营运里程(公里)</td>
55 55 <td colspan="15">全日营运班次</td>
56 56 <td colspan="9">大间隔情况</td>
57 57 </tr>
58 58 <tr>
59 59 <td rowspan="2">计划</td>
60 60 <td rowspan="2">实驶</td>
61   - <td rowspan="2">少驶</td>
  61 + <td rowspan="2">少驶公里</td>
  62 + <td rowspan="2">少驶班次</td>
62 63 <td colspan="11">少驶原因(公里)</td>
63 64 <td rowspan="2">临加公里</td>
64 65 <td colspan="3">计划班次</td>
... ... @@ -67,7 +68,7 @@
67 68 <td colspan="3">放站班次</td>
68 69 <td colspan="3">调头班次</td>
69 70 <td colspan="3">发生次数</td>
70   - <td rowspan="2">最大间隔时间()</td>
  71 + <td rowspan="2">最大间隔时间()</td>
71 72 <td colspan="5" rowspan="2">原因</td>
72 73 </tr>
73 74 <tr>
... ... @@ -277,6 +278,10 @@
277 278 var line = $("#line").val();
278 279 var xlName = $("#select2-line-container").html();
279 280 var date = $("#date").val();
  281 + if(date == null || date.length == 0){
  282 + layer.msg("请选择时间");
  283 + return;
  284 + }
280 285 $get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
281 286 var scheduleDaily_1 = template('scheduleDaily_1',{list:result});
282 287 $('#forms .scheduleDaily_1').html(scheduleDaily_1);
... ... @@ -292,6 +297,26 @@
292 297 });
293 298  
294 299 });
  300 +
  301 + $("#export").on("click",function(){
  302 + var params = {};
  303 + var line = $("#line").val();
  304 + var xlName = $("#select2-line-container").html();
  305 + var date = $("#date").val();
  306 + if(date == null || date.length == 0){
  307 + layer.msg("请选择时间");
  308 + return;
  309 + }
  310 + params['line'] = line;
  311 + params['date'] = date;
  312 + params['xlName'] = "xlName";
  313 + params['type'] = "export";
  314 + params['state'] = '2';
  315 + $get('/realSchedule/scheduleDailyExport', params, function(result){
  316 + window.open("/downloadFile/download?fileName=调度日报"+moment(date).format("YYYYMMDD"));
  317 + });
  318 + });
  319 +
295 320 });
296 321 </script>
297 322 <script type="text/html" id="scheduleDaily_1">
... ... @@ -301,6 +326,7 @@
301 326 <td>{{obj.jhlc}}</td>
302 327 <td>{{obj.sjgl}}</td>
303 328 <td>{{obj.ssgl}}</td>
  329 + <td>{{obj.ssbc}}</td>
304 330 <td>{{obj.ssgl_lz}}</td>
305 331 <td>{{obj.ssgl_dm}}</td>
306 332 <td>{{obj.ssgl_gz}}</td>
... ... @@ -348,7 +374,7 @@
348 374 {{/if}}
349 375 <td colspan="2">{{obj[3]}}</td>
350 376 <td colspan="2">{{obj[2]}}</td>
351   - <td>{{obj[4]}}</td>
  377 + <td>{{obj[1]}}/{{obj[4]}}</td>
352 378 <td>&nbsp;</td>
353 379 <td>&nbsp;</td>
354 380 <td>&nbsp;</td>
... ...