班次大间隔详细修改

廖磊
1 parent d9ea8cf2
Showing 4 changed files with 35 additions and 18 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/forms/mould/countIntervalXx.xls
src/main/resources/static/pages/report/countInterval/countInterval.html
@@ -297,6 +297,8 @@ public class ReportController {
 			m_.put("qSj", jsonObject.getString("qSj"));
 			m_.put("hJh", jsonObject.getString("hJh"));
 			m_.put("hSj", jsonObject.getString("hSj"));
+			m_.put("djgsj", jsonObject.getString("djgsj"));
+			m_.put("bcjgsj", jsonObject.getString("bcjgsj"));
 			lMap.add(m_);
 		}
 		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
@@ -2402,6 +2402,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", peak);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}else{
@@ -2416,6 +2418,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", trough);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}
@@ -2443,6 +2447,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", peak);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}else{
@@ -2457,6 +2463,8 @@ public class ReportServiceImpl implements ReportService{
 							m.put("qSj", time);
 							m.put("hJh", listInfo.get(i+1).getFcsj());
 							m.put("hSj", listInfo.get(i+1).getFcsjActual());
+							m.put("djgsj", trough);
+							m.put("bcjgsj", (fscjNext-fcsjTime)/60000);
 							mapList.add(m);
 						}
 					}
@@ -52,7 +52,7 @@
 			<div class="portlet-body">
 				<div class="row"  class="col-md-12">
 					<div class="col-md-5">
-						<div  id="left_table" style="margin-top: 10px;overflow:auto;height: 860px">
+						<div  id="left_table" style="margin-top: 10px;overflow:auto;">
 							<input class="btn btn-default hidden" type="button" id="export" value="导出"/>
 							<table class="table table-bordered table-hover table-checkable pre-scrollable" id="info_inter">
 								<thead>
@@ -61,7 +61,7 @@
 										<th>线路</th>
 										<th>等级</th>
 										<th>班次数</th>
-										<th>发生次数</th>
+										<th>次数</th>
 										<th>发生率</th>
 									</tr>
 								</thead>
@@ -77,16 +77,21 @@
 							<table class="table table-bordered table-hover table-checkable" id="forms">
 								<thead class="hidden">
 									<tr >
-										<th rowspan="2">分公司</th>
-										<th rowspan="2">线路</th>
-										<th rowspan="2">大间隔等级</th>
-										<th colspan="4">发生大间隔班次</th>
+										<th rowspan="3">分公司</th>
+										<th rowspan="3">线路</th>
+										<th rowspan="3">等级</th>
+										<th colspan="6">发生大间隔班次</th>
 									</tr>
 									<tr>
-										<th>计发</th>
-										<th>实发</th>
-										<th>计发</th>
-										<th>实发</th>
+										<th rowspan="2">计发</th>
+										<th rowspan="2">实发</th>
+										<th rowspan="2">计发</th>
+										<th rowspan="2">实发</th>
+										<th colspan="2">间隔时间(分)</th>
+									</tr>
+									<tr>
+										<th>班次</th>
+										<th>大间隔</th>
 									</tr>
 								</thead>
 								<tbody>
@@ -208,7 +213,7 @@
 				layer.msg("请选择时间！");
 				return;
 			}
-// 			$("#left_table").height($(window).height()-100);
+			$("#left_table").height($(window).height()-200);
 			line = $("#line").val();
 			date = $("#date").val();
 			gsbm =$("#gsdm").val();
@@ -296,13 +301,15 @@
 <script type="text/html" id="list_inter_info_xx">
 	{{each list as obj i}}
 		<tr>
-			<td width="20%">{{obj.fgsname}}</td>
-			<td width="20%">{{obj.xlName}}</td>
-			<td width="10%">{{obj.djgde}}</td>
-			<td width="10%">{{obj.qJh}}</td>
-			<td width="10%">{{obj.qSj}}</td>
-			<td width="10%">{{obj.hJh}}</td>
-			<td width="10%">{{obj.hSj}}</td>
+			<td width="14%">{{obj.fgsname}}</td>
+			<td width="16%">{{obj.xlName}}</td>
+			<td width="8%">{{obj.djgde}}</td>
+			<td width="8%">{{obj.qJh}}</td>
+			<td width="8%">{{obj.qSj}}</td>
+			<td width="8%">{{obj.hJh}}</td>
+			<td width="8%">{{obj.hSj}}</td>
+			<td width="10%">{{obj.bcjgsj}}</td>
+			<td width="10%">{{obj.djgsj}}</td>
 		</tr>
 	{{/each}}
 	{{if list.length == 0}}