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

徐烜
2 parents 1cd87384 bba6c6f5
Showing 19 changed files with 99 additions and 51 deletions
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/impl/BusIntervalServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/schedule/PeopleCarPlanServiceImpl.java
src/main/resources/static/pages/forms/statement/busInterval.html
src/main/resources/static/pages/forms/statement/lbStatuAnaly.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/mforms/changetochanges/changetochange.html
src/main/resources/static/pages/mforms/operationservices/operationservice.html
src/main/resources/static/pages/mforms/shiftuehiclemanths/shiftuehiclemanth.html
src/main/resources/static/real_control_v2/css/line_schedule.css
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/add_temp_sch.html
src/main/resources/static/real_control_v2/fragments/line_schedule/context_menu/lj_zrw.html
src/main/resources/static/real_control_v2/fragments/north/toolbar.html
src/main/resources/static/real_control_v2/js/main.js
src/main/resources/static/real_control_v2/js/north/toolbar.js
src/main/resources/static/real_control_v2/mapmonitor/fragments/playback_v2/main.html
@@ -735,6 +735,7 @@ public class FormsServiceImpl implements FormsService {
 	@Override
 	public List<Turnoutrate> turnoutrate(Map<String, Object> map) {
+		List<Turnoutrate> resList = new ArrayList<Turnoutrate>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -752,22 +753,24 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,b.warrant_car,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"+ map.get("startDate").toString() + "'  "
 				+ " and '" + map.get("endDate").toString() + "'  and xl_bm='"+ map.get("line").toString() + "' "
 				+ " AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmTurn").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmTurn").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ " SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl,t.warrant_car   "
-				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
+				+ " from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real "
 				+ " where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null "
 				+ " AND bc_type NOT IN ('in', 'out')"
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Turnoutrate> list = jdbcTemplate.query(sql, new RowMapper<Turnoutrate>() {
 			@Override
@@ -782,6 +785,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 //				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");
@@ -801,14 +806,20 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
+		
+		for(Turnoutrate t : list){
+			if(t.getGs() != null && t.getGs().trim().length() != 0)
+				resList.add(t);
+		}
-		return list;
+		return resList;
 	}
 	//班次执行率统计表
 	@Override
 	public List<Executionrate> executionrate(Map<String, Object> map) {
+		List<Executionrate> resList = new ArrayList<Executionrate>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -826,20 +837,22 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
 				+ " and gs_bm='"+ map.get("gsdmEcecut").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmEcecut").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ "SELECT  COUNT(*) as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b.xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl  "
 				+ "from bsth_c_line t RIGHT  JOIN (select  gs_bm,fgs_bm,xl_bm,xl_name,gs_name,fgs_name, count(*) as sbc,COUNT(DISTINCT xl_bm) as sxl ,COUNT(DISTINCT cl_zbh) as scl,bc_type  from bsth_c_s_sp_info_real	 "
 				+ "where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '" + map.get("startDate").toString() + "'  and '"
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get("line").toString()
 				+ "' AND gs_bm is not null AND bc_type NOT IN ('in', 'out') "
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Executionrate> list = jdbcTemplate.query(sql, new RowMapper<Executionrate>() {
 			@Override
@@ -854,6 +867,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 //				tu.setXl(arg0.getString("xlgs")!=null&&arg0.getString("xlgs").trim().length()!=0?arg0.getString("xlgs"):"0");//这个是根据公司判断线路有几条
@@ -874,13 +889,19 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
+		
+		for(Executionrate e : list){
+			if(e.getGs() != null && e.getGs().trim().length() != 0)
+				resList.add(e);
+		}
-		return list;
+		return resList;
 	}
 	// 营运线路名称统计表
 	@Override
 	public List<Allline> allline(Map<String, Object> map) {
+		List<Allline> resList = new ArrayList<Allline>();
 		SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
 		SimpleDateFormat sdf1 = new SimpleDateFormat("yyyy年MM月dd日");
 		Date d = null;
@@ -900,13 +921,14 @@ public class FormsServiceImpl implements FormsService {
 		rq = rq2 + "-" + rq3;
 		String sql = " select b.xlgs, a.gs_bm,a.gs_name, a.fgs_bm,a.fgs_name , a.xl_bm,b.xl_name,b.sbc,b.sxl,b.scl,a.jbc ,a.jxl ,a.jcl,a.gslsbm,a.fgsbm,a.bc_type from "
-				+ "  (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
-				+ "   from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
+				+ " (select  count(DISTINCT gs_bm) gslsbm, gs_bm, count(DISTINCT fgs_bm) fgsbm,fgs_bm,gs_name,fgs_name ,xl_bm, count(*) as jbc,COUNT(DISTINCT xl_bm) as jxl ,COUNT(DISTINCT cl_zbh) as jcl,bc_type"
+				+ " from bsth_c_s_sp_info" + "  where DATE_FORMAT(schedule_date,'%Y-%m-%d') BETWEEN '"
 				+ map.get("startDate").toString() + "'  and '" + map.get("endDate").toString() + "'  and xl_bm='"
 				+ map.get("line").toString() + "'   AND gs_bm is not null  AND bc_type NOT IN ('in', 'out') "
 				+ " and gs_bm='"+ map.get("gsdmAllline").toString() + "'"
 				+ " and fgs_bm='"+ map.get("fgsdmAllline").toString() + "'"
-				+ "  GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type ) a left JOIN ("
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type "
+				+ " ) a left JOIN ("
 				+ "SELECT  COUNT(*"
 				+ ") as xlgs,b.gs_bm,b.fgs_bm,b.xl_bm,b."
 				+ "xl_name,b.gs_name,b.fgs_name, b.sbc,b.sxl ,b.scl   "
@@ -915,9 +937,9 @@ public class FormsServiceImpl implements FormsService {
 				+ map.get("endDate").toString() + "'  and xl_bm='" + map.get
 				("line").toString()
 				+ "' AND gs_bm is not null  AND bc_type NOT IN ('in', 'out')"
-				+ "GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
-				+ "  a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
-		System.out.println(sql);
+//				+ " GROUP BY gs_bm,fgs_bm,xl_bm,gs_name,fgs_name,bc_type"
+				+ " ) b ON  t.company=b.gs_bm and t.branche_company = b.fgs_bm) b on "
+				+ " a.gs_bm=b.gs_bm and a.fgs_bm=b.fgs_bm and a.xl_bm=b.xl_bm  ";
 		List<Allline> list = jdbcTemplate.query(sql, new RowMapper<Allline>() {
 			@Override
@@ -932,6 +954,8 @@ public class FormsServiceImpl implements FormsService {
 				String result1 = numberFormat.format((float) scl / (float) jcl * 100);
 				String result2 = numberFormat.format((float) sbc / (float) jbc * 100);
 				tu.setRq(rq);
+				if(arg0.getString("gs_name") == null || arg0.getString("gs_name").trim().length() == 0)
+					return tu;
 				tu.setGs(arg0.getString("gs_name").toString());
 				tu.setZhgs(arg0.getString("fgs_name").toString());
 				tu.setXl(arg0.getString("xl_name"));
@@ -951,7 +975,12 @@ public class FormsServiceImpl implements FormsService {
 			}
 		});
-		return list;
+		for(Allline a : list){
+			if(a.getGs() != null && a.getGs().trim().length() != 0)
+				resList.add(a);
+		}
+		
+		return resList;
 	}
 	@Override
@@ -145,8 +145,8 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 						schedule.setZdsjActual(zdsjA/60 + ":" + zdsjA%60);
 						schedule.setZdsjActualTime(zdsjA);
 					}
-					schedule.setFcsj(fcsj/60 + ":" + fcsj%60);
-					schedule.setZdsj(zdsj/60 + ":" + zdsj%60);
+					schedule.setFcsj((fcsj/60<10?"0"+fcsj/60:fcsj/60) + ":" + (fcsj%60<10?"0"+fcsj%60:fcsj%60));
+					schedule.setZdsj((zdsj/60<10?"0"+zdsj/60:zdsj/60) + ":" + (zdsj%60<10?"0"+zdsj%60:zdsj%60));
 					schedule.setFcsjT(fcsj);
 					schedule.setZdsjT(zdsj);
 					return schedule;
@@ -237,7 +237,6 @@ public class BusIntervalServiceImpl implements BusIntervalService {
 			String sql = "select start_station_name, end_station_name from bsth_c_line where line_code = '"+line+"'";
-			System.out.println(sql);
 			list = jdbcTemplate.query(sql,
 					new RowMapper<Map<String, Object>>(){
 				@Override
@@ -213,6 +213,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             }
             schedule.setDfsjAll(dfsj);
+            schedule.setDfAuto(false);
             schedule.addRemarks(remarks);
             List<ScheduleRealInfo> ts = new ArrayList<>();
@@ -499,7 +500,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             //公司 和 分公司名称
             t.setGsName(BasicData.businessCodeNameMap.get(t.getGsBm()));
-            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getGsBm() + "_" + t.getFgsBm()));
+            t.setFgsName(BasicData.businessFgsCodeNameMap.get(t.getFgsBm() + "_" + t.getGsBm()));
             t.setScheduleDateStr(schDate);
             t.setScheduleDate(sdfyyyyMMdd.parse(schDate));
@@ -521,7 +521,7 @@ public class PeopleCarPlanServiceImpl implements PeopleCarPlanService {
 				sql += " and xl_bm = '"+line+"'";
 			}
 //			if(company.length() != 0){
-				sql += " and gs_bm like %'"+company+"'% and fgs_bm like %'"+subCompany+"%'";
+				sql += " and gs_bm like '%"+company+"%' and fgs_bm like '%"+subCompany+"%'";
 //			}
 			sql += " and bc_type != 'in' and bc_type != 'out'";
@@ -387,7 +387,7 @@
 			var treeData = [];
 			var params = {};
 			if(statu == 0)
-				params['line'] = "";
+				params['line'] = " ";
 			if(statu == 1)
 				params['line'] = line;
 			params['startDate'] = startDate;
@@ -258,6 +258,7 @@
 				}
 			}
 			initPinYinSelect2('#line',data,'');
+			line = data[0].id;
 			updateModel();
 			fage=true;
 		}
@@ -317,11 +317,11 @@
 			}
 			initPinYinSelect2('#line',data,'');
 			fage=true;
-			
+
+			line = data[0].id;
 			updateModel();
 			var params = {};
-			line = data[0].id;
 			params['line'] = line;
 			$get('/busInterval/getDir', params, function(result){
 				dirData = createTreeData(result);
@@ -397,7 +397,7 @@
 				}
 			});
 			$.each(list, function(i, g){
-				if(g.line == params[3] && g.lp == params[4]){
+				if(g.line == params[3] && g.lp == params[4] &&g.station　== params[5]){
 					var tbodyHtml = template('list_workList',{list:g});
 					$('#works tbody').html(tbodyHtml);
 					$("#works_hidden").removeClass("hidden");
@@ -187,6 +187,7 @@
 				}
 			}
 			initPinYinSelect2('#line',data,'');
+			line = data[0].id;
 			updateModel();
 			fage=true;
 		}
@@ -440,7 +440,7 @@
 			var treeData = [];
 			var params = {};
 			if(statu == 0)
-				params['line'] = "";
+				params['line'] = " ";
 			if(statu == 1)
 				params['line'] = line;
 			params['startDate'] = startDate;
@@ -55,22 +55,22 @@
 							class="form-control" name="subCompany" id="fgsdmChange"
 							style="width: 140px;"></select>
 					</div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 180px;"></select>
 					</div>
 					<div style="margin-top: 10px"></div>
-					<div style="display: inline-block; margin-left: 15px;">
+					<div style="display: inline-block; margin-left: 5px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span> <input
 							class="form-control" type="text" id="startDate"
-							style="width: 120px;" />
+							style="width: 140px;" />
 					</div>
-					<div style="display: inline-block; margin-left: 15px;">
+					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 80px;">结束时间: </span> <input
 							class="form-control" type="text" id="endDate"
-							style="width: 120px;" />
+							style="width: 140px;" />
 					</div>
-					<div style="display: inline-block;">
+					<div style="display: inline-block; margin-left: 10px;">
 						<span class="item-label" style="width: 120px;">类型: </span> <select
 							class="form-control" id="sel">
 							<option value="">请选择</option>
@@ -36,7 +36,7 @@
 							class="form-control" name="company" id="gsdmOperat"
 							style="width: 140px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 24px;"
+					<div style="display: inline-block; margin-left: 25px;"
 						id="fgsdmDiv_operat">
 						<span class="item-label" style="width: 80px;">分公司: </span> <select
 							class="form-control" name="subCompany" id="fgsdmOperat"
@@ -47,7 +47,7 @@
 						<span class="item-label" style="width: 80px;">线路: </span> <select
 							class="form-control" name="line" id="line" style="width: 140px;"></select>
 					</div>
-					<div style="display: inline-block; margin-left: 15px;">
+					<div style="display: inline-block; margin-left: 11px;">
 						<span class="item-label" style="width: 80px;">开始时间: </span> <input
 							class="form-control" type="text" id="startDate"
 							style="width: 140px;" />
@@ -52,7 +52,7 @@
                         <input class="form-control" type="text" id="endDate" style="width: 140px;"/>
                     </div>
                     <div style="display: inline-block;margin-left: 10px">
-                        <span class="item-label" style="width: 80px;">统计： </span>
+                        <span class="item-label" style="width: 80px;">统计: </span>
                         <select class="form-control" style="width: 136px;" id='empnames'>
                         	<option value="驾驶员">驾驶员</option>
                         	<option value="售票员">售票员</option>
@@ -243,7 +243,7 @@
 }
 span.fcsj-diff {
-    color: gray;
+    /*color: gray;*/
     margin-left: 3px;
 }
@@ -252,7 +252,7 @@ span.fcsj-diff {
 .tl-yzx {
     background: rgb( 192,192,255);
-    border-top: 1px solid #ebebeb !important;
+    border-top: 1px solid #d9d9d9 !important;
     color: #444;
 }
@@ -268,13 +268,13 @@ span.fcsj-diff {
 .tl-xxsd{
     background: rgb(205,133,63);
-    color: #f5f4f4;
+    /*color: #f5f4f4;*/
 }
 .tl-xxrd{
     background: rgb(255,99,71);
     border-top: 1px solid #ebebeb !important;
-    color: #fff;
+    /*color: #fff;*/
 }
 .tl-qrlb {
@@ -290,6 +290,7 @@ span.fcsj-diff {
 .tl-zzzx {
     background: rgb(173,255,47);
     color: #444;
+    border-top: 1px solid #d9d9d9 !important;
 }
 .ct_table>.ct_table_body dl:hover dd.tl-yzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-yzx, .ct_table>.ct_table_body dl:hover dd.tl-zzzx, .ct_table>.ct_table_body dl.context-menu-active dd.tl-zzzx {
@@ -30,7 +30,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" required name="bcType" data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -156,7 +156,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -274,7 +274,7 @@
                 <div class="uk-form-row">
                     <label class="uk-form-label">班次类型</label>
                     <div class="uk-form-controls">
-                        <select class="form-control nt-dictionary" name="bcType" data-code="{{bcType}}"
+                        <select class="form-control nt-dictionary" name="bcType" required data-code="{{bcType}}"
                                 data-group=ScheduleType></select>
                     </div>
                 </div>
@@ -289,8 +289,12 @@
             //新增临加
             var add_temp_sch = function () {
                 var sch = getActiveSch();
-                if (!sch)
-                    sch = {xlBm: $('[name=lineSelect]', f).val(), lpName: $('[name=lpName]', f).val()};
+                if (!sch){
+                    var xlBm = $('[name=lineSelect]', f).val();
+                    var xlName = $('[name=lineSelect]', f).find("option:selected").text();
+                    var lpName = $('[name=lpName]', f).val();
+                    sch = {xlBm: xlBm,xlName: xlName, lpName: lpName};
+                }
                 open_modal(folder + '/add_temp_sch.html', {
                     sch: sch
@@ -2,7 +2,7 @@
   <script id="north-toolbar-temp" type="text/html">
     <div class="uk-margin" id="north_toolbar_panel">
         <nav class="uk-navbar">
-            <a class="uk-navbar-brand" >
+            <a class="uk-navbar-brand" id="navbar_user_detail_link">
                 <span><i class="uk-icon-user"></i> <span id="north_toolbar_user">{{user.userName}}</span></span><i class="uk-icon-ellipsis-v"></i>
             </a>
             <ul class="uk-navbar-nav">
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-04-28 下午',
-        text: '<h5>修复在特定情况下出现线调界面班次显示不全，比路单少的情况。</h5><h5>尝试修复在特定情况下车辆走向不跟随班次执行结束而跳动的问题。</h5>'
+        date: '2017-05-03',
+        text: '<h5>修复了在临加/子任务里临加路牌后再临加班次出现的异常情况。</h5>'
     };
     var storage = window.localStorage
@@ -45,6 +45,11 @@ var gb_northToolbar = (function () {
             gb_sch_websocket.sock().close();
             window.location.href = '/pages/control/lineallot/allot.html';
         });
+
+        //点击用户名
+        $('#navbar_user_detail_link').on('click', function () {
+            //alert('1111');
+        });
     });
     $(document).on('click', '#north_toolbar_panel li.event a', function () {
@@ -269,6 +269,13 @@
         (function () {
             var modal = '#map-playback2-modal', gpsArray;
+            //modal hide remove dom
+            $(modal).on('hide.uk.modal', function () {
+                $('.map-wrap-tools .play_btn', modal).removeClass('play');
+                playObj.pause();
+                searchForm.hideShade();
+            });
+
             $(modal).on('init', function (e, data) {
                 //初始化地图
                 mapObj.initMap();