Merge branch 'pudong' of 192.168.168.201:panzhaov5/bsth_control into pudong

游瑞烽
2 parents e86d48a5 feb0ec93
Showing 22 changed files with 678 additions and 151 deletions
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/report/impl/SheetServiceImpl.java
src/main/java/com/bsth/service/schedule/impl/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/base/timesmodel/tepms/fcjx_temp.html
src/main/resources/static/pages/forms/mould/firstAndLastBus_delay.xls
src/main/resources/static/pages/forms/mould/firstAndLastBus_map.xls
src/main/resources/static/pages/forms/mould/onTime.xls
src/main/resources/static/pages/forms/mould/onTime1.xls
src/main/resources/static/pages/forms/mould/onTime2.xls
src/main/resources/static/pages/forms/mould/sheetList.xls
src/main/resources/static/pages/forms/mould/sheetList1.xls
src/main/resources/static/pages/forms/mould/sheetList2.xls
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/firstAndLastBus_delay.html
src/main/resources/static/pages/forms/statement/firstAndLastBus_sum.html
src/main/resources/static/pages/forms/statement/lineTimeAnaly.html
src/main/resources/static/pages/forms/statement/scheduleAnaly.html
src/main/resources/static/pages/forms/statement/timeAndSpeed.html
src/main/resources/static/pages/punctual/list.html
src/main/resources/static/pages/punctual/onTime.html
@@ -215,7 +215,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
+						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
@@ -1843,7 +1844,7 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("气候") != -1){
 						qhbc++;
 //						qhlc = qhlc.add(lc);
-					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("外援") != -1){
+					}else if(schedule.getAdjustExps() != null && schedule.getAdjustExps().indexOf("援外") != -1){
 						wybc++;
 //						wylc = wylc.add(lc);
 					} else {
@@ -3003,6 +3004,27 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 				tempMap.put("zdzdl", (bcs>0?df.format((double)zdzd/bcs*100):0)+"%");
 				resList.add(tempMap);
 			}
+			
+			if(map.containsKey("type") && map.get("type").toString().equals("export")){
+				SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+						sdfSimple = new SimpleDateFormat("yyyyMMdd");
+				List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+				Map<String,Object> m = new HashMap<String, Object>();
+				ReportUtils ee = new ReportUtils();
+				try {
+					listI.add(resList.iterator());
+					m.put("date1", startDate);
+					m.put("date2", endDate);
+					String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+					ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime.xls",
+							path+"export/发车到站准点率" + sdfSimple.format(sdfMonth.parse(startDate)) +
+							(startDate.equals(endDate)?"":"-"+sdfSimple.format(sdfMonth.parse(endDate))) + ".xls");
+				} catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+				}
+			}
+			
 		} else if(map.get("flag").toString().trim().equals("1")) {
 			for(String xl : keyMap.keySet()){
 				List<List<Map<String, Object>>> list1 = keyMap.get(xl);
@@ -3031,17 +3053,61 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 					resList.add(tempMap);
 				}
 			}
+			
+			if(map.containsKey("type") && map.get("type").toString().equals("export")){
+				SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+						sdfSimple = new SimpleDateFormat("yyyyMMdd");
+				List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+				Map<String,Object> m = new HashMap<String, Object>();
+				ReportUtils ee = new ReportUtils();
+				try {
+					listI.add(resList.iterator());
+					m.put("date1", startDate);
+					m.put("date2", endDate);
+					String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+					ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime1.xls",
+							path+"export/发车到站准点率明细.xls");
+				} catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+				}
+			}
+			
 		} else if(map.get("flag").toString().trim().equals("2")) {
+			int i = 0;
 			for(String xl : keyMap.keySet()){
 				List<List<Map<String, Object>>> list1 = keyMap.get(xl);
 				if(list1.size() == 0 || list1.get(0).size() == 0)
 					continue;
 				for(List<Map<String, Object>> list2 : list1){
 					for(Map<String, Object> m : list2){
+						m.put("no", ++i);
+						if(m.containsKey("line"))
+							line = m.get("line").toString();
 						resList.add(m);
 					}
 				}
 			}
+			
+			if(map.containsKey("type") && map.get("type").toString().equals("export")){
+				SimpleDateFormat sdfMonth = new SimpleDateFormat("yyyy-MM-dd"),
+						sdfSimple = new SimpleDateFormat("yyyyMMdd");
+				List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+				Map<String,Object> m = new HashMap<String, Object>();
+				ReportUtils ee = new ReportUtils();
+				try {
+					listI.add(resList.iterator());
+					m.put("date", startDate);
+					m.put("line", line);
+					String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+					ee.excelReplace(listI, new Object[] { m }, path+"mould/onTime2.xls",
+							path+"export/发车到站准点率详细"+sdfSimple.format(sdfMonth.parse(startDate))+".xls");
+				} catch (Exception e) {
+					// TODO: handle exception
+					e.printStackTrace();
+				}
+			}
+			
 		}
 		return resList;
@@ -44,6 +44,7 @@ import com.bsth.util.BatchSaveUtils;
 import com.bsth.util.ComparableChild;
 import com.bsth.util.ComparableReal;
 import com.bsth.util.ReportRelatedUtils;
+import com.bsth.util.ReportUtils;
 import com.google.common.util.concurrent.AbstractScheduledService.Scheduler;
 @Service
@@ -611,6 +612,24 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 			}
 		}
+		
+		if(map.containsKey("type") && map.get("type").toString().equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("endDate", endDate);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(listmap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList.xls",
+						path + "export/发车准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return listmap;
 	}
@@ -738,7 +757,33 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 				// TODO Auto-generated catch block
 				e.printStackTrace();
 			}
-			
+		}
+		
+		List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+		Map<String, Object> m = new HashMap<String, Object>();
+		ReportUtils ee = new ReportUtils();
+		try {
+			List<Map<String, Object>> tempList = new ArrayList<Map<String, Object>>();
+			for(int i = 0; i < list.size(); i++){
+				Map<String, Object> temp = new HashMap<String, Object>();
+				Sheet s = list.get(i);
+				temp.put("id", i+1);
+				temp.put("date", s.getDate());
+				temp.put("line", s.getLine());
+				temp.put("zdname", s.getZdname());
+				temp.put("jhsj", s.getJhsj());
+				temp.put("sjsj", s.getSjsj());
+				temp.put("sfzd", s.getSfzd());
+				tempList.add(temp);
+			}
+			listI.add(tempList.iterator());
+			m.put("date", sheet.getDate());
+			String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+			ee.excelReplace(listI, new Object[]{m}, path + "mould/sheetList2.xls",
+					path + "export/发车准点率"+sheet.getDate().replaceAll("-", "")+".xls");
+		} catch (Exception e) {
+			// TODO: handle exception
+			e.printStackTrace();
 		}
 		return list;
@@ -800,6 +845,24 @@ public class SheetServiceImpl extends BaseServiceImpl&lt;Sheet, Integer&gt; implements
 				  listmap.add(newmap);
 			}
 		}
+
+		if(map.containsKey("type") && map.get("type").toString().equals("export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String, Object> m = new HashMap<String, Object>();
+			m.put("date", date);
+			m.put("endDate", endDate);
+			ReportUtils ee = new ReportUtils();
+			try {
+				listI.add(listmap.iterator());
+				String path = this.getClass().getResource("/").getPath() + "static/pages/forms/";
+				ee.excelReplace(listI, new Object[]{m}, path + "mould/" + "sheetList1.xls",
+						path + "export/发车准点率"+date.replaceAll("-", "")+"-"+endDate.replaceAll("-", "")+".xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		}
+		
 		return listmap;
 	}
@@ -636,8 +636,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			if(model.length() != 0){
 //				sql = "select * from bsth_c_s_ttinfo_detail where ttinfo = '"+model+"' and bc_type != 'in' and bc_type != 'out'";
-				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks'";
-			
+				sql = "select id from bsth_c_s_sp_info where tt_info = '" + model + "' and bc_type != 'in' and bc_type != 'out'" +
+						" and bc_type != 'ldks' and schedule_date >= '"+startDate+"' and schedule_date <= '"+endDate+"'";
+				
 				ttList = jdbcTemplate.query(sql,
 						new RowMapper<Long>(){
 					@Override
@@ -1208,7 +1209,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				try {
 					long qyrq = sdf.parse(m.get("qyrq").toString()).getTime();
 					if(qyrq > date2.getTime())
-						break;
+						break DO;
 				} catch (ParseException e) {
 					// TODO Auto-generated catch block
 					e.printStackTrace();
@@ -1344,7 +1345,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("date", date.substring(5));
 			tempMap.put("line", xlName);
 			List<Long> up1 = new ArrayList<Long>();
-			List<Long> up2 = new ArrayList<Long>();;
+			List<Long> up2 = new ArrayList<Long>();
 			List<Long> dn1 = new ArrayList<Long>();
 			List<Long> dn2 = new ArrayList<Long>();
 			Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
@@ -1484,7 +1485,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		try {
-			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
+			String sql = "select a.schedule_date_str, a.real_exec_date, a.xl_bm, a.xl_name, a.fcsj, a.fcsj_actual, a.zdsj, a.zdsj_actual, a.qdz_name, a.zdz_name, a.xl_dir, a.status, a.gs_name, a.fgs_name,"
 					+ " a.cc_service, a.remarks, a.adjust_exps, b.start_opt from bsth_c_s_sp_info_real a left join (select line, start_opt from bsth_c_line_config order by id desc) b on a.xl_bm = b.line"
 					+ " where schedule_date_str >= '"+startDate+"' and schedule_date_str <= '"+endDate+"'"
 					+ " and bc_type != 'in' and bc_type != 'out' and bc_type != 'ldks' and bc_type != 'region'";
@@ -1501,6 +1502,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					schedule.setScheduleDateStr(rs.getString("schedule_date_str"));
 					schedule.setRealExecDate(rs.getString("real_exec_date"));
 					schedule.setXlName(rs.getString("xl_name"));
+					schedule.setXlBm(rs.getString("xl_bm"));
 					schedule.setFcsj(rs.getString("fcsj"));
 					schedule.setFcsjActual(rs.getString("fcsj_actual"));
 					schedule.setZdsj(rs.getString("zdsj"));
@@ -1552,6 +1554,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 		}
 		Map<String, Map<String, List<ScheduleRealInfo>>> keyMap = new HashMap<String, Map<String,List<ScheduleRealInfo>>>();
+		Map<String, String> xlMap = new HashMap<String, String>();
 		String companyName = "", subCompanyName = "";
 		for(ScheduleRealInfo s : list){
@@ -1569,6 +1572,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				companyName = s.getGsName();
 			if(subCompanyName.length()==0&&s.getFgsName()!=null&&s.getFgsName().trim().length()!=0)
 				subCompanyName = s.getFgsName();
+			xlMap.put(xlName, s.getXlBm());
 		}
 		List<Map<String, Object>> mapList = new ArrayList<Map<String, Object>>();
@@ -1589,9 +1593,11 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				String date = dateMap.get(l);
 				Map<String, Object> temp = new HashMap<String, Object>();
 				temp.put("date", date.substring(5));
+				temp.put("dates", date);
 				temp.put("line", xlName);
+				temp.put("xlbm", xlMap.get(xlName));
 				List<Long> up1 = new ArrayList<Long>();
-				List<Long> up2 = new ArrayList<Long>();;
+				List<Long> up2 = new ArrayList<Long>();
 				List<Long> dn1 = new ArrayList<Long>();
 				List<Long> dn2 = new ArrayList<Long>();
 				Map<Long, ScheduleRealInfo> up1Map = new HashMap<Long, ScheduleRealInfo>();
@@ -1638,6 +1644,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("date", date.substring(5));
+						m.put("dates", date);
 						m.put("line", xlName);
 						m.put("firstOrLast", "上行首发");
 						m.put("qdz", s1.getQdzName());
@@ -1654,6 +1661,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("date", date.substring(5));
+						m.put("dates", date);
 						m.put("line", xlName);
 						m.put("firstOrLast", "上行末发");
 						m.put("qdz", s3.getQdzName());
@@ -1698,6 +1706,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("date", date.substring(5));
+						m.put("dates", date);
 						m.put("line", xlName);
 						m.put("firstOrLast", "下行首发");
 						m.put("qdz", s1.getQdzName());
@@ -1715,6 +1724,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 					} else {
 						Map<String, Object> m = new HashMap<String, Object>();
 						m.put("date", date.substring(5));
+						m.put("dates", date);
 						m.put("line", xlName);
 						m.put("firstOrLast", "下行末发");
 						m.put("qdz", s3.getQdzName());
@@ -1744,8 +1754,9 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 			tempMap.put("map", tempList);
 			tempMap.put("company", companyName);
 			tempMap.put("subCompany", subCompanyName);
-			tempMap.put("date", dates);
+			tempMap.put("xlbm", xlMap.get(xlName));
 			tempMap.put("line", xlName);
+			tempMap.put("date", dates);
 			tempMap.put("jhbc", jhbc);
 			tempMap.put("sjbc", sjbc);
 			tempMap.put("zdl", (jhbc<1?"0":nf.format((float) sjbc / jhbc *100)) + "%");
@@ -1790,6 +1801,36 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				// TODO: handle exception
 				e.printStackTrace();
 			}
+		} else if(type.equals("exportMap")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				if(resList.size() > 0)
+					listI.add(((List<Map<String, Object>>)resList.get(0).get("map")).iterator());
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_map.xls",
+						path+"export/线路首末班明细.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
+		} else if(type.equals("delay_export")){
+			List<Iterator<?>> listI = new ArrayList<Iterator<?>>();
+			Map<String,Object> m = new HashMap<String, Object>();
+			ReportUtils ee = new ReportUtils();
+			try {
+				if(resList.size() > 0)
+					listI.add(((List<Map<String, Object>>)resList.get(resList.size() - 1).get("map")).iterator());
+				listI.add(resList.iterator());
+				String path = this.getClass().getResource("/").getPath()+"static/pages/forms/";
+				ee.excelReplace(listI, new Object[] { tempMap }, path+"mould/firstAndLastBus_delay.xls",
+						path+"export/首末班误点班次.xls");
+			} catch (Exception e) {
+				// TODO: handle exception
+				e.printStackTrace();
+			}
 		}
 		return resList;
@@ -86,6 +86,95 @@
     <div class="form-group">
         <div class="col-md-6">
+            <label class="control-label col-md-5">上行进场时间　　:
+            </label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="upInTimer" value="{{map.upInTimer}}" id="upInTimer_id"
+                       placeholder="请输入上行进场时间">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">上行出场时间　　:
+            </label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="upOutTimer" value="{{map.upOutTimer}}" id="upOutTimer_id"
+                       placeholder="请输入上行出场时间">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">下行进场时间　　:
+            </label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="downInTimer" value="{{map.downInTimer}}" id="downInTimer_id"
+                       placeholder="请输入下行进场时间">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">下行出场时间　　:
+            </label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="downOutTimer" value="{{map.downOutTimer}}" id="downOutTimer_id"
+                       placeholder="请输入下行出场时间">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">早高峰上行时间　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="earlyUpTime" value="{{map.earlyUpTime}}" id="earlyUpTime_id"
+                       placeholder="请输入早高峰上行时间">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">早高峰下行时间　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="earlyDownTime" value="{{map.earlyDownTime}}" id="earlyDownTime_id"
+                       placeholder="请输入早高峰下行时间">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰上行时间　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="lateUpTime" value="{{map.lateUpTime}}" id="lateUpTime_id"
+                       placeholder="请输入晚高峰上行时间">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">晚高峰下行时间　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="lateDownTime" value="{{map.lateDownTime}}" id="lateDownTime_id"
+                       placeholder="请输入晚高峰下行时间">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">低谷上行时间　　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="troughUpTime" value="{{map.troughUpTime}}" id="troughUpTime_id"
+                       placeholder="请输入低谷上行时间">
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">低谷下行时间　　:</label>
+            <div class="col-md-5">
+                <input type="text" class="form-control" name="troughDownTime" value="{{map.troughDownTime}}" id="troughDownTime_id"
+                       placeholder="请输入低谷下行时间">
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
             <label class="control-label col-md-5">
                 <span class="required"> * </span> 线路规划类型　　:
             </label>
@@ -126,6 +215,7 @@
         </div>
     </div>
+
     <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5">工作餐午餐时间　:</label>
@@ -244,18 +334,18 @@
     <input type="hidden" name="upTravelTime" value="{{map.upTravelTime}}" id="upTravelTime_id"/>
     <input type="hidden" name="downTravelTime" value="{{map.downTravelTime}}" id="downTravelTime_id"/>
     <!-- 早高峰/晚高峰上下行行驶时间 -->
-    <input type="hidden" name="earlyUpTime" value="{{map.earlyUpTime}}" id="earlyUpTime_id" />
-    <input type="hidden" name="earlyDownTime" value="{{map.earlyDownTime}}" id="earlyDownTime_id" />
-    <input type="hidden" name="lateUpTime" value="{{map.lateUpTime}}" id="lateUpTime_id"/>
-    <input type="hidden" name="lateDownTime" value="{{map.lateDownTime}}" id="lateDownTime_id"/>
+    <!--<input type="hidden" name="earlyUpTime" value="{{map.earlyUpTime}}" id="earlyUpTime_id" />-->
+    <!--<input type="hidden" name="earlyDownTime" value="{{map.earlyDownTime}}" id="earlyDownTime_id" />-->
+    <!--<input type="hidden" name="lateUpTime" value="{{map.lateUpTime}}" id="lateUpTime_id"/>-->
+    <!--<input type="hidden" name="lateDownTime" value="{{map.lateDownTime}}" id="lateDownTime_id"/>-->
     <!-- 低谷上下行行驶时间 -->
-    <input type="hidden" name="troughUpTime" value="{{map.troughUpTime}}" id="troughUpTime_id"/>
-    <input type="hidden" name="troughDownTime" value="{{map.troughDownTime}}" id="troughDownTime_id"/>
+    <!--<input type="hidden" name="troughUpTime" value="{{map.troughUpTime}}" id="troughUpTime_id"/>-->
+    <!--<input type="hidden" name="troughDownTime" value="{{map.troughDownTime}}" id="troughDownTime_id"/>-->
     <!-- 上下行进场出场时间 -->
-    <input type="hidden" name="upInTimer" value="{{map.upInTimer}}" id="upInTimer_id"/>
-    <input type="hidden" name="downInTimer" value="{{map.downInTimer}}" id="downInTimer_id"/>
-    <input type="hidden" name="upOutTimer" value="{{map.upOutTimer}}" id="upOutTimer_id"/>
-    <input type="hidden" name="downOutTimer" value="{{map.downOutTimer}}" id="downOutTimer_id"/>
+    <!--<input type="hidden" name="upInTimer" value="{{map.upInTimer}}" id="upInTimer_id"/>-->
+    <!--<input type="hidden" name="downInTimer" value="{{map.downInTimer}}" id="downInTimer_id"/>-->
+    <!--<input type="hidden" name="upOutTimer" value="{{map.upOutTimer}}" id="upOutTimer_id"/>-->
+    <!--<input type="hidden" name="downOutTimer" value="{{map.downOutTimer}}" id="downOutTimer_id"/>-->
     <!-- 隐藏字段-里程 -->
     <!-- 上下行行驶里程 -->
@@ -366,6 +456,89 @@
     <div class="form-group">
         <div class="col-md-6">
             <label class="control-label col-md-5">
+                <span class="required"> * </span> 上行进场时间  :
+            </label>
+            <div class="col-md-5">
+                <p class="form-control-static" data-display="upInTimer"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 上行出场时间  :
+            </label>
+            <div class="col-md-5">
+                <p class="form-control-static" data-display="upOutTimer"> </p>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 下行进场时间  :
+            </label>
+            <div class="col-md-5">
+                <p class="form-control-static" data-display="downInTimer"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
+                <span class="required"> * </span> 下行出场时间  :
+            </label>
+            <div class="col-md-5">
+                <p class="form-control-static" data-display="downOutTimer"> </p>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 早高峰上行时间　: </label>
+            <div class="col-md-6">
+                <p class="form-control-static" data-display="earlyUpTime"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 早高峰下行时间　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="earlyDownTime"> </p>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 晚高峰上行时间　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="lateUpTime"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 晚高峰下行时间　:</label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="lateDownTime"> </p>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">低谷上行时间　　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="troughUpTime"> </p>
+            </div>
+        </div>
+        <div class="col-md-6">
+            <label class="control-label col-md-5"> 低谷下行时间　　: </label>
+            <div class="col-md-4">
+                <p class="form-control-static" data-display="troughDownTime"> </p>
+            </div>
+        </div>
+    </div>
+
+    <div class="form-group">
+        <div class="col-md-6">
+            <label class="control-label col-md-5">
                 <span class="required"> * </span> 线路规划类型　　:
             </label>
             <div class="col-md-4">
@@ -305,6 +305,7 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
+			var i = layer.load(2);
 // 			$(".hidden").removeClass("hidden");
 			$get('/busInterval/interval', params, function(result){
 				// 把数据填充到模版中
@@ -316,6 +317,7 @@
 				_w_table_rowspan("#forms tbody", 3);
 				_w_table_rowspan("#forms tbody", 4);
 				_w_table_rowspan("#forms tbody", 5);
+				layer.close(i);
 			});		
 		}
@@ -341,10 +343,12 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/busInterval/interval', params, function(result){
 				window.open("/downloadFile/download?fileName=班次间隔统计表"
 						+moment(startDate).format("YYYYMMDD")+"-"
 						+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -395,21 +399,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
+// 			if(statu == 0)
+// 				params['line'] = " ";
+// 			if(statu == 1)
+// 				params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
 			if(statu == 0)
-				params['line'] = " ";
-			if(statu == 1)
-				params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
-				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
-			});
+			if(statu == 1){
+				params['xl.lineCode_eq'] = line;
+				$get('/tic_ec', params, function(result){
+					treeData = createTreeData(result.data.content);
+					var options = '<option value="">请选择...</option>';
+					$.each(treeData, function(i, g){
+						if(!g.isCancel)
+							options += '<option value="'+g.id+'">'+g.name+'</option>';
+					});
+					$('#model').html(options)/* .select2() */;
+					flag = 0;
+				});
+			}
 		}
 		/**
@@ -230,7 +230,7 @@
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
-				if(result.length == 0)
+				if(list.length == 0)
 					$("#export").attr('disabled',"true");
 				else
 					$("#export").removeAttr("disabled");
@@ -240,13 +240,32 @@
 		}
 		$("#export").on("click",function(){
-			$("#forms").table2excel({
-				exclue: ".noExl",
-				name: "Excel Document Name.xlsx",
-				filename: "首末班误点班次",
-				exclude_img: true,
-				exclude_links: true,
-				exclude_inputs: true
+// 			$("#forms").table2excel({
+// 				exclue: ".noExl",
+// 				name: "Excel Document Name.xlsx",
+// 				filename: "首末班误点班次",
+// 				exclude_img: true,
+// 				exclude_links: true,
+// 				exclude_inputs: true
+// 			});
+			var i = layer.load(2);
+			var params = {};
+			company = $("#company").val();
+			subCompany = $("#subCompany").val();
+			line = $("#line").val();
+			startDate = $("#startDate").val();
+			endDate = $("#endDate").val();
+			if(line == " ")
+				line = "";
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['type'] = "delay_export";
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=首末班误点班次");
+				layer.close(i);
 			});
 		});
@@ -239,11 +239,13 @@
 		});
 		var list;
+		var tempLine;
 		$("#forms tbody").on("click","a",function(){
 			var index = $(this).parent().parent().index();
 			if(index < list.length - 1){
 				$.each(list, function(i, g){
 					if(index == i){
+						tempLine = g.xlbm;
 						var tbodyHtml = template('list_maps',{list:g.map});
 						$('#map tbody').html(tbodyHtml);
 						$("#sumMap tr").addClass("hidden");
@@ -304,11 +306,13 @@
 			$("#sumMap tr").addClass("hidden");
 			$("#exportMap").addClass("hidden");
 			$("#exportSumMap").addClass("hidden");
+			var i = layer.load(2);
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_firstAndLastBus_sum',{list:result});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				layer.close(i);
 				list = result;
@@ -327,30 +331,56 @@
 			params['startDate'] = startDate;
 			params['endDate'] = endDate;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/pcpc/firstAndLastBus_sum', params, function(result){
 				window.open("/downloadFile/download?fileName=线路首末班准点率"+moment(startDate).format("YYYYMMDD")+(startDate==endDate?"":("-"+moment(endDate).format("YYYYMMDD"))));
+				layer.close(i);
 			});
 		});
 		$("#exportMap").on("click",function(){
-			$("#map").table2excel({
-				exclue: ".noExl",
-				name: "Excel Document Name.xlsx",
-				filename: "线路首末班",
-				exclude_img: true,
-				exclude_links: true,
-				exclude_inputs: true
+// 			$("#map").table2excel({
+// 				exclue: ".noExl",
+// 				name: "Excel Document Name.xlsx",
+// 				filename: "线路首末班",
+// 				exclude_img: true,
+// 				exclude_links: true,
+// 				exclude_inputs: true
+// 			});
+			var i = layer.load(2);
+			var params = {};
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['line'] = tempLine;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['type'] = "exportMap";
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=线路首末班明细");
+				layer.close(i);
 			});
 		});
 		$("#exportSumMap").on("click",function(){
-			$("#sumMap").table2excel({
-				exclue: ".noExl",
-				name: "Excel Document Name.xlsx",
-				filename: "首末班误点班次",
-				exclude_img: true,
-				exclude_links: true,
-				exclude_inputs: true
+// 			$("#sumMap").table2excel({
+// 				exclue: ".noExl",
+// 				name: "Excel Document Name.xlsx",
+// 				filename: "首末班误点班次",
+// 				exclude_img: true,
+// 				exclude_links: true,
+// 				exclude_inputs: true
+// 			});
+			var i = layer.load(2);
+			var params = {};
+			params['company'] = company;
+			params['subCompany'] = subCompany;
+			params['line'] = line;
+			params['startDate'] = startDate;
+			params['endDate'] = endDate;
+			params['type'] = "delay_export";
+			$get('/pcpc/firstAndLastBus_sum', params, function(result){
+				window.open("/downloadFile/download?fileName=首末班误点班次");
+				layer.close(i);
 			});
 		});
@@ -388,11 +388,14 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
+			var i = layer.load(2);
 			$("#forms .hidden").removeClass("hidden");
 			$get('/busInterval/lineTimeAnaliy', params, function(result){
 				console.log(result);
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_lineTimeAnaly',{list:result});
+				layer.close(i);
+				
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
 				$("#works_hidden").addClass("hidden");
@@ -470,14 +473,25 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-			params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
+// 			params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
+			params['xl.lineCode_eq'] = line;
+			$get('/tic_ec', params, function(result){
+				treeData = createTreeData(result.data.content);
 				var options = '<option value="">请选择...</option>';
 				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
+					if(!g.isCancel)
+						options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
@@ -252,11 +252,13 @@
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
 			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_scheduleAnaly',{list:result.dataList});
 				// 把渲染好的模版html文本追加到表格中
 				$('#forms tbody').html(tbodyHtml);
+				layer.close(i);
 				if(result.dataList.length == 0)
 					$("#export").attr('disabled',"true");
@@ -286,8 +288,10 @@
 			params['subCompany'] = subCompany;
 			params['bcType'] = bcType;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/pcpc/scheduleAnaly', params, function(result){
 				window.open("/downloadFile/download?fileName=时刻表分析"+moment(startDate).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -311,16 +315,27 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
-			params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
+// 			params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				var size = 0;
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 					size++;
+// 				});
+// 				$('#model').html(options)/* .select2() */;
+// 				flag = 0;
+// 			});
+			params['xl.lineCode_eq'] = line;
+			$get('/tic_ec', params, function(result){
+				treeData = createTreeData(result.data.content);
 				var options = '<option value="">请选择...</option>';
-				var size = 0;
 				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-					size++;
+					if(!g.isCancel)
+						options += '<option value="'+g.id+'">'+g.name+'</option>';
 				});
 				$('#model').html(options)/* .select2() */;
 				flag = 0;
@@ -121,14 +121,6 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
-		$("#startDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
-		$("#endDate").datetimepicker({
-			format : 'YYYY-MM-DD',
-			locale : 'zh-cn'
-		});
 		$("#times1").datetimepicker({
 			format : 'HH:mm',
@@ -140,6 +132,7 @@
 		});
 		var d = new Date();
+		d.setTime(d.getTime() - 1*1000*60*60*24);
 		var year = d.getFullYear();
 		var month = d.getMonth() + 1;
 		var day = d.getDate();
@@ -147,8 +140,19 @@
 			month = "0" + month;
 		if(day < 10)
 			day = "0" + day;
-		$("#startDate").val(year + "-" + month + "-" + day);
-		$("#endDate").val(year + "-" + month + "-" + day);
+		var dateTime = year + "-" + month + "-" + day;
+		$("#startDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#endDate").datetimepicker({
+			format : 'YYYY-MM-DD',
+			locale : 'zh-cn',
+			maxDate : dateTime
+		});
+		$("#startDate").val(dateTime);
+		$("#endDate").val(dateTime);
 		$("#times1").val("05:00");
 		$("#times2").val("23:00");
@@ -329,6 +333,7 @@
 			params['subCompany'] = subCompany;
 			params['type'] = "query";
 // 			$(".hidden").removeClass("hidden");
+			var i = layer.load(2);
 			$get('/busInterval/timeAndSpeed', params, function(result){
 				// 把数据填充到模版中
 				var tbodyHtml = template('list_timeAndSpeed', {list:result});
@@ -336,6 +341,7 @@
 				$('#forms').html(tbodyHtml);
 				list = result;
 				$("#works_hidden").addClass("hidden");
+				layer.close(i);
 				_w_table_rowspan("#forms", 1);
 				_w_table_rowspan("#forms", 2);
@@ -388,10 +394,12 @@
 			params['company'] = company;
 			params['subCompany'] = subCompany;
 			params['type'] = "export";
+			var i = layer.load(2);
 			$get('/busInterval/timeAndSpeed', params, function(result){
 				window.open("/downloadFile/download?fileName=行驶时间及车速统计表"
 						+moment(startDate).format("YYYYMMDD")+"-"
 						+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		});
@@ -447,21 +455,38 @@
 			flag = 1;
 			var treeData = [];
 			var params = {};
+// 			if(statu == 0)
+// 				params['line'] = " ";
+// 			if(statu == 1)
+// 				params['line'] = line;
+// 			params['startDate'] = startDate;
+// 			params['endDate'] = endDate;
+// 			$get('/pcpc/getModel', params, function(result){
+// 				treeData = createTreeData(result);
+// 				var options = '<option value="">请选择...</option>';
+// 				$.each(treeData, function(i, g){
+// 					options += '<option value="'+g.id+'">'+g.name+'</option>';
+// 				});
+// 				$('#model').html(options);
+// 				flag = 0;
+// 			});
 			if(statu == 0)
-				params['line'] = " ";
-			if(statu == 1)
-				params['line'] = line;
-			params['startDate'] = startDate;
-			params['endDate'] = endDate;
-			$get('/pcpc/getModel', params, function(result){
-				treeData = createTreeData(result);
 				var options = '<option value="">请选择...</option>';
-				$.each(treeData, function(i, g){
-					options += '<option value="'+g.id+'">'+g.name+'</option>';
-				});
-				$('#model').html(options);
+				$('#model').html(options)/* .select2() */;
 				flag = 0;
-			});
+			if(statu == 1){
+				params['xl.lineCode_eq'] = line;
+				$get('/tic_ec', params, function(result){
+					treeData = createTreeData(result.data.content);
+					var options = '<option value="">请选择...</option>';
+					$.each(treeData, function(i, g){
+						if(!g.isCancel)
+							options += '<option value="'+g.id+'">'+g.name+'</option>';
+					});
+					$('#model').html(options)/* .select2() */;
+					flag = 0;
+				});
+			}
 		}
 		function updateLp(ttId){
@@ -75,22 +75,31 @@
 			});
 		});
 		$("#exportList").on('click',function(){
-			$("#forms_2").table2excel({
-					// 不被导出的表格行的CSS class类
-					exclude: ".noExl",
-					// 导出的Excel文档的名称，（没看到作用）
-					name: "Excel Document Name.xlsx",
-					// Excel文件的名称
-					filename: "发车到站准点率"
+// 			$("#forms_2").table2excel({
+// 					// 不被导出的表格行的CSS class类
+// 					exclude: ".noExl",
+// 					// 导出的Excel文档的名称，（没看到作用）
+// 					name: "Excel Document Name.xlsx",
+// 					// Excel文件的名称
+// 					filename: "发车到站准点率"
+// 			});
+			var date = no.split("_")[0];
+			var endDate = date;
+			var line = no.split("_")[1];
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').val();
+			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:2,type:"export"},function(result){
+				window.open("/downloadFile/download?fileName=发车到站准点率详细"+moment(date).format("YYYYMMDD"));
 			});
-		}); 
+
+		});
 	});
 </script>
 <script type="text/html" id="onTime_2">
 	{{each list as obj i}}
 		<tr>
-		<td>{{i+1}}</td>
+		<td>{{obj.no}}</td>
 		<td>{{obj.zd}}</td>
 		<td>{{obj.clzbh}}</td>
 		<td>{{obj.jsy}}</td>
@@ -98,7 +98,7 @@
 					</table>
 				</div>
-				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px">
+				<div class="table-container" style="margin-top: 10px;overflow:auto;min-width: 906px" id="forms_1_div">
 					<input class="btn btn-default hidden" type="button" id="export_1" value="导出"/>
 					<table class="table table-bordered table-hover table-checkable" id="forms_1">
 						<thead>
@@ -269,19 +269,27 @@
 				$('#forms_h tbody').html(template('onTime_h',{list:result}));
 				$('.btn-onTime').on('click', showSheetList);
 				layer.close(i);
+				
+				$("#forms_1_div").addClass("hidden");
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
 			});
 		});
+		var line1;
 		function showSheetList(){
-			var line = $(this).data('id');
+			line1 = $(this).data('id');
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
 			var fgs=$('#fgsdm').val();
 			var gs=$('#gsdm').val();
 			var i = layer.load(2);
-			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:1},function(result){
+			$get('/busInterval/onTime',{line:line1,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:1},function(result){
 				var onTime = template('onTime_1',{list:result});
 				$('#forms_1 tbody').html(onTime);
 				$('#forms_1_h tbody').html(template('onTime_1_h',{list:result}));
+				$("#forms_1_div").removeClass("hidden");
 				$("#forms_1 .hidden").removeClass("hidden");
 				$('.btn-onTime_1').on('click', openSheetList);
 				$("#export_1").removeClass("hidden");
@@ -312,30 +320,47 @@
 			});
 		}
 		$("#export").on("click",function(){
+// 			$("#forms_h").table2excel({
+// 				// 不被导出的表格行的CSS class类
+// 				exclude: ".noExl",
+// 				// 导出的Excel文档的名称，（没看到作用）
+// 				name: "Excel Document Name.xlsx",
+// 				// Excel文件的名称
+// 				filename: date+"-"+endDate+"发车到站准点率"
+// 			});
+			var line = $("#line").val();
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-		 $("#forms_h").table2excel({
-				// 不被导出的表格行的CSS class类
-				exclude: ".noExl",
-				// 导出的Excel文档的名称，（没看到作用）
-				name: "Excel Document Name.xlsx",
-				// Excel文件的名称
-				filename: date+"-"+endDate+"发车到站准点率"
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').val();
+			var i = layer.load(2);
+			$get('/busInterval/onTime',{line:line,startDate:date,endDate:endDate,gs:gs,fgs:fgs,type:"export"},function(result){
+				window.open("/downloadFile/download?fileName=发车到站准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
 		})
 		$("#export_1").on("click",function(){
+// 			var date = $("#date").val();
+// 			var endDate = $("#endDate").val();
+// 		 	$("#forms_1_h").table2excel({
+// 				// 不被导出的表格行的CSS class类
+// 				exclude: ".noExl",
+// 				// 导出的Excel文档的名称，（没看到作用）
+// 				name: "Excel Document Name.xlsx",
+// 				// Excel文件的名称
+// 				filename: date+"-"+endDate+"发车到站准点率"
+// 			});
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-		 	$("#forms_1_h").table2excel({
-				// 不被导出的表格行的CSS class类
-				exclude: ".noExl",
-				// 导出的Excel文档的名称，（没看到作用）
-				name: "Excel Document Name.xlsx",
-				// Excel文件的名称
-				filename: date+"-"+endDate+"发车到站准点率"
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').val();
+			var i = layer.load(2);
+			$get('/busInterval/onTime',{line:line1,startDate:date,endDate:endDate,gs:gs,fgs:fgs,flag:1,type:"export"},function(result){
+				window.open("/downloadFile/download?fileName=发车到站准点率明细");
+				layer.close(i);
 			});
-		})
+		});
 	});
 </script>
@@ -56,25 +56,30 @@
 		if (!$('body').hasClass('page-sidebar-closed'))
 			$('.menu-toggler.sidebar-toggler').click();
 		var no="";
-		 $("#sheetList").on('init', function (e, id) {
-			 no=id;
-			 $get('/sheet/sheetList',{id:id},function(result){
+		var date = "";
+		$("#sheetList").on('init', function (e, id) {
+			no=id.split(",")[0];
+			var dates = id.split(",")[1].split("-");
+			date = dates[0] + dates[1] + dates[2];
+			$get('/sheet/sheetList',{id:no},function(result){
 					var sheetList_2 = template('sheetList_2',{list:result});
 					$('#forms_2 tbody').html(sheetList_2);
 				});
-		 })
-		 $("#exportList").on('click',function(){
-			 $("#forms_2").table2excel({
-					// 不被导出的表格行的CSS class类
-					exclude: ".noExl",
-					// 导出的Excel文档的名称，（没看到作用）
-					name: "Excel Document Name.xlsx",
-					// Excel文件的名称
-					filename: "班次准点率"
-				});
-// 			 $get('/sheet/exportList',params,function(result){
-// 					window.open("/downloadFile/download?fileName=班次车辆人员月报表"+moment($("#startDate").val()).format("YYYYMMDD"));
+		})
+		$("#exportList").on('click',function(){
+// 			$("#forms_2").table2excel({
+// 					// 不被导出的表格行的CSS class类
+// 					exclude: ".noExl",
+// 					// 导出的Excel文档的名称，（没看到作用）
+// 					name: "Excel Document Name.xlsx",
+// 					// Excel文件的名称
+// 					filename: "班次准点率"
 // 				});
+			var i = layer.load(2);
+			$get('/sheet/exportList',{id:no},function(result){
+				window.open("/downloadFile/download?fileName=发车准点率"+date);
+				layer.close(i);
+			});
 		}); 
@@ -31,7 +31,7 @@
 							<span class="item-label" style="width: 80px;">公司: </span>
 							<select class="form-control" name="company" id="gsdm" style="width: 180px;"></select>
 						</div> 
-						<div style="display: inline-block; margin-left: 24px;" id="fgsdmDiv">
+						<div style="display: inline-block; margin-left: 38px;" id="fgsdmDiv">
 							<span class="item-label" style="width: 80px;">分公司: </span>
 							<select class="form-control" name="subCompany" id="fgsdm" style="width: 180px;"></select>
 						</div>
@@ -51,6 +51,7 @@
                     </div>
                     <div class="form-group">
+                    	<input type="hidden" id="id"/>
                         <input class="btn btn-default" type="button" id="query" value="查询"/>
                         <input class="btn btn-default" type="button" id="export" value="导出"/>
                     </div>
@@ -244,9 +245,9 @@
 					$("#fgsdm").attr("disabled", true);
 				}
 			});
+
+		$("#export").attr('disabled',"true");
-		
-		 
 		//查询
 		$("#query").on('click',function(){
 			var line = $("#line").val();
@@ -263,14 +264,19 @@
 				$('#forms_h tbody').html(sheetList_h);
 				$('.btn-sheetList').on('click', showSheetList);
 				layer.close(i);
+				if(result.length == 0)
+					$("#export").attr('disabled',"true");
+				else
+					$("#export").removeAttr("disabled");
 			});   
-// 			 $post('/sheet/saveListSheet',function(result){
+// 			$post('/sheet/saveListSheet',function(result){
 // 			}); 
 		});
 		function showSheetList(){
 			var id = $(this).data('id');
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
+			$("#id").val(id);
 			$get('/sheet/listSheet',{id:id,date:date,endDate:endDate},function(result){
 				var sheetList = template('sheetList_1',{list:result});
 				var sheetList_h = template('sheetList_1_h',{list:result});
@@ -285,6 +291,7 @@
 		}
 		function openSheetList(){
 			var id = $(this).data('id');
+			id += ","+$(this).data('date');
 			$.get('/pages/report/sheet/list.html', function (content) {
 				layer.open({
 					type: 1,
@@ -300,29 +307,43 @@
 			});
 		}
 		$("#export").on("click",function(){
+			var line = $("#line").val();
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-		 $("#forms_h").table2excel({
-				// 不被导出的表格行的CSS class类
-				exclude: ".noExl",
-				// 导出的Excel文档的名称，（没看到作用）
-				name: "Excel Document Name.xlsx",
-				// Excel文件的名称
-				filename: date+"-"+endDate+"班次准点率"
+			var fgs=$('#fgsdm').val();
+			var gs=$('#gsdm').val();
+			var i = layer.load(2);
+			$get('/sheet/countList',{line:line,date:date,endDate:endDate,gs:gs,fgs:fgs,type:"export"},function(result){
+				window.open("/downloadFile/download?fileName=发车准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
-		})
+// 		$("#forms_h").table2excel({
+// 				// 不被导出的表格行的CSS class类
+// 				exclude: ".noExl",
+// 				// 导出的Excel文档的名称，（没看到作用）
+// 				name: "Excel Document Name.xlsx",
+// 				// Excel文件的名称
+// 				filename: date+"-"+endDate+"班次准点率"
+// 			});
+		});
 		$("#export_1").on("click",function(){
+			var id = $("#id").val();
 			var date = $("#date").val();
 			var endDate = $("#endDate").val();
-		 	$("#forms_1_h").table2excel({
-				// 不被导出的表格行的CSS class类
-				exclude: ".noExl",
-				// 导出的Excel文档的名称，（没看到作用）
-				name: "Excel Document Name.xlsx",
-				// Excel文件的名称
-				filename: date+"-"+endDate+"班次准点率"
+			var i = layer.load(2);
+			$get('/sheet/listSheet',{id:id,date:date,endDate:endDate,type:"export"},function(result){
+				window.open("/downloadFile/download?fileName=发车准点率"+moment(date).format("YYYYMMDD")+"-"+moment(endDate).format("YYYYMMDD"));
+				layer.close(i);
 			});
+// 		 	$("#forms_1_h").table2excel({
+// 				// 不被导出的表格行的CSS class类
+// 				exclude: ".noExl",
+// 				// 导出的Excel文档的名称，（没看到作用）
+// 				name: "Excel Document Name.xlsx",
+// 				// Excel文件的名称
+// 				filename: date+"-"+endDate+"班次准点率"
+// 			});
 		})
 	});
@@ -379,7 +400,7 @@
 		<td>{{obj.zdlv}}</td>
 		<td>
 			<button type="button" class="btn btn-sm blue btn-sheetList_1" 
-			data-id="{{obj.id}}">详细</button>
+			data-id="{{obj.id}}" data-date="{{obj.date}}">详细</button>
 		</td>
 		</tr>
 	{{/each}}