潘钊 / bsth_control · Commits

Commit 7ace53b84e81e13f43214f7dbf53f977a65c25dd

Authored by 娄高锋
1 parent f013eba5

update

Inline Side-by-side
Showing 4 changed files with 14 additions and 9 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
  View file @7ace53b
@@ -1700,8 +1700,10 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1700,8 +1700,10 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1700 lc = schedule.getJhlc(); 1700 lc = schedule.getJhlc();
1701 } 1701 }
1702 1702
1703 - jhbc++;  
1704 - jhlc += lc; 1703 + if(!schedule.isSflj()){
  1704 + jhbc++;
  1705 + jhlc += lc;
  1706 + }
1705 if(schedule.getStatus() != -1){ 1707 if(schedule.getStatus() != -1){
1706 sjbc++; 1708 sjbc++;
1707 sjlc += lc; 1709 sjlc += lc;
@@ -1927,7 +1929,7 @@ public class BusIntervalServiceImpl implements BusIntervalService { @@ -1927,7 +1929,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
1927 int sjbc = 0, sddf = 0, zddf = 0, 1929 int sjbc = 0, sddf = 0, zddf = 0,
1928 dxtz = 0, lbtz = 0; 1930 dxtz = 0, lbtz = 0;
1929 for(ScheduleRealInfo schedule : keyMap.get(key)){ 1931 for(ScheduleRealInfo schedule : keyMap.get(key)){
1930 - if(schedule.getFcsjActual() != null){ 1932 + if(schedule.getFcsjActual() != null && schedule.getStatus() != -1){
1931 boolean flag = false; 1933 boolean flag = false;
1932 sjbc++; 1934 sjbc++;
1933 if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){ 1935 if(schedule.getDfsj() != null && !schedule.getDfsj().equals(schedule.getFcsj())){
src/main/resources/static/pages/forms/statement/lbStatuAnaly.html
  View file @7ace53b
@@ -93,7 +93,7 @@ @@ -93,7 +93,7 @@
93 </form> 93 </form>
94 </div> 94 </div>
95 <div class="portlet-body"> 95 <div class="portlet-body">
96 - <div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;height:481px;"> 96 + <div class="table-container" id="table" style="margin-top: 0px;overflow:auto;min-width: 906px;">
97 <table class="table table-bordered table-hover table-checkable" id="forms"> 97 <table class="table table-bordered table-hover table-checkable" id="forms">
98 <thead> 98 <thead>
99 99
@@ -135,7 +135,6 @@ @@ -135,7 +135,6 @@
135 format : 'HH:mm', 135 format : 'HH:mm',
136 locale : 'zh-cn' 136 locale : 'zh-cn'
137 }); 137 });
138 - $("#table").height($(window).height()-100);  
139 138
140 var d = new Date(); 139 var d = new Date();
141 var year = d.getFullYear(); 140 var year = d.getFullYear();
@@ -310,7 +309,9 @@ @@ -310,7 +309,9 @@
310 layer.msg("请选择时间"); 309 layer.msg("请选择时间");
311 return; 310 return;
312 } 311 }
313 - $("#table").height($(window).height()-100); 312 + if($("#table").height() > $(window).height() - 110){
  313 + $("#table").height($(window).height()-110);
  314 + }
314 var reason = $("input[name='reason']"); 315 var reason = $("input[name='reason']");
315 var params = {}; 316 var params = {};
316 if(line == " ") 317 if(line == " ")
src/main/resources/static/pages/forms/statement/statisticsDaily.html
  View file @7ace53b
@@ -65,7 +65,7 @@ @@ -65,7 +65,7 @@
65 </form> 65 </form>
66 </div> 66 </div>
67 <div class="portlet-body"> 67 <div class="portlet-body">
68 - <div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px"> 68 + <div class="table-container" id="tjrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
69 <label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label> 69 <label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
70 <table class="table table-bordered table-hover table-checkable" id="forms"> 70 <table class="table table-bordered table-hover table-checkable" id="forms">
71 <thead> 71 <thead>
@@ -248,6 +248,7 @@ @@ -248,6 +248,7 @@
248 layer.msg("请选择时间范围！"); 248 layer.msg("请选择时间范围！");
249 return; 249 return;
250 } 250 }
  251 + $("#tjrbBody").height($(window).height()-100);
251 line = $("#line").val(); 252 line = $("#line").val();
252 xlName = $("#select2-line-container").html(); 253 xlName = $("#select2-line-container").html();
253 date = $("#date").val(); 254 date = $("#date").val();
@@ -282,7 +283,7 @@ @@ -282,7 +283,7 @@
282 } 283 }
283 284
284 }); 285 });
285 - $("#ddrbBody").height($(window).height()-280); 286 + $("#tjrbBody").height($(window).height()-100);
286 $("#export").on("click",function(){ 287 $("#export").on("click",function(){
287 var params = {}; 288 var params = {};
288 params['gsdm'] = gsdm; 289 params['gsdm'] = gsdm;
src/main/resources/static/pages/forms/statement/workDaily.html
  View file @7ace53b
@@ -7,7 +7,8 @@ @@ -7,7 +7,8 @@
7 .table-bordered > tbody > tr > td, 7 .table-bordered > tbody > tr > td,
8 .table-bordered > tfoot > tr > th, 8 .table-bordered > tfoot > tr > th,
9 .table-bordered > tfoot > tr > td { 9 .table-bordered > tfoot > tr > td {
10 - border: 1px solid; } 10 + border: 1px solid;
  11 + text-align: center; }
11 .table-bordered > thead > tr > th, 12 .table-bordered > thead > tr > th,
12 .table-bordered > thead > tr > td { 13 .table-bordered > thead > tr > td {
13 border-bottom-width: 2px; } 14 border-bottom-width: 2px; }