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

徐烜
2 parents 28e9f1f9 806da7ab
Showing 30 changed files with 230 additions and 98 deletions
src/main/java/com/bsth/XDApplication.java
src/main/java/com/bsth/controller/oil/CwjyController.java
src/main/java/com/bsth/controller/report/ReportController.java
src/main/java/com/bsth/data/ThreadMonotor.java
src/main/java/com/bsth/data/gpsdata/GpsEntity.java
src/main/java/com/bsth/data/gpsdata/arrival/GpsRealAnalyse.java
src/main/java/com/bsth/data/gpsdata/thread/GpsDataLoaderThread.java
src/main/java/com/bsth/data/safe_driv/SafeDrivDataLoadThread.java
src/main/java/com/bsth/repository/oil/YlbRepository.java
src/main/java/com/bsth/repository/realcontrol/ScheduleRealInfoRepository.java
src/main/java/com/bsth/service/forms/impl/FormsServiceImpl.java
src/main/java/com/bsth/service/oil/CwjyService.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/oil/impl/YlbServiceImpl.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/service/report/ReportService.java
src/main/java/com/bsth/service/report/impl/ReportServiceImpl.java
src/main/resources/application-dev.properties
src/main/resources/static/pages/control/lineallot/allot.html
src/main/resources/static/pages/oil/jyszAdd.html
@@ -84,6 +84,7 @@ public class XDApplication implements CommandLineRunner {
     }
     public void devInit(){
+        log.info("devInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //抓取GPS数据
         gpsDataLoader.setFlag(-1);
@@ -98,12 +99,13 @@ public class XDApplication implements CommandLineRunner {
     }
     public void prodInit(){
+        log.info("prodInit...");
         ScheduledExecutorService sexec = Application.mainServices;
         //发车信息
         sexec.scheduleWithFixedDelay(fcxxUpdateThread, 60, 40, TimeUnit.SECONDS);
         //抓取GPS数据
         sexec.scheduleWithFixedDelay(gpsDataLoader, 30, 2, TimeUnit.SECONDS);
-        //检查设备掉离线
+        //GPS设备掉离线
         sexec.scheduleWithFixedDelay(offlineMonitorThread, 120, 60, TimeUnit.SECONDS);
         //实际排班更新线程
         sexec.scheduleWithFixedDelay(scheduleRefreshThread, 15, 240, TimeUnit.SECONDS);
@@ -33,6 +33,11 @@ public class CwjyController extends BaseController&lt;Cwjy, Integer&gt;{
 		return service.save(t);
 	}
+	@RequestMapping(value = "/checkNbbm",method = RequestMethod.GET)
+	public int checkNbbm(Cwjy t){
+		return service.checkNbbm(t.getNbbm().trim());
+	}
+	
 	@RequestMapping(value = "/queryList",method = RequestMethod.GET)
 	public List<Ylxxb> queryList(@RequestParam Map<String, Object> map){
 		List<Ylxxb> pagequery=null;
@@ -185,8 +185,8 @@ public class ReportController {
 		return new ArrayList<Map<String, Object>>();
 	}
 	@RequestMapping(value = "/sreachZd", method = RequestMethod.GET)
-	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx,@RequestParam String zd) {
-		return service.sreachZd(line,zdlx, zd);
+	public List<Map<String, String>> sreachPersonnel(@RequestParam String line,@RequestParam int zdlx) {
+		return service.sreachZd(line,zdlx);
 	}
@@ -26,7 +26,7 @@ public class ThreadMonotor extends Thread{
         }
         if(GpsRealAnalyse.isIdle()){
-            //尝试使用网关的GPS实时对照数据
+            //切换到备用的网关实时GPS对照数据
             GpsDataLoaderThread.setFlag(-1);
         }
@@ -42,4 +42,4 @@ public class ThreadMonotor extends Thread{
             DirectivePushQueue.start();
         }
     }
-}
+}
 \ No newline at end of file
@@ -93,7 +93,7 @@ public class GpsEntity {
 	 * 1：网关
 	 * 0：转发
 	 */
-	private int source;
+	private int source = -1;
 	public String getDeviceId() {
 		return deviceId;
@@ -56,9 +56,9 @@ public class GpsRealAnalyse {
     public void analyse(List<GpsEntity> list) {
         try {
-            st = System.currentTimeMillis();
-            if (GpsDataRecovery.run)
+            if(list.size() == 0 || GpsDataRecovery.run)
                 return;
+            st = System.currentTimeMillis();
             //按线路分组gps
             ArrayListMultimap multimap = ArrayListMultimap.create();
@@ -176,6 +176,10 @@ public class GpsDataLoaderThread extends Thread {
                 String nbbm;
                 for (GpsEntity gps : list) {
+                    //没有设备号
+                    if (StringUtils.isBlank(gps.getDeviceId()))
+                        continue;
+
                     nbbm = BasicData.deviceId2NbbmMap.get(gps.getDeviceId());
                     if (StringUtils.isBlank(nbbm))
                         gps.setIncomplete(true);//标记为异常数据
@@ -21,7 +21,7 @@ import java.util.List;
 @Component
 public class SafeDrivDataLoadThread extends Thread{
-    private final static String url = "http://180.166.5.82:9988//bsth-safedriving/Crlcxb/realtimeInterface.do";
+    private final static String url = "http://118.178.187.115/bsth-safedriving/Crlcxb/realtimeInterface.do";
     Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -56,6 +56,11 @@ public interface YlbRepository extends BaseRepository&lt;Ylb, Integer&gt;{
 			+ " and xlbm like %?4% and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
 	List<Ylb> obtainYl(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
+	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and ssgsdm like %?2% "
+			+ " and fgsdm like %?3%"
+			+ " and xlbm = ?4 and nbbm like %?5% order by ?6 asc ",nativeQuery=true)
+	List<Ylb> obtainYl_eq(String rq,String gsdm,String fgsdm,String xlbm,String nbbm,String px);
+	
 	@Query(value="SELECT * FROM bsth_c_ylb  where to_days(?1)=to_days(rq) and nbbm =?2 and jsy=?3 ",nativeQuery=true)
 	List<Ylb> queryListYlb(String rq,String nbbm,String jgh);
@@ -170,9 +170,12 @@ public interface ScheduleRealInfoRepository extends BaseRepository&lt;ScheduleRealI
 	List<ScheduleRealInfo> scheduleByDateAndLineYbb(String line,String date,String date2);
-	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate,jGh ORDER BY clZbh,fcsj")
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm like %?1% and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
 	List<Map<String,Object>> yesterdayDataList(String line,String date,String gsbm,String fgsbm,String nbbm);
+	@Query(value="select new map(s.scheduleDate as scheduleDate,s.xlBm as xlBm,s.clZbh as clZbh,s.jGh as jGh,min(s.fcsj) as fcsj ) from ScheduleRealInfo s where s.xlBm =?1 and DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?2 and s.gsBm like %?3% and s.fgsBm like %?4% and s.clZbh like %?5% GROUP BY xlBm,clZbh,jGh,scheduleDate ORDER BY clZbh,fcsj")
+	List<Map<String,Object>> yesterdayDataList_eq(String line,String date,String gsbm,String fgsbm,String nbbm);
+	
 	@Query(value="select s from ScheduleRealInfo s where DATE_FORMAT(s.scheduleDate,'%Y-%m-%d') = ?1 ORDER BY xlBm,lpName,clZbh,xlDir")
 	List<ScheduleRealInfo> setLD(String date);
@@ -547,16 +547,18 @@ public class FormsServiceImpl implements FormsService {
 		});
 		List<Ylb> listYlb= ylbRepository.obtainYl(startDate, gsdm, fgsdm, xlbm, "", "xlbm");
-		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLineTjrb(xlbm, startDate);
+		List<ScheduleRealInfo> listReal=scheduleRealInfoRepository.scheduleByDateAndLine(xlbm, startDate);
 		for (int i = 0; i < list.size(); i++) {
 			List<ScheduleRealInfo>  newList=new ArrayList<ScheduleRealInfo>();
 			Singledata sin=list.get(i);
-			sin.setxL(BasicData.lineCode2NameMap.get(sin.getxL()));
+			
 			String jsy=sin.getJsy();
 			String clzbh=sin.getClzbh();
+			String xl=sin.getxL();
+			sin.setxL(BasicData.lineCode2NameMap.get(xl));
 			for (int j = 0; j < listReal.size(); j++) {
 				ScheduleRealInfo s=listReal.get(j);
-				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)){
+				if(s.getjGh().equals(jsy) && s.getClZbh().equals(clzbh)&&s.getXlBm().equals(xl)){
 					newList.add(s);
 				}
 			}
@@ -14,4 +14,6 @@ public interface CwjyService extends BaseService&lt;Cwjy, Integer&gt;{
 	Ylxxb bynbbm(Map<String, Object> map);
 	Map<String, Object> savejzl(Map<String, Object> map) throws Exception ;
+	
+	int checkNbbm(String nbbm);
 }
@@ -317,4 +317,13 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 		return yList;
 	}
+	@Override
+	public int checkNbbm(String nbbm) {
+		// TODO Auto-generated method stub
+		String sql="select count(*) from bsth_c_cwjy where nbbm ='"+nbbm+"'";
+		int cs=jdbcTemplate.queryForObject(sql, Integer.class);
+		
+		return cs;
+	}
+
 }
@@ -270,6 +270,7 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			List<Ylb> addList = new ArrayList<Ylb>();
 			List<Ylb> updateList = new ArrayList<Ylb>();
 			String ins="";
+			Map<String, Object> ylMap=new HashMap<String, Object>();
 			for (int x = 0; x < listpb.size(); x++) {
 				String type = "add";
 				boolean sfdc = true;
@@ -332,17 +333,23 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 							t.setCzyl(0.0);
 						}
 					}
-
+					
 					Double jzl = 0.0;
-					// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
-					for (int j = 0; j < ylxxList.size(); j++) {
-						Ylxxb ylxxb = ylxxList.get(j);
-						if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
-								&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
-//							jzl += ylxxb.getJzl();
-							jzl =Arith.add(jzl, ylxxb.getJzl());
+					//一人一车加注量只匹配一次
+					if(ylMap.get(map.get("clZbh").toString()+"_"+ map.get("jGh").toString())!=null){
+						
+					}else{
+						// 把当天的YLXXB的加注量设置为当天YLB的加注量（根据车号，驾驶员判断）
+						for (int j = 0; j < ylxxList.size(); j++) {
+							Ylxxb ylxxb = ylxxList.get(j);
+							if (map.get("clZbh").toString().equals(ylxxb.getNbbm())
+									&& map.get("jGh").toString().equals(ylxxb.getJsy())) {
+								jzl =Arith.add(jzl, ylxxb.getJzl());
+							}
 						}
+						ylMap.put(map.get("clZbh").toString()+"_"+ map.get("jGh").toString(),map.get("xlBm") == null ? "" : map.get("xlBm").toString());
 					}
+				
 					t.setJzl(jzl);
 					t.setNbbm(map.get("clZbh").toString());
@@ -435,8 +442,16 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 			// 获取车辆存油信息
 			List<Cyl> cylList = cylRepository.obtainCyl(nbbm,gsbm);
 			// 指定日期YLB信息
-			List<Ylb> ylbList =repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"nbbm,jcsx");
-			List<Ylb> iterator2=repository.obtainYl(rq,gsbm,fgsbm,"",nbbm,"jcsx");
+			List<Ylb> ylbList =new ArrayList<Ylb>();
+			List<Ylb> iterator2=new ArrayList<Ylb>();
+			if(xlbm.equals("")){
+				ylbList=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				iterator2=repository.obtainYl(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+			}else{
+				ylbList=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"jcsx");
+				iterator2=repository.obtainYl_eq(rq,gsbm,fgsbm,xlbm,nbbm,"nbbm,jcsx");
+			}
+			
 			for (int i=0;i<ylbList.size();i++) {
 				Ylb ylb = ylbList.get(i);
 				// 判断是否已经计算过
@@ -499,9 +514,6 @@ public class YlbServiceImpl extends BaseServiceImpl&lt;Ylb,Integer&gt; implements YlbS
 									t.setYh(yh);
 									t.setJzyl(nextJzyl);
 								}
-								
-								
-								
 							} else {
 								t.setCzyl(nextJzyl);
 								Double yh=0.0;
@@ -2983,16 +2983,22 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 //		String date = sdfMonth.format(org.apache.commons.lang.time.DateUtils.addDays(new Date(), -1));
 //		String date = "2016-09-20";
 //    	  System.out.println("shijian1:"+new Date());
-        List<Map<String, Object>> yesterdayDataList = scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
+    	
+        List<Map<String, Object>> yesterdayDataList = new ArrayList<Map<String, Object>>();
+        if(line.equals("")){
+        	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList(line, date,gsbm,fgsbm,nbbm);
+        }else{
+        	yesterdayDataList=scheduleRealInfoRepository.yesterdayDataList_eq(line, date,gsbm,fgsbm,nbbm);
+        }
+        		
 //        System.out.println("shijian2:"+new Date());
         //		List<ScheduleRealInfo> list = scheduleRealInfoRepository.scheduleByDateAndLine(line, date);
         List<ScheduleRealInfo> lists = scheduleRealInfoRepository.queryListWaybill3(jGh, nbbm, date,gsbm,fgsbm);
 //        System.out.println("shijian3:"+new Date());
         for (int x = 0; x < yesterdayDataList.size(); x++) {
-
             String jName = yesterdayDataList.get(x).get("jGh").toString();
             String clZbh = yesterdayDataList.get(x).get("clZbh").toString();
-
+            String xlbm  = yesterdayDataList.get(x).get("xlBm").toString();
 //            double jhlc = 0, yygl = 0, ksgl = 0, tempJhlc = 0, jcclc = 0;
             double addMileage = 0, remMileage = 0;
             Map<String, Object> map = new HashMap<String, Object>();
@@ -3001,7 +3007,8 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
             String bCompany="";
             List<ScheduleRealInfo> listS=new ArrayList<ScheduleRealInfo>();
             for (ScheduleRealInfo scheduleRealInfo : lists) {
-                if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)){
+                if(scheduleRealInfo.getjGh().equals(jName) && scheduleRealInfo.getClZbh().equals(clZbh)
+                		&& scheduleRealInfo.getXlBm().equals(xlbm)){
                     if (fage) {
                         //根据线路代码获取公司
                         company=scheduleRealInfo.getGsBm();
@@ -17,7 +17,7 @@ public interface ReportService {
 	List<ArrivalInfo> queryListClzd(String line,String zd,String zdlx,String fcsj,String ddsj);
 	List<StationRoute> queryStrinon(String line,int zd);
 	List<Map<String, Object>> queryInOutStrtion(String line,String date,int zd,String lzsj);
-	List<Map<String, String>>  sreachZd(String line,int zdlx,String zd);
+	List<Map<String, String>>  sreachZd(String line,int zdlx);
 	List<Object[]> historyMessageCount(String line, String date, String code);
@@ -252,18 +252,16 @@ public class ReportServiceImpl implements ReportService{
 		return list;
 	}
 	@Override
-	public List<Map<String, String>> sreachZd(String line, int zdlx,String zd) {
+	public List<Map<String, String>> sreachZd(String line, int zdlx) {
 		List<Map<String, String>> list = new ArrayList<>();
 		// TODO Auto-generated method stub
 		List<StationRoute> listSr=stationRoutRepository.findByLine(line,zdlx);
 		for (int i = 0; i < listSr.size(); i++) {
 			StationRoute t=listSr.get(i);
-			if(t.getStationName().indexOf(zd)!=-1){
-				Map<String, String> newMap=new HashMap<String,String>();
-				newMap.put("id",t.getStationCode());
-				newMap.put("text", t.getStationName());
-				list.add(newMap);
-			}
+			Map<String, String> newMap=new HashMap<String,String>();
+			newMap.put("id",t.getStationCode());
+			newMap.put("text", t.getStationName());
+			list.add(newMap);
 		}
 		return list;
 	}
@@ -11,7 +11,9 @@ spring.datasource.driver-class-name= com.mysql.jdbc.Driver
 spring.datasource.url= jdbc:mysql://127.0.0.1/control?useUnicode=true&characterEncoding=utf-8&useSSL=false
 spring.datasource.username= root
 spring.datasource.password=
-
+#spring.datasource.url= jdbc:mysql://192.168.168.117/pd_control?useUnicode=true&characterEncoding=utf-8&useSSL=false
+#spring.datasource.username= root
+#spring.datasource.password= root
 #DATASOURCE
 spring.datasource.max-active=100
 spring.datasource.max-idle=8
@@ -27,6 +29,7 @@ spring.datasource.validation-query=select 1
 ##
 #222.66.0.204:5555
 ##\u5B9E\u65F6gps
+http.gps.real.url= http://114.80.178.12:18080/transport_server/rtgps/
 #http.gps.real.url= http://27.115.69.123:8800/transport_server/rtgps/
 ##\u6D88\u606F\u4E0B\u53D1
-http.send.directive = http://192.168.168.201:9090/transport_server/message/
+http.send.directive = http://192.168.168.201:9090/transport_server/message/
 \ No newline at end of file
@@ -7,7 +7,7 @@
     }
     .line-select.selected {
-        height: 190px;
+        height: 210px;
     }
     .line-select .company {
@@ -123,11 +123,18 @@ $(function(){
 		submitHandler : function(f) {
 			var params = form.serializeJSON();
 			error.hide();
-			$post('/cwjy', params, function(res){
-				layer.msg('新增加油设置成功.');
-				$('#add_jysz').modal('hide');
-				refreshJsTree();
-			});
+			$get('/cwjy/checkNbbm',params,function(result){
+				if(result>0){
+					layer.msg('该车辆已经添加.');
+				}else{
+					$post('/cwjy', params, function(result){
+						layer.msg('新增加油设置成功.');
+						$('#add_jysz').modal('hide');
+						refreshJsTree();
+					});
+				}
+			})
+			
 		}
 	});
@@ -66,7 +66,7 @@
 								<span class="item-label" style="width: 60px;margin-left: 19px;">至: </span>
 								<input class="form-control" type="text" id="date2" style="width: 180px;"/>
 								<span class="item-label" style="width: 80px;">站点: </span>
-								<select class="form-control" id="zdlx" class="sreach-zd" > 
+								<select class="form-control sreach-zd" id="zdlx"  > 
 										<option value="">请选择</option>
 										<option value="0">上行</option>
 										<option value="1">下行</option>
@@ -426,55 +426,31 @@
 				});
 			}
 		})
+		$(".sreach-zd").on("change",initZd);
+		var status=false;
-		$(".sreach-zd").click(function(){
+		function initZd(){
 			var line = $("#line").val();
 			var zdlx = $("#zdlx").val();
+			console.log(line+"===="+zdlx);
 			if(line==null|| line =="" || zdlx ==null || zdlx==""){
-				
 			}else{
-				$('#zd').select2({
-					placeholder: '搜索站点...',
-					ajax: {
-						url: '/report/sreachZd',
-						dataType: 'json',
-						delay: 150,
-						data: function(params){
-							return{line: line,zdlx:zdlx,zd: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('/report/sreachZd',{line: line,zdlx:zdlx},function(result){
+					var zdList=result;
+					if(status){
+						$("#zd").select2("destroy").html('');
 					}
-				});
+					console.log(zdList[0]["id"]);
+					var datas=[];
+					datas.push({id:" ",text:"全部"});
+					for(var i=0;i<zdList.length;i++){
+						datas.push({id: zdList[i]["id"], text: zdList[i]["text"]});
+					}
+					initPinYinSelect2('#zd',datas,'');
+					status=true;
+				})
 			}
-		})
-		
-		
+		}
 		$("#export").on("click",function(){
 			var rq=$("#date").val();
@@ -306,4 +306,7 @@ span.signal-state-speed-limit{
 .home-gps-table dl.offline dd:nth-of-type(1) a{
     color: #a3a2a2;
+}
+.uk-tab>li:nth-child(n+2)>a{
+    margin-left: 0 !important;
 }
 \ No newline at end of file
@@ -17,12 +17,12 @@
 }
 .line_schedule .footer-chart {
-    height: 243px;
+    height: 233px;
     margin-top: 5px;
 }
 .line_schedule .uk-grid.top-container {
-    height: calc(100% - 260px);
+    height: calc(100% - 250px);
     margin-top: 5px;
     overflow: hidden;
 }
@@ -127,7 +127,7 @@
 }
 .schedule-body {
-    height: calc(100% - 37px);
+    height: calc(100% - 31px);
     background: #fff;
 }
 .north {
-    height: 120px;
+    /*height: 120px;*/
     position: relative;
     transition: all .3s ease;
+    padding-bottom: 0;
 }
 .north.main {
     background: linear-gradient(to right, #082F4A, #125688, #0a3f64);
     /*background-image: url('/assets/img/title-bg.jpg');*/
+    padding-bottom: 0;
 }
 .north.monitor {
@@ -65,10 +67,10 @@
 }
 .north .north-tabs {
-    position: absolute;
     width: 100%;
     bottom: 1px;
     margin-left: -14px;
+    margin-top: 35px;
 }
 .north .north-tabs .uk-tab {
@@ -81,7 +83,7 @@
 }
 .north .north-tabs .uk-tab > li.tab-line > a {
-    padding: 8px 0px 8px 12px;
+    padding: 8px 0px 8px 17px;
 }
 .north .north-tabs .uk-tab > li > a:hover,
@@ -352,4 +354,15 @@
 .user_detail_tip .qtip-content{
     width: 300px;
     height: 220px;
+}
+
+.op-beijingtime-time{
+    padding-left: 0px;
+    width: 107px;
+}
+
+.op-beijingtime-time>span{
+    font-size: 18px !important;
+    font-family: Microsoft Yahei !important;
+    color: blue !important;
 }
 \ No newline at end of file
@@ -55,6 +55,9 @@
               </li>
               {{/each}}
             </ul>
+            <a class="uk-navbar-brand op-beijingtime-time" title="每次秒数到0与服务器同步一次，睡眠状态唤醒会短暂异常，可鼠标右击横幅任意区域立刻同步！">
+                <span></span>
+            </a>
             <div class="uk-navbar-content uk-navbar-flip  uk-hidden-small" style="padding-left: 0;">
                 <div class="uk-button-group">
                     <button class="uk-button uk-button-danger exit-system">退出线调</button>
@@ -169,8 +169,8 @@ var disabled_submit_btn = function (form) {
 function showUpdateDescription() {
     //更新说明
     var updateDescription = {
-        date: '2017-05-12',
-        text: '<h5>现在班次调整时，备注是必填项</h5><h5>现在中途更换设备后，需要刷新缓存数据后，再刷新线调页面。</h5><h5>分班套跑车辆将在上午最后一个班次完成后发送线路切换指令。捕捉到出场信号时也会切换至出场班次所在线路，驾驶员请求出场时候也会同步一次状态</h5><h5>修复了一些其他问题。</h5>'
+        date: '2017-05-16',
+        text: '<h5>菜单栏加入了服务器时间</h5>'
     };
     var storage = window.localStorage
+/**
+ * 工具栏上的时钟
+ * @type {{}}
+ */
+var gb_second_timer = (function () {
+
+    var now;
+    var _this;
+    var secondTimer;
+    var contextFlag;
+
+    var init = function () {
+        _this = $('.op-beijingtime-time>span')[0];
+        getServerTime(function (time) {
+            now = time;
+            $('div.north').bind("contextmenu", function () {
+                contextFlag = true;
+            });
+            setTime();
+
+            secondTimer = window.setInterval(function () {
+                if(0 == now.getSeconds() || true == contextFlag){
+                    minuteTimer();
+                    contextFlag = false;
+                }
+
+                now = new Date(now.getTime() + 1e3);
+                setTime();
+            }, 1e3);
+        });
+    };
+
+    var getServerTime = function (callback) {
+        function oncallback(jqXHR) {
+            var time = jqXHR && jqXHR.getResponseHeader("Date");
+            if (time)
+                callback(new Date(time))
+        }
+
+        if ("function" == typeof callback)
+            $.ajax({
+                url: "/real_control_v2/assets/imgs/time.gif",
+                type: "HEAD"
+            }).done(function (data, textStatus, jqXHR) {
+                oncallback(jqXHR)
+            }).fail(function (jqXHR, textStatus, errorThrown) {
+                oncallback(jqXHR)
+            })
+    };
+
+    var timeFormat = function(str) {
+        return ("0" + str).slice(-2)
+    };
+
+    var setTime = function () {
+        _this.innerHTML = timeFormat(now.getHours()) + ':' + timeFormat(now.getMinutes()) + '.' + timeFormat(now.getSeconds());
+    };
+
+    var minuteTimer = function () {
+        getServerTime(function(time) {
+            now = time;
+            setTime()
+        })
+    };
+
+    window.setTimeout(init, 6000);
+})();
 \ No newline at end of file
@@ -17,6 +17,7 @@ var gb_tabs = (function() {
             $('.north-tabs').html(tabHtmlStr);
             $('.main-container').html(tabContentHtmlStr);
+            setTimeout(renderStyle, 4000);
             //地图选项卡初始点击
             $('#north_tabs_map_btn').one('click', function () {
                 if(typeof(gb_map_overlay_mge)!="undefined"){
@@ -37,6 +38,15 @@ var gb_tabs = (function() {
         });
     };
+    function renderStyle(){
+        var rows = parseInt($('.north-tabs').height() / 32);
+        if(rows > 1){
+            var contHeight = 120 + ((rows - 1) * 36 - 15);
+            $('.main-container').css('height', 'calc(100% - '+contHeight+'px)');
+            $('.north .north-tabs').css('margin-top', '20px');
+        }
+    }
+
     //文件载入完毕
     res_load_ep.emitLater('load_tab');
@@ -13,7 +13,7 @@ var gb_safe_driv = (function () {
         'A7': '与人交谈'
     };
-    var path = 'http://180.166.5.82:9988/CurrentSafeDriving/';
+    var path = 'http://118.178.187.115/CurrentSafeDriving/';
     var $wrap = $('.safe_driv_pop_wrap');
     var max = 5;
@@ -163,6 +163,7 @@
 <!-- north js -->
 <script src="/real_control_v2/js/north/toolbar.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/north/tabs.js" merge="custom_js"></script>
+<script src="/real_control_v2/js/north/second_timer.js" merge="custom_js"></script>
 <!-- home js -->
 <script src="/real_control_v2/js/home/layout.js" merge="custom_js"></script>
 <script src="/real_control_v2/js/home/line_panel.js" merge="custom_js"></script>