潘钊 / bsth_control · Commits

Commit 753eca44ad155175ed64f3b44b6098c1d900b8f3

Authored by 潘钊
2 parents 1f7618d4 ff91a433
build: skipped

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

Inline Side-by-side
Showing 5 changed files with 37 additions and 31 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @753eca4
... ... @@ -2935,7 +2935,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2935 2935 long fcsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]);
2936 2936 if(fcsj > 23*60 && fcsjA < 60)
2937 2937 fcsjA += 1440;
2938   - if(fcsjA - fcsj >= 3 || fcsjA - fcsj <= 1){
  2938 + if(fcsjA - fcsj <= 3 && fcsjA - fcsj >= -1){
2939 2939 temp.put("fcsjzd", "准点");
2940 2940 } else {
2941 2941 temp.put("fcsjzd", "不准点");
... ... @@ -2949,7 +2949,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
2949 2949 long zdsjA = Long.valueOf(split2[0])*60 + Long.valueOf(split2[1]);
2950 2950 if(zdsj > 23*60 && zdsjA < 60)
2951 2951 zdsjA += 1440;
2952   - if(zdsjA - zdsj >= 3 || zdsjA - zdsj <= 1){
  2952 + if(zdsjA - zdsj <= 3 && zdsjA - zdsj >= -1){
2953 2953 temp.put("zdsjzd", "准点");
2954 2954 } else {
2955 2955 temp.put("zdsjzd", "不准点");
... ...
src/main/resources/static/pages/home.html
  View file @753eca4
... ... @@ -64,7 +64,7 @@
64 64 <li class="sub_title"><h6>基础信息</h6></li>
65 65 <li><span class="label s_c_add">新增</span>1、新增站点间双路段生成功能。</li>
66 66 <li><span class="label s_c_change">修复</span>2、修复一个bug，在线路编辑页面初始化线路的系统规划功能，百度地图上缺少的线路会显示一直加载。</li>
67   - <li><span class="label s_c_change">修复</span>3、修复一个bug，在修改站点时选择取消，不点击站点树状图，直接选择上/下行操作里的修改站点，会出现没有可修改站点的bug。</li>
  67 + <li><span class="label s_c_change">修改</span>3、修改站点位置修改。</li>
68 68 <li><span class="label s_c_add">新增</span>4、新增线路删除功能，可以删除已撤销的线路，仅用于剔除录入错误的数据，如出现误操作，请联系管理员恢复数据。</li>
69 69 <li class="sub_title"><h6>用油和报表</h6></li>
70 70 <li><span class="label s_c_add">新增</span>5、油量，电量记录操作日志。</li>
... ...
src/main/resources/static/pages/punctual/list.html
  View file @753eca4
... ... @@ -22,7 +22,7 @@
22 22 </div>
23 23 </div>
24 24  
25   -<div class="row" id="sheetList">
  25 +<div class="row" id="onTime">
26 26 <div class="col-md-12">
27 27 <div class="portlet light porttlet-fit bordered">
28 28 <div class="portlet-body">
... ... @@ -41,7 +41,8 @@
41 41 <td>实际发车</td>
42 42 <td>计划到站</td>
43 43 <td>实际到站</td>
44   - <td>是否准点</td>
  44 + <td>发车准点</td>
  45 + <td>到站准点</td>
45 46 </tr>
46 47 </thead>
47 48  
... ... @@ -61,7 +62,7 @@
61 62 if (!$('body').hasClass('page-sidebar-closed'))
62 63 $('.menu-toggler.sidebar-toggler').click();
63 64 var no="";
64   - $("#sheetList").on('init', function (e, id) {
  65 + $("#onTime").on('init', function (e, id) {
65 66 no=id;
66 67 var date = id.split("_")[0];
67 68 var endDate = date;
... ... @@ -69,8 +70,8 @@
69 70 var fgs=$('#fgsdm').val();
70 71 var gs=$('#gsdm').val();
71 72 $get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:2},function(result){
72   - var sheetList_2 = template('sheetList_2',{list:result});
73   - $('#forms_2 tbody').html(sheetList_2);
  73 + var onTime_2 = template('onTime_2',{list:result});
  74 + $('#forms_2 tbody').html(onTime_2);
74 75 });
75 76 });
76 77 $("#exportList").on('click',function(){
... ... @@ -86,21 +87,24 @@
86 87  
87 88 });
88 89 </script>
89   -<script type="text/html" id="sheetList_2">
  90 +<script type="text/html" id="onTime_2">
90 91 {{each list as obj i}}
91   - <tr {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>
  92 + <tr>
92 93 <td>{{i+1}}</td>
93 94 <td>{{obj.zd}}</td>
94 95 <td>{{obj.clzbh}}</td>
95 96 <td>{{obj.jsy}}</td>
96 97 <td>{{obj.lp}}</td>
97   - <td>{{obj.fcsj}}</td>
98   - <td>{{obj.fcsjA}}</td>
99   - <td>{{obj.zdsj}}</td>
100   - <td>{{obj.zdsjA}}</td>
101   - <td>
  98 + <td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>{{obj.fcsj}}</td>
  99 + <td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>{{obj.fcsjA}}</td>
  100 + <td {{if obj.fcsjflag=="1"}}style="color: red" {{/if}}>
102 101 {{if obj.fcsjflag!="1"}}准点{{else}}不准点{{/if}}
103 102 </td>
  103 + <td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>{{obj.zdsj}}</td>
  104 + <td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>{{obj.zdsjA}}</td>
  105 + <td {{if obj.zdsjflag=="1"}}style="color: red" {{/if}}>
  106 + {{if obj.zdsjflag!="1"}}准点{{else}}不准点{{/if}}
  107 + </td>
104 108 </tr>
105 109 {{/each}}
106 110 {{if list.length == 0}}
... ...
src/main/resources/static/pages/punctual/onTime.html
  View file @753eca4
... ... @@ -264,10 +264,10 @@
264 264 var gs=$('#gsdm').val();
265 265 var i = layer.load(2);
266 266 $get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs},function(result){
267   - var sheetList = template('sheetList',{list:result});
268   - $('#forms tbody').html(sheetList);
269   - $('#forms_h tbody').html(template('sheetList_h',{list:result}));
270   - $('.btn-sheetList').on('click', showSheetList);
  267 + var onTime = template('onTime',{list:result});
  268 + $('#forms tbody').html(onTime);
  269 + $('#forms_h tbody').html(template('onTime_h',{list:result}));
  270 + $('.btn-onTime').on('click', showSheetList);
271 271 layer.close(i);
272 272 });
273 273 });
... ... @@ -279,11 +279,11 @@
279 279 var gs=$('#gsdm').val();
280 280 var i = layer.load(2);
281 281 $get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:1},function(result){
282   - var sheetList = template('sheetList_1',{list:result});
283   - $('#forms_1 tbody').html(sheetList);
284   - $('#forms_1_h tbody').html(template('sheetList_1_h',{list:result}));
  282 + var onTime = template('onTime_1',{list:result});
  283 + $('#forms_1 tbody').html(onTime);
  284 + $('#forms_1_h tbody').html(template('onTime_1_h',{list:result}));
285 285 $("#forms_1 .hidden").removeClass("hidden");
286   - $('.btn-sheetList_1').on('click', openSheetList);
  286 + $('.btn-onTime_1').on('click', openSheetList);
287 287 $("#export_1").removeClass("hidden");
288 288 $("html,body").animate({scrollTop:$("#forms_1").offset().top},1000);
289 289 layer.close(i);
... ... @@ -305,8 +305,8 @@
305 305 shift: 5,
306 306 scrollbar: false,
307 307 success: function () {
308   - $('#sheetList').trigger('init', id);
309   - $('#sheetList').unbind();
  308 + $('#onTime').trigger('init', id);
  309 + $('#onTime').unbind();
310 310 }
311 311 });
312 312 });
... ... @@ -339,7 +339,7 @@
339 339  
340 340 });
341 341 </script>
342   -<script type="text/html" id="sheetList">
  342 +<script type="text/html" id="onTime">
343 343 {{each list as obj i}}
344 344 <tr>
345 345 <td>{{obj.gs}}</td>
... ... @@ -351,7 +351,7 @@
351 351 <td>{{obj.fczdl}}</td>
352 352 <td>{{obj.zdzdl}}</td>
353 353 <td>
354   - <button type="button" class="btn btn-sm blue btn-sheetList"
  354 + <button type="button" class="btn btn-sm blue btn-onTime"
355 355 data-id="{{obj.xlbm}}">查看</button>
356 356 </td>
357 357 </tr>
... ... @@ -363,7 +363,7 @@
363 363 {{/if}}
364 364 </script>
365 365  
366   -<script type="text/html" id="sheetList_h">
  366 +<script type="text/html" id="onTime_h">
367 367 {{each list as obj i}}
368 368 <tr>
369 369 <td>{{obj.gs}}</td>
... ... @@ -383,7 +383,7 @@
383 383 {{/if}}
384 384 </script>
385 385  
386   -<script type="text/html" id="sheetList_1">
  386 +<script type="text/html" id="onTime_1">
387 387 {{each list as obj i}}
388 388 <tr>
389 389 <td>{{obj.gs}}</td>
... ... @@ -396,7 +396,7 @@
396 396 <td>{{obj.fczdl}}</td>
397 397 <td>{{obj.zdzdl}}</td>
398 398 <td>
399   - <button type="button" class="btn btn-sm blue btn-sheetList_1"
  399 + <button type="button" class="btn btn-sm blue btn-onTime_1"
400 400 data-id="{{obj.xl_date}}">详细</button>
401 401 </td>
402 402 </tr>
... ... @@ -409,7 +409,7 @@
409 409 </script>
410 410  
411 411  
412   -<script type="text/html" id="sheetList_1_h">
  412 +<script type="text/html" id="onTime_1_h">
413 413 {{each list as obj i}}
414 414 <tr>
415 415 <td>{{obj.gs}}</td>
... ...
src/main/resources/static/pages/report/inoutstation.html
  View file @753eca4
... ... @@ -419,6 +419,8 @@
419 419 layer.msg("请选择时间");
420 420 }else if(zdlx=="" || zdlx==null){
421 421 layer.msg("请选择方向");
  422 + }else if(zd=="" || zd==null){
  423 + layer.msg("请选择站点");
422 424 }else{
423 425 var xlmc="线路: "+$("#select2-line-container").html();
424 426 var rqmc="日期: "+date1+"-"+date2;
... ...