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

徐烜
2 parents 421823e7 f722d007
Showing 13 changed files with 548 additions and 534 deletions
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/java/com/bsth/service/oil/impl/DlbServiceImpl.java
src/main/java/com/bsth/service/oil/impl/JdlServiceImpl.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/static/pages/excep/js/line-list-function.js
src/main/resources/static/pages/excep/speedingCount.html
src/main/resources/static/pages/excep/speedingList.html
src/main/resources/static/pages/excep/speedingListmh.html
src/main/resources/static/pages/forms/mould/countIntervalXx.xls
src/main/resources/static/pages/forms/statement/scheduleDaily.html
src/main/resources/static/pages/forms/statement/statisticsDaily.html
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<?>>();
@@ -332,7 +332,8 @@ public class SpeedingServiceImpl implements SpeedingService {
             Location location;
             while (rs.next()) {
             	speed = new Speeding();
-                speed.setVehicle(rs.getString("vehicle"));
+            	speed.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
+               // speed.setVehicle(rs.getString("vehicle"));
                 location = TransGPS.LocationMake(rs.getFloat("lon"), rs.getFloat("lat"));
                 location = TransGPS.bd_encrypt(TransGPS.transformFromWGSToGCJ(location));
                 speed.setLon((float)location.getLng());
@@ -300,7 +300,8 @@ public class DlbServiceImpl extends BaseServiceImpl&lt;Dlb,Integer&gt; implements DlbS
 						for (int i = 0; i < jdlList.size(); i++) {
 							Jdl jdl=jdlList.get(i);
 							if(map.get("clZbh").toString().equals(jdl.getNbbm()) 
-									&&map.get("jGh").toString().equals(jdl.getJsy())){
+									&&map.get("jGh").toString().equals(jdl.getJsy())
+									&&map.get("bCompany").toString().equals(jdl.getFgsBm())){
 								jzl+=jdl.getJdl();
 							}
 						}
@@ -133,6 +133,7 @@ public class JdlServiceImpl extends BaseServiceImpl&lt;Jdl, Integer&gt; implements Jdl
 				m.put("nbbm", jdl.getNbbm());
 				m.put("jdl", jdl.getJdl());
 				m.put("jdz", jdl.getJdz());
+				m.put("jsy", jdl.getJsy());
 				m.put("remarks", jdl.getRemarks());
 				list.add(m);
 			}
@@ -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);
 						}
 					}
+var PublicFunctions = function () {
+	var PubFun = {
+			/** 初始化线路标题与ID */
+			setTiteText : function(lineId) {
+				// 根据线路ID获取线路名称
+				GetAjaxData.getIdLineName(lineId,function(data) {
+					// 定义线路名称
+					var lineNameV = data.name;
+					$('.portlet-title .caption').text(lineNameV);
+				});
+			},
+			setSectionFormValue : function(Section) {
+				$('#isRoadeSpeedInput').val(Section.isRoadeSpeed);
+				// 路段ID
+				$('#sectionIdInput').val(Section.sectionId);
+				// 路段路由ID
+				$('#sectionRouteIdInput').val(Section.sectionrouteId);
+				// 线路ID
+				$('#sectionRouteLineInput').val(Section.sectionrouteLine);
+				// 线路编码
+				$('#lineCodeInput').val(Section.sectionrouteLineCode);
+				// 折线坐标集合
+				$('#bsectionVectorInput').val(Section.sectionBsectionVector);
+				// 路段名称
+				$('#sectionNameInput').val(Section.sectionName);
+				// 路段编码
+				$('#sectionCodeInput').val(Section.sectionCode);
+				// 路段序号
+				$('#sectionrouteCodeSelect').val(Section.sectionrouteCode);
+				// 路段方向
+				$('#directionsSection').val(Section.sectionrouteDirections);
+				// 道路编码
+				$('#roadCodingCodInput').val(Section.sectionRoadCoding);
+				// 道路限速
+				$('#speedLimitInput').val(Section.sectionSpeedLimet);
+				// 路段长度
+				$('#sectionDistanceInput').val(Section.sectionDistance);
+				// 时长
+				$('#sectionTimeInput').val(Section.sectionTime);
+				// 版本号
+				$('#versionsInput').val(Section.versions);
+				// 是否撤销
+				$('#destroySelect').val(Section.destroy);
+				// 描述/说明
+				$('#descriptionsTextarea').val(Section.descriptions);
+			},		
+			/** 在地图上画出线路走向  @param:<Line.id：线路Id；0：上行；data：路段数据> */
+			linePanlThree : function(lineId,data,direction) {
+				/** 获取站点路由信息 @param:<Line.id：线路Id；0：上行> @return：<resultdata：站点路由数据> */
+				$get('/stationroute/getStationRouteCenterPoints',{lineId:lineId,direction:direction},function(resultdata) {
+					SpeedingMap.clearMarkAndOverlays();
+					var polyline_center;
+					// 如果站点路由数据不为空
+					if(resultdata.length>0) {
+						var ceter_index = Math.floor(resultdata.length / 2);
+				  		var ceterPointsStr = resultdata[ceter_index].bJwpoints;
+				  		var ceterPointsArray = ceterPointsStr.split(' ');
+		  				polyline_center = new BMap.Point(ceterPointsArray[0],ceterPointsArray[1]);
+						// 遍历站点路由数据
+			  			for(var s = 0 ; s<resultdata.length;s++) {
+			  				// 中心点坐标字符串
+			  				var bJwpointsStr = resultdata[s].bJwpoints;
+			  				var stationName = resultdata[s].stationName;
+			  				// 起个中心点坐标字符串
+			  				var bJwpointsArray = bJwpointsStr.split(' ');
+			  				// 设置中心点
+			  				var point_center = new BMap.Point(bJwpointsArray[0],bJwpointsArray[1]);
+			  				/** 在地图上画点 @param：<point_center：中心坐标点> */
+			  				SpeedingMap.drawingUpStationPoint(point_center,stationName,s+1);
+			  			}
+			  			
+			  		}
+					// 路段数据长度
+					var dataLen = data.length;
+					//debugger;
+					// 如果大于零
+					if(dataLen>0) {
+						// 编辑路段数据
+						for(var d= 0; d<dataLen;d++){
+							// 地图折线坐标点集合
+							var polylineArray = [];
+							// 获取路段折线坐标字符串
+							var sectionBsectionVectorStr = data[d].sectionBsectionVector;
+							if(sectionBsectionVectorStr==null) 
+								continue;
+							// 切割段折线坐标字符串
+							var tempStr = sectionBsectionVectorStr.substring(11,sectionBsectionVectorStr.length-1);
+							// 分割折线坐标字符串
+							var lineArray = tempStr.split(',');
+							for(var i = 0;i<lineArray.length;i++) {
+								polylineArray.push(new BMap.Point(lineArray[i].split(' ')[0],lineArray[i].split(' ')[1]));
+							}
+							/** 在地图上画出线路走向 @param：<polylineArray：地图折线坐标点集合；resultdata：站点路由数据> */
+							SpeedingMap.drawingUpline01(polylineArray,polyline_center,data[d]);
+						}
+					}
+				});	
+			},
+			// 方向代码转名称.
+			dirdmToName : function(value){
+				var srStr = '';
+				if(value=='0')
+					srStr = '上行';
+				else if(value=='1')
+					srStr = '下行';
+				return srStr;
+			},
+//			editAChangeCssRemoveDisabled : function() {
+//				$('#downLine').removeClass('btn disabled');
+//				$('.btn-circle').removeClass('disabled');
+//				$('#upLine').removeClass('btn disabled');
+//			},
+	}
+	return PubFun ;
+}();
 \ No newline at end of file
@@ -17,120 +17,362 @@
 			<div class="portlet-title">
 				<div class="caption">
 					 <i class="fa fa-times-circle"></i> <span
-						class="caption-subject font-dark sbold uppercase">超速异常数据统计</span>
+						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
+				</div>
+				<div class="actions">
 				</div>
-				
 			</div>
 			<div class="portlet-body">
 				<div class="table-container" style="margin-top: 10px">
 					<table
 						class="table table-striped table-bordered table-hover table-checkable"
 						id="datatable_speeding">
-						<tr role="row" class="filter">
-						<td><label style="padding: 6px 12px;">线路 </label></td>
-						<td>
-							<select class="form-control" name="line" id="line" style="width: 180px;"></select>
-						</td>
-						<td><label style="padding: 6px 12px;">日期</label></td>
-						<td>
-						<input class="form-control" type="text" id="date" style="width: 180px;"/>
-						</td>
-						<td>
-						<button id="bottomId" class="btn btn-sm green btn-outline filter-submit margin-bottom" >
+						<thead>
+							<tr role="row" class="heading">
+								<th width="3%">#</th>
+								<th width="4%">线路</th>
+								<th width="6%">车辆自编号</th>
+								<th width="8%">上下行</th>
+								<th width="10%">开始时间</th>
+								<th width="10%">结束时间</th>
+								<th width="8%">持续时间</th>
+								<th width="8%">查看轨迹</th>
+								<th width="6%">操作</th>
+							</tr>
+							<tr role="row" class="filter">
+								<td></td>
+								<td>
+										<select class="form-control" name="line" id="line" style="width: 100px;"></select>
+								</td>
+								<td>
+										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
+								</td>
+								<!-- <td>
+									
+								</td>
+								<td>
+								</td> -->
+								<td>
+									<select class="form-control form-filter " name="updown" style="width: 90px;">
+                                         <option value="">请选择...</option>
+                                         <option value="0">上行</option>
+                                         <option value="1">下行</option>
+                                         <option value="-1">无效</option>
+                                     </select>
+								</td> 
+								<td> 
+									<input class="form-control" type="date" name="startDate" />
+								</td>
+								<td>
+									<input class="form-control" type="date" name="endDate" />
+								</td>
+								<td>
+									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
+									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
+								</td>
+								<td>
+								</td>
+								<td>
+									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
-						
-						<button class="btn btn-sm red btn-outline filter-cancel">
+                                                                
+									<button class="btn btn-sm red btn-outline filter-cancel">
                                                             <i class="fa fa-times"></i> 重置</button>
-						</td>
-						</tr>
-						</table>
+								</td>
+							</tr>
+						</thead>
+						<tbody></tbody>
+					</table>
+					<div style="text-align: right;">
+						<ul id="pagination" class="pagination"></ul>
+					</div>
 				</div>
-				 <div class="row">
-                        <div class="col-md-12">
-                            <div class="portlet light portlet-fit bordered">
-                               
-                                <div class="portlet-body">
-                                    <div id="echarts_bar" style="height:500px;"></div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
 			</div>
 		</div>
 	</div>
 </div>
-<script type="text/javascript">
-Echart();
-function Echart() {
-	var line=$("#line").val();
-	var dataTime=$("#date").val();
-	getEchart_server("speeding", "线路", "统计图", "line", "xl","/speeding/getReport.do", "1", "echarts_bar", line, dataTime);
-}
  
-$("#bottomId").click(function(){
-	Echart();
-})
+<script id="speeding_list_temp" type="text/html">
+{{each list as obj i}}
+<tr>
+	<td style="vertical-align: middle;">
+		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
+	</td>
+	<td>
+		{{obj.lineName}}
+	</td>
+	<td>
+		{{obj.vehicle}}
+	</td>
+	<td>
+		{{if obj.upDown==0}}
+			上行
+		{{else if obj.upDown==1}}
+			下行 
+		{{else}}
+			无效
+		{{/if}}
+	</td>	
+	<td>
+		{{obj.timestampDate}}
+	</td>
+	<td>
+		{{obj.endtimestampDate}}
+	</td>
+	<td>
+		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
+	</td>
+	<td>
+		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
+			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
+			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
+            data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
+			查看轨迹										
+		</a>
+	</td>
+	<td>
+		
+	</td>
+</tr>
+{{/each}}
+{{if list.length == 0}}
+<tr>
+	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
+</tr>
+{{/if}}
+</script>
+
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+
+<script>
 $(function(){
-//搜索线路
-$('#line').select2({
-	ajax: {
-		url: '/realSchedule/findLine',
-		type: 'post',
-		dataType: 'json',
-		delay: 150,
-		data: function(params){
-			return{line: params.term};
-		},
-	    processResults: function (data) {
-	      return {
-	        results: data
-	      };
-	    },
-		cache: true
-	},
-	templateResult: function(repo){
-		if (repo.loading) return repo.text;
-		var h = '<span>'+repo.text+'</span>';
-		return h;
-	},
-	escapeMarkup: function (markup) { return markup; },
-	minimumInputLength: 1,
-	templateSelection: function(repo){
-		return repo.text;
-	},
-	language: {
-       noResults: function(){
-           return '<span style="color:red;font-size: 12px;">没有搜索到线路！</span>';
-       },
-       inputTooShort : function(e) {
-			return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入线路搜索线路</span>';
-	   },
-       searching : function() {
-			return '<span style="color:gray;font-size: 12px;"> 正在搜索线路...</span>';
-	   }
+	var page = 0, initPagination;
+	var icheckOptions = {
+	    checkboxClass: 'icheckbox_flat-blue',
+	    increaseArea: '20%'
 	}
-});
+	
+	var date = new Date();
+	var week = date.getDay();//表明今天是周几。0-6表示周日到周六
+	var dateTime = date.getTime();//当前时间的时间戳，单位秒。		
+	
+ 	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
+	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
+	var endDate = timeToData(endTime);
+	var startDate = timeToData(startTime);
+ 	//表单默认选择上周一到上周日的超速信息。
+ 	$("input[name='endDate']")[0].value = endDate;
+ 	$("input[name='startDate']")[0].value = startDate;
+ 	var parameter = new Object();
+ 	parameter.endDate = $("input[name='endDate']")[0].value;
+ 	parameter.startDate = $("input[name='startDate']")[0].value;
+ 	jsDoQuery(parameter, true);
+ 	//搜索线路
+	$.get('/basic/lineCode2Name',function(result){
+		var data=[];
+		data.push({id: " ", text: "全部线路"});
+		for(var code in result){
+			data.push({id: code, text: result[code]});
+		}
+		initPinYinSelect2('#line',data,'');
+	});
+	
+	//时间戳转换为年月日
+	function timeToData(time){
+		var date = new Date(time);
+		var year = date.getFullYear();
+		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
+ 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
+		return year+"-"+Month+"-"+Day;
+	}
+	
+	//重置
+	$('tr.filter .filter-cancel').on('click', function(){
+		$('tr.filter input, select').val('').change();
+		jsDoQuery(null, true);
+	});
+	
+	//提交
+	$('tr.filter .filter-submit').on('click', function(){
+		var cells = $('tr.filter')[0].cells
+			,params = {}
+			,name;
+		$.each(cells, function(i, cell){
+			var items = $('input,select', cell);
+			for(var j = 0, item; item = items[j++];){
+				name = $(item).attr('name');
+				if(name){
+					params[name] = $(item).val();
+				}
+			}
+		});
+		page = 0;
+		jsDoQuery(params, true);
+	});
+	
+	/*
+	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
+	*/
+ 	function jsDoQuery(p, pagination){
+		var params = {};
+		if(p)
+			params = p;
+		//更新时间排序
+		params['order'] = 'lastLoginDate';
+		params['page'] = page;
+		var i = layer.load(2);
+		$get('/speeding/pagequery' ,params, function(data){
+			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
+			$('#datatable_speeding tbody').html(bodyHtm)
+					.find('.icheck').iCheck(icheckOptions)
+					.on('ifChanged', iCheckChange);
+			if(pagination && data.dataList.length > 0){
+				//重新分页
+				initPagination = true;
+				showPagination(data);
+			}
+			layer.close(i);
+  			$(".lookTrajectory").click(function(){
+  				var vehicle = $(this).data('vehicle');
+  				var startDate = $(this).data('startdate');
+  				var endDate = $(this).data('enddate');
+  				var lon = $(this).data('lon');
+  				var lat = $(this).data('lat');
+  				var endLon = $(this).data('endlon');
+  				var endLat = $(this).data('endlat');
+  				var lineid = $(this).data('lineid');
+  				var upDown = $(this).data('updown');
+  				var storage = window.localStorage;
+  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
+ 				$.get('/pages/excep/speedingMap.html?',function (result) {
+			    	layer.open({
+						type: 1,
+						title:'<i class="uk-icon-play-circle"></i>轨迹回放',
+						shadeClose: true,
+						shade: true,
+						scrollbar: false,
+						maxmin: false, //开启最大化最小化按钮
+						area: ['100%', '100%'],
+					    content:result,//内容
+					});
+			    });
+			}) 
+		});
+	}
+	
+	function iCheckChange(){
+		var tr = $(this).parents('tr');
+		if(this.checked)
+			tr.addClass('row-active');
+		else
+			tr.removeClass('row-active');
+		
+		if($('#datatable_resource input.icheck:checked').length == 1)
+			$('#removeButton').removeAttr('disabled');
+		else
+			$('#removeButton').attr('disabled', 'disabled');
+	}
+	
+	function showPagination(data){
+		//分页
+		$('#pagination').jqPaginator({
+		    totalPages: data.totalPage,//总页数
+		    visiblePages: 6,// 中间显示页数
+		    currentPage: page + 1,
+		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
+            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
+            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
+            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
+            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
+		    onPageChange: function (num, type) {
+		    	if(initPagination){
+		    		initPagination = false;
+		    		return;
+		    	}	
+		    	var cells = $('tr.filter')[0].cells
+				,params = {}
+				,name;
+			$.each(cells, function(i, cell){
+				var items = $('input,select', cell);
+				for(var j = 0, item; item = items[j++];){
+					name = $(item).attr('name');
+					if(name){
+						params[name] = $(item).val();
+					}
+				}
+			});
+			page = num - 1;
+		   	jsDoQuery(params, false);
+		    }
+		});
+	}
+	
+	//删除
+	$('#removeButton').on('click', function(){
+		if($(this).attr('disabled'))
+			return;
+		
+		var id = $('#datatable_resource input.icheck:checked').data('id');
+		
+		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
+			$('tr.filter .filter-submit').click();
+		});
+	});
  
-//重置
-$('tr.filter .filter-cancel').on('click', function(){
-	$('tr.filter input, select').val('').change();
-	Echart();
+$("#line").on("change",initXl);
+function initXl(){
+$('#nbbm').select2({
+    placeholder: '搜索车辆...',
+    ajax: {
+        url: '/report/carList',
+        dataType: 'json',
+        delay: 150,
+        data: function (params) {
+        	   return {nbbm: params.term,
+           	    gsbm:"",
+           	    fgsbm:"",
+           	    xlbm:$('#line').val()}; 	
+        },
+        processResults: function (data) {
+            return {
+                results: data
+            };
+        },
+        cache: true
+    },
+    templateResult: function (repo) {
+        if (repo.loading) return repo.text;
+        var h = '<span>' + repo.text + '</span>';
+        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
+        return h;
+    },
+    escapeMarkup: function (markup) {
+        return markup;
+    },
+    minimumInputLength: 1,
+    templateSelection: function (repo) {
+        return repo.text;
+    },
+    language: {
+        noResults: function () {
+            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
+        },
+        inputTooShort: function (e) {
+            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
+        },
+        searching: function () {
+            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
+        }
+    }
 });
-$("#date").datetimepicker({
-	format : 'YYYY-MM-DD',
-	locale : 'zh-cn'
-});
-var myDate = new Date();
-var year=myDate.getFullYear();
-var month=myDate.getMonth()+1;
-var day=myDate.getDate(); 
-if((month+"").length<2){
-	$("#date").val(year+"-0"+month+"-"+day);
-}else{
-	$("#date").val(year+"-"+month+"-"+day);
-
 }
-})
-</script>
  
  
+//改变状态
+function changeEnabled(id,enabled){
+	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
+		jsDoQuery(null, true);
+	})
+}
+});
+</script>
 \ No newline at end of file
@@ -141,6 +141,8 @@
 {{/if}}
 </script>
  
+<script type="text/javascript" src="http://api.map.baidu.com/api?v=2.0&ak=IGGrr4UjwIYzatoCRFKEL8sT"></script>
+
 <script>
 $(function(){
 	var page = 0, initPagination;
-<div class="page-head">
-	<div class="page-title">
-		<h1>超速异常</h1>
-	</div>
-</div>
-
-<ul class="page-breadcrumb breadcrumb">
-	<li><a href="/pages/home.html" data-pjax>主页</a> <i class="fa fa-circle"></i></li>
-	<li><span class="active">异常查看</span> <i class="fa fa-circle"></i></li>
-	<li><span class="active">超速异常</span></li>
-</ul>
-
-<div class="row">
-	<div class="col-md-12">
-		<!-- Begin: life time stats -->
-		<div class="portlet light portlet-fit portlet-datatable bordered">
-			<div class="portlet-title">
-				<div class="caption">
-					 <i class="fa fa-times-circle"></i> <span
-						class="caption-subject font-dark sbold uppercase">超速异常数据表</span>
-				</div>
-				<div class="actions">
-				</div>
-			</div>
-			<div class="portlet-body">
-				<div class="table-container" style="margin-top: 10px">
-					<table
-						class="table table-striped table-bordered table-hover table-checkable"
-						id="datatable_speeding">
-						<thead>
-							<tr role="row" class="heading">
-								<th width="3%">#</th>
-								<th width="4%">线路</th>
-								<th width="6%">车辆自编号</th>
-								<th width="8%">上下行</th>
-								<th width="10%">开始时间</th>
-								<th width="10%">结束时间</th>
-								<th width="8%">持续时间</th>
-								<th width="8%">查看轨迹</th>
-								<th width="6%">操作</th>
-							</tr>
-							<tr role="row" class="filter">
-								<td></td>
-								<td>
-										<select class="form-control" name="line" id="line" style="width: 100px;"></select>
-								</td>
-								<td>
-										<select class="form-control" name="nbbm" id="nbbm" style="width: 100px;"></select>
-								</td>
-								<!-- <td>
-									
-								</td>
-								<td>
-								</td> -->
-								<td>
-									<select class="form-control form-filter " name="updown" style="width: 90px;">
-                                         <option value="">请选择...</option>
-                                         <option value="0">上行</option>
-                                         <option value="1">下行</option>
-                                         <option value="-1">无效</option>
-                                     </select>
-								</td> 
-								<td> 
-									<input class="form-control" type="date" name="startDate" />
-								</td>
-								<td>
-									<input class="form-control" type="date" name="endDate" />
-								</td>
-								<td>
-									>=<input class="form-control" type="text" name="times" style="width:50px;display:inline!important"
-									  onkeyup="(this.v=function(){this.value=this.value.replace(/[^0-9-]+/,'');}).call(this)" onblur="this.v();"/> 
-								</td>
-								<td>
-								</td>
-								<td>
-									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
-                                                                <i class="fa fa-search"></i> 搜索</button>
-                                                                
-									<button class="btn btn-sm red btn-outline filter-cancel">
-                                                            <i class="fa fa-times"></i> 重置</button>
-								</td>
-							</tr>
-						</thead>
-						<tbody></tbody>
-					</table>
-					<div style="text-align: right;">
-						<ul id="pagination" class="pagination"></ul>
-					</div>
-				</div>
-			</div>
-		</div>
-	</div>
-</div>
-
-<script id="speeding_list_temp" type="text/html">
-{{each list as obj i}}
-<tr>
-	<td style="vertical-align: middle;">
-		<input type="checkbox" class="group-checkable icheck" data-id="{{obj.id}}">
-	</td>
-	<td>
-		{{obj.lineName}}
-	</td>
-	<td>
-		{{obj.vehicle}}
-	</td>
-	<td>
-		{{if obj.upDown==0}}
-			上行
-		{{else if obj.upDown==1}}
-			下行 
-		{{else}}
-			无效
-		{{/if}}
-	</td>	
-	<td>
-		{{obj.timestampDate}}
-	</td>
-	<td>
-		{{obj.endtimestampDate}}
-	</td>
-	<td>
-		{{(obj.endtimestamp-obj.timestamp)/1000}}秒
-	</td>
-	<td>
-		<a class="btn default blue-stripe btn-sm lookTrajectory" data-vehicle ="{{obj.vehicle}}"
-			data-startdate="{{obj.timestampDate}}" data-enddate="{{obj.endtimestampDate}}"
-			data-lon="{{obj.lon}}"  data-lat="{{obj.lat}}" data-endlon="{{obj.endlon}}"  
-            data-endlat="{{obj.endlat}}" data-lineid="{{obj.lineId}}" data-updown="{{obj.upDown}}">
-			查看轨迹										
-		</a>
-	</td>
-	<td>
-		
-	</td>
-</tr>
-{{/each}}
-{{if list.length == 0}}
-<tr>
-	<td colspan=8><h6 class="muted">没有找到相关数据</h6></td>
-</tr>
-{{/if}}
-</script>
-
-<script>
-$(function(){
-	var page = 0, initPagination;
-	var icheckOptions = {
-	    checkboxClass: 'icheckbox_flat-blue',
-	    increaseArea: '20%'
-	}
-	
-	var date = new Date();
-	var week = date.getDay();//表明今天是周几。0-6表示周日到周六
-	var dateTime = date.getTime();//当前时间的时间戳，单位秒。		
-	
- 	var endTime = dateTime-week*24*3600*1000;//上周末、格式为时间戳。
-	var startTime = endTime-6*24*3600*1000;//上周一、格式为时间戳。
-	var endDate = timeToData(endTime);
-	var startDate = timeToData(startTime);
- 	//表单默认选择上周一到上周日的超速信息。
- 	$("input[name='endDate']")[0].value = endDate;
- 	$("input[name='startDate']")[0].value = startDate;
- 	var parameter = new Object();
- 	parameter.endDate = $("input[name='endDate']")[0].value;
- 	parameter.startDate = $("input[name='startDate']")[0].value;
- 	jsDoQuery(parameter, true);
- 	//搜索线路
-	$.get('/basic/lineCode2Name',function(result){
-		var data=[];
-		data.push({id: " ", text: "全部线路"});
-		for(var code in result){
-			data.push({id: code, text: result[code]});
-		}
-		initPinYinSelect2('#line',data,'');
-	});
-	
-	//时间戳转换为年月日
-	function timeToData(time){
-		var date = new Date(time);
-		var year = date.getFullYear();
-		var Month = date.getMonth()+1>10?date.getMonth()+1:"0"+(date.getMonth()+1); 
- 		var Day = date.getDate()>9?date.getDate():"0"+date.getDate();
-		return year+"-"+Month+"-"+Day;
-	}
-	
-	//重置
-	$('tr.filter .filter-cancel').on('click', function(){
-		$('tr.filter input, select').val('').change();
-		jsDoQuery(null, true);
-	});
-	
-	//提交
-	$('tr.filter .filter-submit').on('click', function(){
-		var cells = $('tr.filter')[0].cells
-			,params = {}
-			,name;
-		$.each(cells, function(i, cell){
-			var items = $('input,select', cell);
-			for(var j = 0, item; item = items[j++];){
-				name = $(item).attr('name');
-				if(name){
-					params[name] = $(item).val();
-				}
-			}
-		});
-		page = 0;
-		jsDoQuery(params, true);
-	});
-	
-	/*
-	* 获取数据 p: 要提交的参数， pagination: 是否重新分页
-	*/
- 	function jsDoQuery(p, pagination){
-		var params = {};
-		if(p)
-			params = p;
-		//更新时间排序
-		params['order'] = 'lastLoginDate';
-		params['page'] = page;
-		var i = layer.load(2);
-		$get('/speeding/pagequery' ,params, function(data){
-			var bodyHtm = template('speeding_list_temp', {list: data.dataList});
-			$('#datatable_speeding tbody').html(bodyHtm)
-					.find('.icheck').iCheck(icheckOptions)
-					.on('ifChanged', iCheckChange);
-			if(pagination && data.dataList.length > 0){
-				//重新分页
-				initPagination = true;
-				showPagination(data);
-			}
-			layer.close(i);
-  			$(".lookTrajectory").click(function(){
-  				var vehicle = $(this).data('vehicle');
-  				var startDate = $(this).data('startdate');
-  				var endDate = $(this).data('enddate');
-  				var lon = $(this).data('lon');
-  				var lat = $(this).data('lat');
-  				var endLon = $(this).data('endlon');
-  				var endLat = $(this).data('endlat');
-  				var lineid = $(this).data('lineid');
-  				var upDown = $(this).data('updown');
-  				var storage = window.localStorage;
-  				storage.setItem("zbhAndDate",vehicle+","+startDate+","+endDate+","+lon+","+lat+","+endLon+","+endLat+","+lineid+","+upDown);
- 				$.get('/pages/excep/speedingMap.html?',function (result) {
-			    	layer.open({
-						type: 1,
-						title:'<i class="uk-icon-play-circle"></i>轨迹回放',
-						shadeClose: true,
-						shade: true,
-						scrollbar: false,
-						maxmin: false, //开启最大化最小化按钮
-						area: ['100%', '100%'],
-					    content:result,//内容
-					});
-			    });
-			}) 
-		});
-	}
-	
-	function iCheckChange(){
-		var tr = $(this).parents('tr');
-		if(this.checked)
-			tr.addClass('row-active');
-		else
-			tr.removeClass('row-active');
-		
-		if($('#datatable_resource input.icheck:checked').length == 1)
-			$('#removeButton').removeAttr('disabled');
-		else
-			$('#removeButton').attr('disabled', 'disabled');
-	}
-	
-	function showPagination(data){
-		//分页
-		$('#pagination').jqPaginator({
-		    totalPages: data.totalPage,//总页数
-		    visiblePages: 6,// 中间显示页数
-		    currentPage: page + 1,
-		    first: '<li class="first"><a href="javascript:void(0);">首页<\/a><\/li>',
-            prev: '<li class="prev"><a href="javascript:void(0);">上一页<\/a><\/li>',
-            next: '<li class="next"><a href="javascript:void(0);">下一页<\/a><\/li>',
-            last: '<li class="last"><a href="javascript:void(0);">尾页<\/a><\/li>',
-            page: '<li class="page"><a href="javascript:void(0);">{{page}}<\/a><\/li>',
-		    onPageChange: function (num, type) {
-		    	if(initPagination){
-		    		initPagination = false;
-		    		return;
-		    	}	
-		    	var cells = $('tr.filter')[0].cells
-				,params = {}
-				,name;
-			$.each(cells, function(i, cell){
-				var items = $('input,select', cell);
-				for(var j = 0, item; item = items[j++];){
-					name = $(item).attr('name');
-					if(name){
-						params[name] = $(item).val();
-					}
-				}
-			});
-			page = num - 1;
-		   	jsDoQuery(params, false);
-		    }
-		});
-	}
-	
-	//删除
-	$('#removeButton').on('click', function(){
-		if($(this).attr('disabled'))
-			return;
-		
-		var id = $('#datatable_resource input.icheck:checked').data('id');
-		
-		removeConfirm('确定要删除选中的数据？', '/resource/' + id ,function(){
-			$('tr.filter .filter-submit').click();
-		});
-	});
-
-$("#line").on("change",initXl);
-function initXl(){
-$('#nbbm').select2({
-    placeholder: '搜索车辆...',
-    ajax: {
-        url: '/report/carList',
-        dataType: 'json',
-        delay: 150,
-        data: function (params) {
-        	   return {nbbm: params.term,
-           	    gsbm:"",
-           	    fgsbm:"",
-           	    xlbm:$('#line').val()}; 	
-        },
-        processResults: function (data) {
-            return {
-                results: data
-            };
-        },
-        cache: true
-    },
-    templateResult: function (repo) {
-        if (repo.loading) return repo.text;
-        var h = '<span>' + repo.text + '</span>';
-        h += (repo.lineName ? '&nbsp;<span class="select2-desc">' + repo.lineName + '</span>' : '');
-        return h;
-    },
-    escapeMarkup: function (markup) {
-        return markup;
-    },
-    minimumInputLength: 1,
-    templateSelection: function (repo) {
-        return repo.text;
-    },
-    language: {
-        noResults: function () {
-            return '<span style="color:red;font-size: 12px;">没有搜索到车辆！</span>';
-        },
-        inputTooShort: function (e) {
-            return '<span style="color:gray;font-size: 12px;"><i class="fa fa-search"></i> 输入自编号搜索车辆</span>';
-        },
-        searching: function () {
-            return '<span style="color:gray;font-size: 12px;"> 正在搜索车辆...</span>';
-        }
-    }
-});
-}
-
-
-//改变状态
-function changeEnabled(id,enabled){
-	$get('/user/changeEnabled',{id:id,enabled:enabled},function(result){
-		jsDoQuery(null, true);
-	})
-}
-});
-</script>
 \ No newline at end of file
@@ -16,27 +16,22 @@
 	 .table > tbody + tbody {
 	   border-top: 1px solid; }
  
-	  #forms > thead > tr> td >span{
  
-	  width: 5px; 
-word-wrap: break-word; 
-/* letter-spacing: 20px;  */
-	  }
  
-	   #forms   tr> td >label{
+	   #ddrbBody   tr> td >span{
 	     word-break: keep-all;white-space:nowrap; 
 	   }
 </style>
  
-<div class="page-head">
+<div class="page-head" >
 	<div class="page-title">
 		<h1>调度日报</h1>
 	</div>
 </div>
  
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
+<!-- <div class="row" > -->
+	<div class=" row col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div    class="" > -->
 			<div class="portlet-title">
 				<form class="form-inline" action="">
 				    <div style="display: inline-block; margin-left: 33px;" id="gsdmDiv_ddrb">
@@ -53,7 +48,7 @@ word-wrap: break-word;
                         <select class="form-control" name="line" id="line" style="width: 180px;"></select>
                     </div>
                     <div style="display: inline-block;margin-left: 24px;">
-                        <span class="item-label" style="width: 80px;">&nbsp;时间: </span>
+                        <span class="item-label" style="width: 80px;">&nbsp;&nbsp;&nbsp;时间: </span>
                         <input class="form-control" type="text" id="date" style="width: 180px;"/>
                     </div>
                     <div class="form-group">
@@ -63,8 +58,8 @@ word-wrap: break-word;
                     </div>
 				</form>
 			</div>
-			<div class="portlet-body">
-				<div class="table-container" id="ddrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
+			<div class="portlet-body" id="ddrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container" style="margin-top: 10px;min-width: 906px">
 					<label>日期：<span id="rqxs"></span>&nbsp;&nbsp;&nbsp;&nbsp;早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<br/><label>计划+临加-少驶=<span id="jls"></span>&nbsp;&nbsp;计算机实驶:<span id="jsjss"></span></label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
@@ -73,9 +68,9 @@ word-wrap: break-word;
 								<th colspan="40"><lable id="xlmc"></lable>线路调度日报</th>
 							</tr>
 							<tr>
-								<td rowspan="3"><span >路线名</span></td>
-								<td colspan="16"><c>全日</c>营运里程（公里）</td>
-								<td colspan="15"><c>全日</c>营运班次</td>
+								<td rowspan="3"><span>路线</span></td>
+								<td colspan="16">全日营运里程（公里）</td>
+								<td colspan="15">全日营运班次</td>
 								<td colspan="9">大间隔情况</td>
 							</tr>
 							<tr>
@@ -95,33 +90,33 @@ word-wrap: break-word;
 								<td colspan="5" rowspan="2">原因</td>
 							</tr>
 							<tr>
-								<td><span >路阻</span></td>
+								<td><span>路阻</span></td>
 								<td><span>吊慢</span></td>
-								<td><span >故障</span></td>
-								<td><span >纠纷</span></td>
-								<td><span >肇事</span></td>
+								<td><span>故障</span></td>
+								<td><span>纠纷</span></td>
+								<td><span>肇事</span></td>
 								<td><span>缺人</span></td>
 								<td><span>缺车</span></td>
-								<td><span >客稀</span></td>
+								<td><span>客稀</span></td>
 								<td><span>气候</span></td>
 								<td><span>援外</span></td>
 								<td><span>其他</span></td>
-								<td><span ><c>全日</c></span></td>
-								<td><span >早高峰</span></td>
+								<td><span>全日</span></td>
+								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
-								<td><span><c>全日</c></span></td>
+								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
-								<td><span><c>全日</c></span></td>
+								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
-								<td><span><c>全日</c></span></td>
+								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
-								<td><span><c>全日</c></span></td>
+								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
-								<td><span><c>全日</c></span></td>
+								<td><span>全日</span></td>
 								<td><span>早高峰</span></td>
 								<td><span>晚高峰</span></td>
 							</tr>
@@ -133,6 +128,7 @@ word-wrap: break-word;
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr>
+						</table>
 						<!-- <tr>
 							<td colspan="40">合计</td>
 						</tr>
@@ -181,6 +177,7 @@ word-wrap: break-word;
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr> -->
+						<table class="table table-bordered table-hover table-checkable" id="forms_1">
 						<tr>
 							<td colspan="2"><label>路牌</label></td>
 							<td colspan="2"><label>车号</label></td>
@@ -219,6 +216,8 @@ word-wrap: break-word;
 						<tr>
 							<td colspan="40">&nbsp;</td>
 						</tr>
+						</table>
+						<table class="table table-bordered table-hover table-checkable" id="forms_2">
 						<tr>
 							<td rowspan="2">路牌</td>
 							<td colspan="2" rowspan="2" style="word-break: keep-all;white-space:nowrap;">起点站</td>
@@ -270,8 +269,8 @@ word-wrap: break-word;
 					</table>
 				</div>
 			</div>
-		</div>
-	</div>
+<!-- 		</div> -->
+<!-- 	</div> -->
 </div>
  
 <script>
@@ -294,7 +293,13 @@ word-wrap: break-word;
 			day = "0" + day;
 		$("#date").val(year + "-" + month + "-" + day);
  
-		$("#ddrbBody").height($(window).height()-100);
+// 		$("#ddrbBody").height($(window).height()-200);
+		
+		var divFrom1 = window.document.getElementById('forms');
+		var divFrom2 = window.document.getElementById('forms_1');
+		var divFrom3 = window.document.getElementById('forms_2');
+		divFrom2.style.width=divFrom1.offsetWidth+"px";
+		divFrom3.style.width=divFrom1.offsetWidth+"px";
 		/* $.get('/basic/lineCode2Name',function(result){
 			var data=[];
  
@@ -422,7 +427,7 @@ word-wrap: break-word;
 				return;
 			}
 			$("#xlmc").html(xlName);
-			$("#ddrbBody").height($(window).height()-100);
+// 			$("#ddrbBody").height($(window).height()-300);
 			$("c").html("全日");
 			$("#export").removeAttr("disabled");
 			$get('/realSchedule/statisticsDaily',{line:line,date:date,xlName:xlName,type:"query"},function(result){
@@ -433,12 +438,18 @@ word-wrap: break-word;
 			});
 			$.get('/realSchedule/queryUserInfo',{line:line,date:date,state:2,type:"query"},function(result){
 				var scheduleDaily_2 = template('scheduleDaily_2',{list:result});
-				$('#forms .scheduleDaily_2').html(scheduleDaily_2);
+				$('#forms_1 .scheduleDaily_2').html(scheduleDaily_2);
+				 divFrom1 = window.document.getElementById('forms');
+				 divFrom2 = window.document.getElementById('forms_1');
+				divFrom2.style.width=divFrom1.offsetWidth+"px";
 			});
 			$.get('/realSchedule/realScheduleList',{line:line,date:date,type:"query"},function(result){
 				getTime(result);
 				var scheduleDaily_3 = template('scheduleDaily_3',{list:result});
-				$('#forms .scheduleDaily_3').html(scheduleDaily_3);
+				$('#forms_2 .scheduleDaily_3').html(scheduleDaily_3);
+				divFrom1 = window.document.getElementById('forms');
+				divFrom3 = window.document.getElementById('forms_2');
+				divFrom3.style.width=divFrom1.offsetWidth+"px";
 			});
  
 		});
@@ -583,7 +594,7 @@ word-wrap: break-word;
 				<td>{{obj.slow0}}
  
 				</td>
-				<td colspan="2">{{obj.remarks}}</td>
+				<td colspan="2"></td>
 		{{if (i+1)%3 == 0}}
 				<td>&nbsp;</td>
 			</tr>
@@ -32,9 +32,9 @@
 	</div>
 </div>
  
-<div class="row">
-	<div class="col-md-12">
-		<div class="portlet light porttlet-fit bordered">
+<!-- <div class="row"> -->
+	<div  class="col-md-12 portlet light porttlet-fit bordered" style="height:calc(100% - 56px)">
+<!-- 		<div> -->
 			<div class="portlet-title">
 				<form class="form-inline" action="">
 				<div style="display: inline-block; " id="gsdmDiv">
@@ -64,8 +64,8 @@
                     </div>
 				</form>
 			</div>
-			<div class="portlet-body">
-				<div class="table-container"  id="tjrbBody" style="margin-top: 10px;overflow:auto;min-width: 906px">
+			<div class="portlet-body" id="tjrbBody" style="overflow:auto;height: calc(100% - 80px)">
+				<div class="table-container"   style="margin-top: 10px;min-width: 906px">
 					<label>早高峰:6:31~8:30&nbsp;&nbsp;&nbsp;&nbsp;晚高峰:16:01~18:00</label>
 					<table class="table table-bordered table-hover table-checkable" id="forms">
 						<thead>
@@ -80,7 +80,7 @@
 							</tr>
 							<tr>
 								<td rowspan="2"><label>计划总</label>
-													<label>公里</label></td>
+													<label>公里&nbsp;&nbsp;&nbsp;</label></td>
 								<td rowspan="2"><label>计划营</label><label>运公里</label></td>
 								<td rowspan="2"><label>计划空</label><label>驶公里</label></td>
 								<td rowspan="2"><label>实际</label><label>总公里</label></td>
@@ -262,7 +262,7 @@
 				layer.msg("请选择时间范围！");
 				return;
 			}
-			$("#tjrbBody").height($(window).height()-100);
+// 			$("#tjrbBody").height($(window).height()-100);
 			line = $("#line").val();
 			xlName = $("#select2-line-container").html();
 			date = $("#date").val();
@@ -297,7 +297,7 @@
 			}
  
 		});
-		$("#tjrbBody").height($(window).height()-100);
+// 		$("#tjrbBody").height($(window).height()-100);
 		$("#export").on("click",function(){
 			 var params = {};
 			 params['gsdm'] = gsdm;
@@ -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}}