异常报表修改

sgz
1 parent 35a6161f
Showing 9 changed files with 428 additions and 153 deletions
src/main/java/com/bsth/entity/excep/Offline.java
src/main/java/com/bsth/entity/excep/Outbound.java
src/main/java/com/bsth/entity/excep/Speeding.java
src/main/java/com/bsth/service/excep/impl/OfflineServiceImpl.java
src/main/java/com/bsth/service/excep/impl/OutboundServiceImpl.java
src/main/java/com/bsth/service/excep/impl/SpeedingServiceImpl.java
src/main/resources/static/pages/excep/boundList.html
src/main/resources/static/pages/excep/offlineList.html
src/main/resources/static/pages/excep/speedingList.html
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 掉线
@@ -65,7 +66,12 @@ public class Offline {
 	 */
 	private Date createDate;
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
 	public Integer getId() {
 		return id;
 	}
@@ -146,5 +152,29 @@ public class Offline {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
+	
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 越界
@@ -72,7 +73,12 @@ public class Outbound {
 	 * 	时间
 	 */
 	private Date createDate;
-	
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
 	public Integer getId() {
 		return id;
@@ -162,5 +168,29 @@ public class Outbound {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
 }
@@ -6,6 +6,7 @@ import javax.persistence.Entity;
 import javax.persistence.GeneratedValue;
 import javax.persistence.Id;
 import javax.persistence.Table;
+import javax.persistence.Transient;
 /**
  * 超速
@@ -66,6 +67,13 @@ public class Speeding {
 	private String timestampDate;
+	@Transient
+	private String nbbm;
+	@Transient
+	private String jsy;
+	@Transient
+	private String lpname;
+	
 	/**
 	 * 	创建时间
 	 */
@@ -161,6 +169,30 @@ public class Speeding {
 		this.timestampDate = timestampDate;
 	}
+	public String getNbbm() {
+		return nbbm;
+	}
+
+	public void setNbbm(String nbbm) {
+		this.nbbm = nbbm;
+	}
+
+	public String getJsy() {
+		return jsy;
+	}
+
+	public void setJsy(String jsy) {
+		this.jsy = jsy;
+	}
+
+	public String getLpname() {
+		return lpname;
+	}
+
+	public void setLpname(String lpname) {
+		this.lpname = lpname;
+	}
+
 }
@@ -12,10 +12,15 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Offline;
+import com.bsth.entity.oil.Ylb;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.OfflineService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -27,6 +32,8 @@ import com.google.gson.Gson;
 @Service
 public class OfflineServiceImpl implements OfflineService {
+	@Autowired
+	JdbcTemplate jdbcTemplate;
  //	@Override
 	static List<Offline> findAll(Map<String, Object> map) {
 		// TODO Auto-generated method stub
@@ -53,7 +60,9 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(nbbm!=null){
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm+"%'";
 		}
 		if(updown!=null){
@@ -61,7 +70,7 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -112,7 +121,7 @@ public class OfflineServiceImpl implements OfflineService {
 			offline.setTimestamp(Long.valueOf(rs.getObject("timestamp").toString()));
 			offline.setTimestampDate(sdf.format(new Date(offline.getTimestamp())));
 			offline.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			offline.setVehicle(rs.getObject("vehicle").toString());
+			offline.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			list.add(offline);
 		}
 		return list;
@@ -135,7 +144,9 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(nbbm!=null){
-			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
+			sql +=" and vehicle like '%"+nbbm+"%'";
 		}
 		if(updown!=null){
@@ -143,7 +154,7 @@ public class OfflineServiceImpl implements OfflineService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -177,8 +188,41 @@ public class OfflineServiceImpl implements OfflineService {
 		PageHelper pageHelper = new PageHelper(totalData, map);
 //		List<T> list = this.baseDao.queryByObject(pageHelper.getMap());
 		List<Offline> list=findAll(pageHelper.getMap());
+		for (int i = 0; i < list.size(); i++) {
+			String nbbm2=list.get(i).getVehicle() ;
+			Long d1=list.get(i).getTimestamp();
+			Date datess = new Date(d1);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Offline> pageObject = pageHelper.getPageObject();
-		pageObject.setDataList(list);
+//		for (int i = 0; i < list.size(); i++) {
+//			if(list.get(i).getLpname()!=null){
+				pageObject.setDataList(list);
+//			}
+//		}
+	
 		return pageObject;
 	}
 	public static void main(String[] args) {
@@ -12,10 +12,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Outbound;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.OutboundService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -25,8 +29,9 @@ import com.github.abel533.echarts.Option;
 import com.google.gson.Gson;
 @Service
 public class OutboundServiceImpl implements OutboundService{
-	
-	static List<Outbound> findAll(Map<String, Object> map) {
+	@Autowired
+	JdbcTemplate jdbcTemplate;
+	static  List<Outbound> findAll(Map<String, Object> map) {
 		Connection conn = null;
 		PreparedStatement ps = null;
 		ResultSet rs = null;
@@ -37,12 +42,13 @@ public class OutboundServiceImpl implements OutboundService{
 		Object nbbm=map.get("nbbm");
 		Object updown=map.get("updown");
 		Object date=map.get("date");
-		
 		if(line!=null){
 				 sql +=" and line like'%"+line.toString()+"%'";
 		}
 		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -51,7 +57,7 @@ public class OutboundServiceImpl implements OutboundService{
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -98,7 +104,7 @@ public class OutboundServiceImpl implements OutboundService{
 			outbound.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			outbound.setTimestampDate(sdf.format(new Date(outbound.getTimestamp())));
 			outbound.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			outbound.setVehicle(rs.getObject("vehicle").toString());
+			outbound.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			outbound.setLocation(rs.getObject("location")==null?"":rs.getObject("location").toString());
 			list.add(outbound);
 		}
@@ -119,6 +125,8 @@ public class OutboundServiceImpl implements OutboundService{
 		}
 		if(nbbm!=null){
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -160,7 +168,34 @@ public class OutboundServiceImpl implements OutboundService{
 		PageHelper pageHelper = new PageHelper(totalData, map);
 		List<Outbound> list=findAll(pageHelper.getMap());
-		
+		for (int i = 0; i < list.size(); i++) {
+			String nbbm2=list.get(i).getVehicle() ;
+			Long d1=list.get(i).getTimestamp();
+			Date datess = new Date(d1);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Outbound> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
@@ -12,10 +12,14 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import org.springframework.jdbc.core.JdbcTemplate;
+import org.springframework.jdbc.core.RowMapper;
 import org.springframework.stereotype.Service;
+import org.springframework.beans.factory.annotation.Autowired;
 import com.bsth.data.BasicData;
 import com.bsth.entity.excep.Speeding;
+import com.bsth.entity.realcontrol.ScheduleRealInfo;
 import com.bsth.service.excep.SpeedingService;
 import com.bsth.util.EchartConver;
 import com.bsth.util.PageHelper;
@@ -27,7 +31,8 @@ import com.google.gson.Gson;
 @Service
 public class SpeedingServiceImpl implements SpeedingService {
-
+	@Autowired
+	JdbcTemplate jdbcTemplate;
 	static List<Speeding> findAll(Map<String, Object> map) {
 		Connection conn = null;
 		PreparedStatement ps = null;
@@ -45,6 +50,8 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(nbbm!=null){
+			 nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			 if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
@@ -53,7 +60,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(date!=null){
 			if (date.toString().length()>0) {
-				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:MM:SS");
+				SimpleDateFormat sdf=new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
 				try {
 					Long t1=sdf.parse(date.toString()+" 00:00:00").getTime();
 					Long t2=sdf.parse(date.toString()+" 23:59:59").getTime();
@@ -102,7 +109,7 @@ public class SpeedingServiceImpl implements SpeedingService {
 			speeding.setTimestamp((Long.valueOf(rs.getObject("timestamp").toString())));
 			speeding.setTimestampDate(sdf.format(new Date(speeding.getTimestamp())));
 			speeding.setUpDown(Integer.valueOf(rs.getObject("up_down").toString()));
-			speeding.setVehicle(rs.getObject("vehicle").toString());
+			speeding.setVehicle(BasicData.deviceId2NbbmMap.get(rs.getObject("vehicle").toString()));
 			list.add(speeding);
 		}
 		return list;
@@ -122,9 +129,10 @@ public class SpeedingServiceImpl implements SpeedingService {
 		}
 		if(nbbm!=null){
+			nbbm=BasicData.deviceId2NbbmMap.inverse().get(nbbm);
+			if(nbbm!=null)
 			sql +=" and vehicle like '%"+nbbm.toString()+"%'";
 		}
-		
 		if(updown!=null){
 			sql +="and up_down like '%"+updown.toString()+"%'";
 		}
@@ -163,7 +171,34 @@ public class SpeedingServiceImpl implements SpeedingService {
 		PageHelper pageHelper = new PageHelper(totalData, map);
 		List<Speeding> list=findAll(pageHelper.getMap());
-		
+		for (int i = 0; i < list.size(); i++) {
+			String nbbm2=list.get(i).getVehicle() ;
+			Long d1=list.get(i).getTimestamp();
+			Date datess = new Date(d1);
+			String dates=new SimpleDateFormat("yyyy-MM-dd").format(datess);
+			String sk=new SimpleDateFormat("HH:mm").format(datess);
+			String sqlPbb="select * from bsth_c_s_sp_info_real where cl_zbh='"+nbbm2+"'  and"
+					+ "   real_exec_date='"+dates+"' ";
+//							+ "and fcsj_actual > '"+sk+"' ";
+//							+ "and '"+sk+"' <dfsj";
+			List<ScheduleRealInfo> pbb =jdbcTemplate.query(sqlPbb,  
+			        new RowMapper<ScheduleRealInfo>(){  
+			            @Override  
+			            public ScheduleRealInfo  mapRow(ResultSet rs, int rowNum) throws SQLException {  
+			            	ScheduleRealInfo s  = new ScheduleRealInfo(); 
+			            	s.setjGh(rs.getString("j_gh"));
+			            	s.setjName(rs.getString("j_name"));
+			            	s.setLpName(rs.getString("lp_name"));
+			                return s;  
+			            }  
+					});  
+			if(pbb.size()>0){
+				list.get(i).setJsy(pbb.get(0).getjGh()+"/"+pbb.get(0).getjName());
+				list.get(i).setLpname(pbb.get(0).getLpName());
+				
+			}
+			
+		}
 		PageObject<Speeding> pageObject = pageHelper.getPageObject();
 		pageObject.setDataList(list);
 		return pageObject;
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -66,10 +66,11 @@
 								<td></td>
 								<td>
 <!-- 									<input type="text" class="form-control form-filter input-sm" name="userName_like"> -->
-										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm">
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm"> -->
+								<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
 								</td>
 								<td>
 								</td>
@@ -119,10 +120,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+		{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -271,45 +272,67 @@ $(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>';
-		   }
-		}
+ $.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,'');
+
 	});
-});
+
+	$("#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){
 	debugger
@@ -317,4 +340,5 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+});
 </script>
 \ No newline at end of file
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -66,10 +66,12 @@
 								<td></td>
 								<td>
 <!-- 									<input type="text" class="form-control form-filter input-sm" name="userName_like"> -->
-										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
+										<select class="form-control" name="line" id="line" style="width: 150px;"></select>
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm">
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm" id="nbbm"> -->
+									
+									<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
 								</td>
 								<td>
 								</td>
@@ -119,10 +121,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+		{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -275,43 +277,64 @@ $(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>';
-		   }
-		}
+	
+	$.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,'');
+
 	});
+
+	$("#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>';
+	        }
+	    }
+	});
+}
+
 });
 </script>
 \ No newline at end of file
@@ -55,9 +55,9 @@
 							<tr role="row" class="heading">
 								<th width="3%">#</th>
 								<th width="15%">线路</th>
-								<th width="13%">内部编码</th>
-								<th width="100">经度</th>
-								<th width="11%">纬度</th>
+								<th width="13%">车辆自编号</th>
+								<th width="100">工号/名字</th>
+								<th width="11%">路牌名</th>
 								<th width="10%">上下行</th>
 								<th width="18%">时间</th>
 								<th width="18%">操作</th>
@@ -69,10 +69,11 @@
 										<select class="form-control" name="line" id="line" style="width: 180px;"></select>
 								</td>
 								<td>
-									<input type="text" class="form-control form-filter input-sm" name="nbbm">
+<!-- 									<input type="text" class="form-control form-filter input-sm" name="nbbm"> -->
+								<select class="form-control" name="nbbm" id="nbbm" style="width: 150px;"></select>
 								</td>
 								<td>
-									<input class="form-control" type="date" name="date" />
+									
 								</td>
 								<td></td>
 								<td>
@@ -83,7 +84,7 @@
                                          <option value="-1">无效</option>
                                      </select>
 								</td>
-								<td></td>
+								<td> <input class="form-control" type="date" name="date" /></td>
 								<td>
 									<button class="btn btn-sm green btn-outline filter-submit margin-bottom" >
                                                                 <i class="fa fa-search"></i> 搜索</button>
@@ -118,10 +119,10 @@
 	</td>
 	<td>
-		{{obj.lon}}
+	{{obj.jsy}}
 	</td>
 	<td>
-		{{obj.lat}}
+		{{obj.lpname}}
 	</td>
 	<td>
 		{{if obj.upDown==0}}
@@ -270,45 +271,65 @@ $(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>';
-		   }
+	$.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,'');
+
+});
+
+$("#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){
 	debugger
@@ -316,4 +337,5 @@ function changeEnabled(id,enabled){
 		jsDoQuery(null, true);
 	})
 }
+});
 </script>
 \ No newline at end of file