懒得写备注

潘钊
1 parent a74f9f1b
Showing 22 changed files with 656 additions and 84 deletions
src/main/java/com/bsth/controller/UserController.java
src/main/java/com/bsth/controller/realcontrol/ScheduleRealInfoController.java
src/main/java/com/bsth/entity/realcontrol/ScheduleRealInfo.java
src/main/java/com/bsth/service/realcontrol/ScheduleRealInfoService.java
src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java
src/main/java/com/bsth/vehicle/directive/service/DirectiveServiceImpl.java
src/main/java/com/bsth/vehicle/directive/util/HttpUtils.java
src/main/resources/static/assets/img/logo_text.png
src/main/resources/static/assets/js/common.js
src/main/resources/static/index.html
src/main/resources/static/pages/control/line/css/lineControl.css
src/main/resources/static/pages/control/line/index.html
src/main/resources/static/pages/control/line/js/alone.js
src/main/resources/static/pages/control/line/js/drawSvg.js
src/main/resources/static/pages/control/line/js/homeMenu.js
src/main/resources/static/pages/control/line/js/keyboardListen.js
src/main/resources/static/pages/control/line/js/main.js
src/main/resources/static/pages/control/line/js/rightMenu.js
src/main/resources/static/pages/control/line/js/webSocketHandle.js
src/main/resources/static/pages/control/line/temps/alone_tp.html
@@ -14,6 +14,7 @@ import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.servlet.ModelAndView;
 import com.bsth.entity.sys.SysUser;
+import com.bsth.security.util.SecurityUtils;
 @RestController
 @RequestMapping("user")
@@ -58,4 +59,9 @@ public class UserController extends BaseController&lt;SysUser, Integer&gt;{
 		}
 		return new ModelAndView("/");
 	}
+	
+	@RequestMapping("/currentUser")
+	public SysUser currentUser(){
+		return SecurityUtils.getCurrentUser();
+	}
 }
@@ -186,6 +186,18 @@ public class ScheduleRealInfoController extends BaseController&lt;ScheduleRealInfo,
 	/**
 	 * 
+	 * @Title: schInfoFineTune 
+	 * @Description: TODO(发车信息微调) 
+	 * @param @param map
+	 * @throws
+	 */
+	@RequestMapping(value = "/schInfoFineTune", method = RequestMethod.POST)
+	public Map<String, Object> schInfoFineTune(@RequestParam Map<String, String> map){
+		return scheduleRealInfoService.schInfoFineTune(map);
+	}
+	
+	/**
+	 * 
 	 * @Title: trustStatus @Description: TODO(线路托管状态) @param @param lineCodes
 	 * 线路编码 @throws
 	 */
@@ -544,4 +544,49 @@ public class ScheduleRealInfo {
 		this.sflj = sflj;
 	}
+	/**
+	 * 
+	 * @Title: setFcsjAll 
+	 * @Description: TODO(设置计划发车时间) 
+	 * @throws
+	 */
+	public void setFcsjAll(String fcsj){
+		try {
+			this.fcsjT = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + fcsj).getTime();
+			this.fcsj = fcsj;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: setFcsjActualAll 
+	 * @Description: TODO(设置实际发车时间) 
+	 * @throws
+	 */
+	public void setFcsjActualAll(String fcsjActual){
+		try {
+			this.fcsjActualTime = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + fcsjActual).getTime();
+			this.fcsjActual = fcsjActual;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	}
+	
+	/**
+	 * 
+	 * @Title: setFcsjActualAll 
+	 * @Description: TODO(设置实际终点时间) 
+	 * @throws
+	 */
+	public void setZdsjActualAll(String zdsjActual){
+		try {
+			this.zdsjActualTime = sdfyyyyMMddHHmm.parse(sdfyyyyMMdd.format(this.scheduleDate) + " " + zdsjActual).getTime();
+			this.zdsjActual = zdsjActual;
+		} catch (ParseException e) {
+			e.printStackTrace();
+		}
+	}
+	
 }
@@ -76,4 +76,6 @@ public interface ScheduleRealInfoService extends BaseService&lt;ScheduleRealInfo, L
 	Map<String, Object> spaceAdjust(Long[] ids, Integer space);
+	Map<String, Object> schInfoFineTune(Map<String, String> map);
+
 }
@@ -241,7 +241,7 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		t.setScheduleDate(new Date());
 		t.setCreateBy(user);
 		t.syncTime();
-
+		t.setSflj(true);
 		Map<String, Object> map = super.save(t);
 		// 加入缓存
@@ -473,8 +473,9 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 				// 按发车时间排序
 				Collections.sort(list, new ScheduleBuffer.ScheduleComparator());
-				// 以第一个待发时间为起点，调整间隔
-				Long st = list.get(0).getDfsjT()
+				// 以第一个实际发车/待发时间为起点，调整间隔
+				sch = list.get(0);
+				Long st = sch.getFcsjActualTime()==null?sch.getDfsjT():sch.getFcsjActualTime()
 					,plus = space * 60 * 1000L;
 				for(int i = 1; i < size; i ++){
@@ -495,4 +496,51 @@ public class ScheduleRealInfoServiceImpl extends BaseServiceImpl&lt;ScheduleRealInf
 		}
 		return rs;
 	}
+
+	@Override
+	public Map<String, Object> schInfoFineTune(Map<String, String> map) {
+		Map<String, Object> rs = new HashMap<>();
+		try {
+			Long id = Long.parseLong(map.get("id"));
+			//班次类型
+			String bcType = map.get("bcType");
+			//车辆自编号
+			String clZbh = map.get("clZbh");
+			//计划发车时间
+			String fcsj = map.get("fcsj");
+			//实际发车时间
+			String fcsjActual = map.get("fcsjActual");
+			//驾驶员
+			String[] jsy = map.get("jsy").split("/");
+			//售票员
+			String[] spy = map.get("spy").split("/");
+			//实际终点时间
+			String zdsjActual = map.get("zdsjActual");
+			//备注
+			String remarks = map.get("remarks");
+			
+			ScheduleRealInfo sch = ScheduleBuffer.findOne(id);
+			if(null != sch){
+				sch.setBcType(bcType);
+				sch.setClZbh(clZbh);
+				sch.setFcsjAll(fcsj);
+				sch.setFcsjActualAll(fcsjActual);
+				sch.setZdsjActualAll(zdsjActual);
+				sch.setjGh(jsy[0]);
+				sch.setjName(jsy[1]);
+				sch.setsGh(spy[0]);
+				sch.setsName(spy[1]);
+				sch.setRemarks(remarks);
+			}
+			
+			ScheduleBuffer.persistentList.add(sch);
+			
+			rs.put("status", ResponseCode.SUCCESS);
+			rs.put("t", sch);
+		} catch (Exception e) {
+			logger.error("", e);
+			rs.put("status", ResponseCode.ERROR);
+		}
+		return rs;
+	}
 }
@@ -281,7 +281,7 @@ public class DirectiveServiceImpl extends BaseServiceImpl&lt;Directive60, Integer&gt; 
 		}else{
 			logger.error("send60 upDownChange error, code: " + code);
 		}
-		return 0;
+		return code;
 	}
 	/**
@@ -2,6 +2,7 @@ package com.bsth.vehicle.directive.util;
 import java.io.IOException;
+import org.apache.http.client.config.RequestConfig;
 import org.apache.http.client.methods.CloseableHttpResponse;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.entity.StringEntity;
@@ -34,8 +35,15 @@ public class HttpUtils {
 		try{
 			httpClient = HttpClients.createDefault();
+			//超时时间
+			RequestConfig requestConfig = RequestConfig.custom()  
+			        .setConnectTimeout(3000).setConnectionRequestTimeout(1000)  
+			        .setSocketTimeout(3000).build();
+			
 			HttpPost post = new HttpPost(Consts.SEND_DIRECTIVE_URL);
+			post.setConfig(requestConfig);
+			
 			post.setEntity(new StringEntity(jsonStr, "utf-8"));
 			CloseableHttpResponse response = httpClient.execute(post);
@@ -114,7 +114,7 @@ function initPinYinSelect2(selector, data, cb){
 		    })
 		});
-		cb && cb();
+		cb && cb($(selector));
 	});
 	return $(selector);
@@ -108,6 +108,17 @@ tr.row-active td {
 .page-content.active{
 	display: block !important; 
 }
+
+.page-header.navbar .page-logo {
+        width: 335px;
+}
+
+.page-header.navbar .page-logo .logo-default {
+       margin: 0;
+}
+.page-header.navbar .top-menu .navbar-nav>li.dropdown.open .dropdown-toggle {
+    background-color: #284a99;
+}
 </style>
 <!-- ocLazyLoading载入文件的位置 -->
@@ -115,28 +126,18 @@ tr.row-active td {
 </head>
 <body class="page-container-bg-solid page-header-fixed page-sidebar-closed-hide-logo page-sidebar-fixed">
-    <div class="page-header navbar navbar-fixed-top">
+    <div class="page-header navbar navbar-fixed-top" style="background: #23438e;">
         <div class="page-header-inner ">
             <!-- LOGO -->
             <div class="page-logo">
                 <a href="index.html">
-                    <img src="" alt="logo" class="logo-default" /> </a>
+                    <img src="/assets/img/logo_text.png" alt="logo" class="logo-default" /> </a>
                 <div class="menu-toggler sidebar-toggler">
                 </div>
             </div>
             <!-- END LOGO -->
             <a href="javascript:;" class="menu-toggler responsive-toggler" data-toggle="collapse" data-target=".navbar-collapse"> </a>
             <div class="page-top">
-                <form class="search-form" action="page_general_search_2.html" method="GET">
-                    <div class="input-group">
-                        <input type="text" class="form-control input-sm" placeholder="Search..." name="query">
-                        <span class="input-group-btn">
-                                <a href="javascript:;" class="btn submit">
-                                    <i class="fa fa-search"></i>
-                                </a>
-                            </span>
-                    </div>
-                </form>
                 <div class="top-menu">
                     <ul class="nav navbar-nav pull-right">
                     	<!-- 信息通知区 -->
@@ -158,7 +159,7 @@ tr.row-active td {
                         </li>
                         <li class="dropdown dropdown-user dropdown-dark">
                             <a href="javascript:;" class="dropdown-toggle" data-toggle="dropdown" data-hover="dropdown" data-close-others="true">
-                                <span class="username username-hide-on-mobile" style="vertical-align: middle;">潘钊 <i class="fa fa-user"></i></span>
+                                <span id="indexTopUName" class="username username-hide-on-mobile" style="vertical-align: middle;"> <i class="fa fa-user"></i></span>
                             </a>
                             <ul class="dropdown-menu dropdown-menu-default">
                                 <li>
@@ -301,12 +302,12 @@ tr.row-active td {
 <!-- angularJS相关库 -->
 <!-- 这个是基于angularjs 1.4.10修改的版本，主要是修改了history控制部分，用于兼容route和pjax的同时操作history的冲突 -->
 <script src="/assets/js/angular.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-resource/angular-resource.min.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-touch/angular-touch.min.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js" data-autocephaly=1></script>
-<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" data-autocephaly=1></script>
+<script src="/assets/bower_components/angular-resource/angular-resource.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-sanitize/angular-sanitize.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-touch/angular-touch.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-ui-router/release/angular-ui-router.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/oclazyload/dist/ocLazyLoad.min.js" data-exclude=1></script>
+<script src="/assets/bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js" data-exclude=1></script>
 <!-- schedule计划调度AngularJS模块主JS -->
 <script src="/pages/scheduleApp/module/main.js" data-exclude=1></script>
@@ -320,6 +321,10 @@ var pjaxContainer = &#39;#pjax-container&#39;
 	,angJsContainer = '#route-container';
 $(function(){
+	$.get('/user/currentUser', function(user){
+		$('#indexTopUName').text(user.userName);
+	});
+	
 	//带 data-pjax 的链接由pjax加载
 	$(document).pjax('a[data-pjax]', pjaxContainer);
+.load-anim{
+	position: fixed;z-index: 9999999;width: 100%;height: 100%;
+	background: rgba(8, 47, 74, 0.89);top: 0;left: 0;
+}
+.load-anim .loader{
+    margin: auto !important;
+    position: absolute;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    right: 0;
+}
+
+
+.load8 .loader {
+  font-size: 10px;
+  text-indent: -9999em;
+  border-top: 1.1em solid rgba(255, 255, 255, 0.2);
+  border-right: 1.1em solid rgba(255, 255, 255, 0.2);
+  border-bottom: 1.1em solid rgba(255, 255, 255, 0.2);
+  border-left: 1.1em solid #ffffff;
+  -webkit-animation: load8 1.1s infinite linear;
+  animation: load8 1.1s infinite linear;
+}
+.load8 .loader,
+.load8 .loader:after {
+  border-radius: 50% !important;
+    width: 8em;
+    height: 8em;
+}
+@-webkit-keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+@keyframes load8 {
+  0% {
+    -webkit-transform: rotate(0deg);
+    transform: rotate(0deg);
+  }
+  100% {
+    -webkit-transform: rotate(360deg);
+    transform: rotate(360deg);
+  }
+}
+
+
 label {
 	max-width: none;
 }
@@ -220,7 +272,7 @@ body{
 }
 .card_wrap{
-	height: 268px;
+	min-height: 268px;
 	text-align: center;
 }
@@ -425,7 +477,7 @@ body{
 .station_text{
 	writing-mode: tb;
-	letter-spacing: -2.6px;
+	/* letter-spacing: -2.6px; */
 }
 .station_text:hover{
@@ -877,6 +929,10 @@ height: 400px;
 	.pb-table tr td:nth-child(9){
 		width: 55px;
 	}
+	
+	.station_text {
+	    letter-spacing: -2.6px;
+	}
 }
 .pb-table.head tr td{
@@ -911,6 +967,14 @@ height: 400px;
 	.pb-table tr td:nth-child(8){
 		width: 15%;
 	}
+	
+	.card_wrap .col-lg-2 .table td{
+		font-size: 12px;
+	}
+	
+	.station_text {
+	    letter-spacing: 1px;
+	}
 }
 /** 1310px 以下 */
@@ -946,6 +1010,9 @@ height: 400px;
 .table.pb-table>tbody>tr>td{
 	line-height: 1.43257;
+	white-space: nowrap;
+    overflow: hidden;
+    text-overflow: ellipsis;
 }
 .pic-panel{
@@ -2094,4 +2161,29 @@ tr._tr_active.active-line-no .in-badge{
 tr._tr_active.active-line-no .out-badge{
 	background: #67a3a8;
-}
 \ No newline at end of file
+}
+
+.sfsj-sch-detail{
+	list-style: none;
+    padding: 3px;
+   /*  color: black; */
+    font-family: 微软雅黑;
+}
+.sfsj-sch-detail li{
+    font-size: 14px;
+    margin: 6px 4px;
+}
+
+.sfsj-sch-detail li span{
+    display: inline-block;
+    width: 75px;
+    text-align: right;
+    /* color: #818181; */
+}
+
+.vehicDataTable a{
+    text-decoration: underline;
+    color: black;
+}
+
+
 <link href="css/lineControl.css" rel="stylesheet" type="text/css" />
 <link href="/metronic_v4.5.4/css/animate.min.css" rel="stylesheet" type="text/css" />
+<!-- 初始load动画 -->
+<div class="load-anim load8" >
+<div class="loader">Loading...</div>
+</div>
+
 <div class="portlet light portlet-fullscreen" style="transition: all .5s ease;padding: 0;" oncontextmenu=self.event.returnValue=false>
+
     <div class="portlet-title" style="padding: 17px 20px 0px 20px;border-bottom: none;margin-bottom: 0;background: linear-gradient(to right ,#082F4A, #125688,#0a3f64);padding-bottom: 5px;">
         <div class="caption col_hide_1280" style="color: #FFF;">
 			<i class="fa fa-life-ring" style="font-size: 22px;color: #FFF;"></i> <span
-				class="caption-subject bold" style="font-size: 24px;">线路调度系统</span>
+				class="caption-subject bold" style="font-size: 24px;">闵行公交线路调度系统</span>
 		</div>
 		<div class="col_hide_1440" style="color: white;font-size: 18px;position: absolute;right: 25px;top: 75px;">
-			panzhao，在线！ 
+			<span class="top_username"></span>，在线！ 
 		</div>
         <div class="actions col_hide_1280" >
 	        <div class="btn-group">
@@ -84,6 +90,7 @@
 	</div>
 <div id="tooltipShade" class="animated fadeIn"></div>
+<!-- 线路调度右键菜单 -->
 <menu class="menu" id="rightMenu">
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="outgoAdjust">
@@ -122,6 +129,11 @@
             <span class="menu-text">误点调整</span>
         </button>
     </li>
+    <li class="menu-item" >
+        <button type="button" class="menu-btn" data-method="schInfoFineTune">
+            <span class="menu-text">发车信息微调</span>
+        </button>
+    </li>
     <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="childTask">
@@ -137,13 +149,6 @@
         </button>
     </li>
     <li class="menu-separator"></li>
-<!--     <li class="menu-item" >
-        <button type="button" class="menu-btn" data-method="temporaryAdd">
-        	<i class="fa fa-plus"></i>
-            <span class="menu-text">临加班次</span>
-        </button>
-    </li> -->
-    <li class="menu-separator"></li>
     <li class="menu-item" >
         <button type="button" class="menu-btn" data-method="vehicAndPerAdjust">
         	<i class="fa fa-retweet"></i>
@@ -158,6 +163,37 @@
         </button>
     </li>
 </menu>
+<!-- 主页右键菜单 -->
+<menu class="menu" id="homeMenu">
+	<li class="menu-item disabled" id="menu-linename">
+        <button type="button" class="menu-btn">
+            <span class="menu-text">--- W2B-102 ---</span>
+        </button>
+    </li>
+    <li class="menu-item" >
+        <button type="button" class="menu-btn" data-method="sendPhrase">
+            <span class="menu-text">发送消息短语</span>
+        </button>
+    </li>
+    <li class="menu-separator"></li>
+    <li class="menu-item submenu">
+        <button type="button" class="menu-btn">
+            <span class="menu-text">车辆状态发送</span>
+        </button>
+        <menu class="menu">
+            <li class="menu-item">
+                <button type="button" class="menu-btn" data-method="changeUp">
+                    <span class="menu-text">上行营运</span>
+                </button>
+            </li>
+            <li class="menu-item">
+                <button type="button" class="menu-btn" data-method="changeDown">
+                    <span class="menu-text">下行营运</span>
+                </button>
+            </li>
+        </menu>
+    </li>
+</menu>
 </div>
 <div id="temps"></div>
@@ -169,6 +205,7 @@
 <script src="/pages/control/line/js/drawSvg.js"></script>
 <script src="/pages/control/line/js/data.js"></script>
 <script src="/pages/control/line/js/rightMenu.js"></script>
+<script src="/pages/control/line/js/homeMenu.js"></script>
 <script src="/pages/control/line/js/alone.js"></script>
 <script src="/pages/control/line/js/main.js"></script>
 <script src="/pages/control/line/js/console.js"></script>
@@ -179,10 +216,16 @@ var lineCodes = &#39;&#39; //全部线路编码字符串，由data.js初始化
 	, lineMap = {} //编码和线路详细对照，由data.js初始化;
 	,animationend = 'webkitAnimationEnd animationend';
 moment.locale('zh-cn');
+
+var cUser;
+//当前用户
+$.get('/user/currentUser', function(user){
+	cUser = user;
+	$('.portlet-fullscreen .top_username').text(cUser.userName);
+});
 $(function() {
  	//加载模板文件
  	getTemp('temps/home_tp.html');
- 	getTemp('temps/home_table_tp.html');
  	getTemp('temps/tooltip_tp.html');
  	getTemp('temps/alone_tp.html');
  	getTemp('temps/child_task_case_tp.html');
@@ -98,11 +98,6 @@ var _alone = (function(){
 		calculateLineNo: calculateLineNo
 	}
-	//实发时间单元格事件
-	$('.portlet-fullscreen').on('click', 'table.pb-table .sfsj-item', function(){
-		
-	});
-	
 	//计算行号
 	function calculateLineNo(table){
 		var rows = table.rows;
@@ -162,13 +157,22 @@ var _alone = (function(){
 		var tgTools = $('#tgTools_' + line);
 		tgTools.html(tgHtml[status]).data('status', status);
+		var array = $('#top-tabs-wrap a[data-id='+line+'] span zz');
+		
 		if(status == 0){
 			//托管Question
 			$('.tgQuestion', tgTools).popover(tgPopoverOps);
 			tgTools.removeClass('hand');
+			
+			$(array[2]).text('托管');
 		}
-		else
+		else{
 			tgTools.addClass('hand');
+			$(array[2]).text('');
+		}
+		
+		//tab 头改变
+		
 	}
 	function initRemarksPop(){
@@ -49,6 +49,10 @@ var drawSvg = (function(){
 				svg = drawSvgObject.init(lineId, data, container, w, 80);
 			//线路编码 和 首页SVG对照
 			homeSvgMapp[lineId] = svg;
+			//双击事件
+			$(svg[0]).dblclick(function(){
+				$('#top-tabs-wrap .nav-tabs a[data-id='+this.id+']').click();
+			});
 		},
 		initAloneSvg: function(lineId, data, container){
 			var w = $(document).width(),
@@ -371,5 +375,8 @@ var drawSvg = (function(){
 		}
 	}
+	//双击svg切换
+	//$('.line_chart svg').
+	
 	return drawSvgObject;
 })();
+var _home_menu = (function(){
+	
+	$('#homeMenu .menu-item button').on('click', function(){
+		var method = $(this).data('method');
+		if(!method)return;
+		var nbbm = $('.vehicDataTable tr._home_tr_active').data('nbbm');
+		
+		if(!nbbm){
+			layer.alert('无法获取车辆自编号，请尝试刷新页面！', {icon: 2, title: '异常'});
+			return;
+		}
+		menuObject[method](nbbm);
+	});
+	
+	//右键事件
+	$('.portlet-fullscreen').on('contextmenu', '.vehicDataTable tr td', function(e){
+			e.preventDefault();
+			$('.vehicDataTable tr._home_tr_active').removeClass('_home_tr_active');
+			$(this).parent().addClass('_home_tr_active');
+			showMenu(e.pageX, e.pageY + 3);
+			$(document).one('click', function() {
+				$('#homeMenu').removeClass('show-menu');
+			});
+	});
+	
+	
+    function showMenu(x, y) {
+		var menu = $('#homeMenu'),
+        	docWidth = $(document).width(), docHeight = $(document).height(),
+            menuHeight = menu.height(),
+            menuWidth = menu.width(),
+            offset = 12;
+        /* 边界 */
+        if (y > (docHeight - menuHeight)) {
+            y = docHeight - menuHeight - offset;
+        }
+
+        if (x > (docWidth - (menuWidth * 2))) {
+            x = docWidth - (menuWidth * 2) - offset;
+        }
+
+        menu.css('left', x + 'px')
+        		.css('top', y + 'px')
+        		.addClass('show-menu');
+    }
+    
+    var menuObject = {
+    	//发送消息短语
+    	sendPhrase: function(nbbm){
+    		layer.prompt({title: '请输入短语信息', formType: 2 , shift: 5
+				}, function(space){
+				$.post('/directive/phrase', {nbbm: nbbm, text: space}, function(rs){
+					if(rs == 0)
+						layer.msg('发送成功！');
+					else
+						layer.alert('发送短语信息失败！', {icon: 2, title: '操作失败'});
+				});
+			});
+    	},
+    	//上行营运
+    	changeUp: function(nbbm){
+    		$.post('/directive/upDownChange', {nbbm: nbbm, upDown: 0}, function(rs){
+    			if(rs == 0)
+					layer.msg('发送指令成功！');
+				else
+					layer.alert('发送指令失败！', {icon: 2, title: '操作失败'});
+    		});
+    	},
+    	//下行营运
+    	changeDown: function(nbbm){
+    		$.post('/directive/upDownChange', {nbbm: nbbm, upDown: 1}, function(rs){
+    			if(rs == 0)
+					layer.msg('发送指令成功！');
+				else
+					layer.alert('发送指令失败！', {icon: 2, title: '操作失败'});
+    		});
+    	}
+    }
+})();
+
 /** 键盘监听 */
 //禁止选中
-$(document).on('selectstart','table.pb-table', function(event){
+$(document).on('selectstart','table.pb-table,svg', function(event){
 	 event = window.event||event;  
 	 event.returnValue = false; 
 });
@@ -36,6 +36,10 @@
 			var homeHtmlStr = template('line_control_home_temp', {tabList: tabData});
 			$('#tab_home').html(homeHtmlStr);
+			//计算高度 40 页脚
+			var ah = $('#top-tabs-wrap .tab-content').height() - 40 - 5;
+			console.log(ah);
+			$('.card_wrap').css('height', ah / 3);
 			//滚动条
 			$('.card_wrap .table_wrap').slimscroll({
@@ -61,6 +65,7 @@
 		 		//按线路分组
 		 		var listMap = groupByLine(addList);
+		 		console.log('listMap', listMap);
 		 		for(var key in listMap){
 					var htmlStr = template('home_table_temp', {list: listMap[key]});
 					$('#tab_' + key).find('tbody').html(htmlStr);
@@ -69,16 +74,15 @@
 				}
 		 	});
-		 	
 		 	setTimeout(function(){
+		 		//打开GPS定时刷新
 		 		_data.startRefreshGpsTimer();
-		 	}, 300);
-		 /*	setTimeout(function(){
-		 		homeObject.refreshGps(function(add, update){
-			 		//将新增的点画到模拟图上
-			 		drawSvg.drawVehicle(add);
-			 	});
-		 	}, 300);*/
+		 		
+		 		setTimeout(function(){
+		 			//去掉loading
+			 		$('.load-anim').fadeOut();
+		 		}, 500);
+		 	}, 400);
 		}
 	}
@@ -88,7 +92,7 @@ setTimeout(function(){
 	var topTabs = '', tabPanels = '';
 	$.each(_data.getLines(), function(i, line){
 		topTabs += '<li ><a data-id="'+line.lineCode+'" href="#tab_line_'+line.lineCode+'" data-toggle="tab" '+
-					'aria-expanded="false"> '+line.name+'<span>（0,0 托管）</span> </a></li>';
+					'aria-expanded="false"> '+line.name+'<span>（<zz>0</zz>,<zz>0</zz> <zz>托管</zz>）</span> </a></li>';
 		tabPanels += '<div class="tab-pane fade tab_line" data-id="'+line.lineCode+'" id="tab_line_'+line.lineCode+'"></div>';
@@ -87,6 +87,21 @@ var _menu = (function() {
 		return $(firstCell).addClass('selected').parent().addClass('_tr_active active-line-no');
 	}
+	//实发时间单元格事件
+	var layerTip;
+	$('.portlet-fullscreen').on('click', 'table.pb-table .sfsj-item', function(){
+		var id = $(this).parent().data('id');
+		var sch = _data.getSchedulById(id);
+		
+		layerTip = layer.tips(template('sfsj_sch-detail-temp', sch), this, {
+			  tips: [2, '#709d94'],shift:5, time: 5000
+		});
+	});
+	
+	$('.portlet-fullscreen').on('dbclick', 'table.pb-table .sfsj-item', function(){
+		alert(11);
+	});
+	
 	//选中关联班次
 	function selCognateSch($ctr){
 		//选中关联班次
@@ -119,6 +134,10 @@ var _menu = (function() {
 		$('.pb-table tr td.' + ac).removeClass(ac);
 		$('.pb-table tr.selected').removeClass('selected');
 		$('.pb-table tr.next-sch').removeClass('next-sch');
+		if(layerTip){
+			layer.close(layerTip);
+			layerTip = null;
+		}
 	}
 	function resetAllState(){
 		$('.pb-table tr td.' + ac).removeClass(ac);
@@ -128,6 +147,10 @@ var _menu = (function() {
 		$('.pb-table.data tr td.selected[name=lineNo]').removeClass('selected');
 		prveSelRow = null;
+		if(layerTip){
+			layer.close(layerTip);
+			layerTip = null;
+		}
 	}
 	//根据起止行号选中多行
@@ -163,14 +186,34 @@ var _menu = (function() {
 			  title: '待发调整',
 			  success: function(){
 				  dictionaryUtils.transformDom($('#outgoAdjustForm .nt-dictionary'));
+				  //驾驶员
+				  $.get('/realSchedule/driver', {lineCode: schedul.xlBm}, function(rs){
+					initPinYinSelect2('#outgoAdjustForm select[name=jsy]', rs, function(that){
+						//默认选中
+						that.val(schedul.jGh + '/' + schedul.jName).change();
+					});
+				  });
+				  //售票员
+				  $.get('/realSchedule/conductor', {lineCode: schedul.xlBm}, function(rs){
+					initPinYinSelect2('#outgoAdjustForm select[name=spy]' , rs, function(that){
+						//默认选中
+						that.val(schedul.sGh + '/' + schedul.sName).change();
+					});
+				  });
+				  //车辆
+				  $.get('/realSchedule/cars', {lineCode: schedul.xlBm}, function(rs){
+					$('#outgoAdjustForm select[name=clZbh]').select2({data: rs}).val(schedul.clZbh).change();
+				  });
+					
 				  $('#outgoAdjustForm button.confirm').one('click', function(){
+					  
 					  var params = $('#outgoAdjustForm').serializeJSON();
 					  $post('/realSchedule/outgoAdjust', params, function(rs){
 						  layer.close(index);
-						  layer.msg('调整成功！');
 						  schedul.dfsj = rs.dfsj;
 						  schedul.remarks = rs.remarks;
 						  _alone.refreshSchedule(schedul);
+						  layer.msg('调整成功！');
 					  });
 				  });
 			  }
@@ -413,6 +456,64 @@ var _menu = (function() {
 			  				layer.alert('发送调度指令失败', {icon: 2, title: '操作失败'});
 			  		});
 			  });
+		},
+		//发车信息微调
+		schInfoFineTune: function(schedul){
+			var index = layer.open({
+			  type: 1,
+			  area: '630px',
+			  maxmin: true,
+			  content: template('schinfo_fine_tune_temp', schedul),
+			  shift: 5,
+			  title: '发车信息微调',
+			  success: function(){
+				  var ntds = $('#schinfoFineTune .nt-dictionary');
+				  dictionaryUtils.transformDom(ntds);
+				  	//驾驶员
+					$.get('/realSchedule/driver', {lineCode: schedul.xlBm}, function(rs){
+						initPinYinSelect2('#schinfoFineTune select[name=jsy]', rs, function(that){
+							//默认选中
+							that.val(schedul.jGh + '/' + schedul.jName).change();
+						});
+						
+					});
+					//售票员
+					$.get('/realSchedule/conductor', {lineCode: schedul.xlBm}, function(rs){
+						initPinYinSelect2('#schinfoFineTune select[name=spy]' , rs, function(rs){
+							initPinYinSelect2('#outgoAdjustForm select[name=spy]' , rs, function(that){
+								//默认选中
+								that.val(schedul.sGh + '/' + schedul.sName).change();
+							});
+						});
+					});
+					//车辆
+					$.get('/realSchedule/cars', {lineCode: schedul.xlBm}, function(rs){
+						$('#schinfoFineTune select[name=clZbh]').select2({data: rs}).val(schedul.clZbh).change();
+					});
+					
+					
+					//调整说明
+					$('#schinfoFineTune select[name=reason]').on('change', function(){
+					  var t = $(this).val();
+					  if(!t) return;
+					  var textarea = $('#schinfoFineTune textarea[name=remarks]');
+					  textarea.val(textarea.val() + t + ',');
+					});
+					//确定
+					$('#schinfoFineTune button.confirm').on('click', function(){
+						var params = $('form#schinfoFineTune').serializeJSON();
+						if(!$.trim(params.fcsj)){
+							layer.msg('计发时间不能为空！');
+							return;
+						}
+						$post('/realSchedule/schInfoFineTune', params, function(rs){
+							layer.close(index);
+							if(rs.t)
+								_alone.refreshSchedule(rs.t);
+						});
+					});
+			  }
+			});
 		}
 	}
@@ -8,7 +8,7 @@ setTimeout(function(){
 	$.post('/realSchedule/registerLine', {lineCodes: lineCodes}
 	,function(rs){
 		if(rs == 0){
-			layer.msg('注册线路成功！');
+			console.log('注册线路成功！');
 			initWebSocket();
 		}
 	});
@@ -212,7 +212,7 @@
    	 <div class="form-custom-row">
    	 	<div class="item">
    	 		<span class="item-label" style="width: 80px;">班次类型：</span>
-	   	 	<input class="form-control nt-dictionary" disabled data-code={{bcType}} data-group=ScheduleType>
+	   	 	<select class="form-control nt-dictionary" data-code={{bcType}} data-group=ScheduleType></select>
    	 	</div>
    	 </div>
    	 <div class="form-custom-row">
@@ -236,7 +236,7 @@
 	<div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">车辆编码: </span>
-			<input class="form-control" disabled value="{{clZbh}}"  name="clZbh">
+			<select class="form-control" value="{{clZbh}}"  name="clZbh"></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">路&nbsp;牌: </span>
@@ -258,11 +258,11 @@
      <div class="form-custom-row">
    	 	<div class="item">
 			<span class="item-label" style="width: 80px;">驾驶员: </span>
-			<input class="form-control" disabled value="{{jName}}" name="jName">
+			<select class="form-control" value="{{jName}}" name="jsy"></select>
    	 	</div>
 		<div class="item">
 			<span class="item-label" style="width: 80px;">售票员: </span>
-	   	 	<input class="form-control" disabled value="{{sName}}"  name="sName">
+	   	 	<select class="form-control" value="{{sName}}"  name="spy"></select>
    	 	</div>
    	 </div>
 	<hr>
@@ -351,6 +351,105 @@
 </form>
 </script>
+<!-- 发车信息微调 -->
+<script id="schinfo_fine_tune_temp" type="text/html">
+<form action="#" class="form-horizontal form-custom" id="schinfoFineTune">
+   <input value={{id}}  type="hidden" name="id">
+   <div class="form-body">
+	<div class="form-custom-row">
+   	 	<div class="item">
+			<span class="item-label" style="width: 80px;">发车站点: </span>
+			<input class="form-control" disabled value="{{qdzName}}"  name="qdzName">
+   	 	</div>
+		<div class="item">
+			<span class="item-label" style="width: 80px;">结束站点: </span>
+	   	 	<input class="form-control" disabled value="{{zdzName}}" name="zdzName">
+   	 	</div>
+   	 </div>
+
+	<div class="form-custom-row">
+   	 	<div class="item">
+			<span class="item-label" style="width: 80px;">车辆编码: </span>
+			<select class="form-control" value="{{clZbh}}"  name="clZbh"></select>
+   	 	</div>
+		<div class="item">
+			<span class="item-label" style="width: 80px;">路&nbsp;牌: </span>
+	   	 	<input class="form-control" disabled value="{{lpName}}" name="lpName">
+   	 	</div>
+   	 </div>
+
+	<div class="form-custom-row">
+   	 	<div class="item">
+			<span class="item-label" style="width: 80px;">驾驶员: </span>
+			<select class="form-control" value="{{jName}}" name="jsy"></select>
+   	 	</div>
+		<div class="item">
+			<span class="item-label" style="width: 80px;">售票员: </span>
+	   	 	<select class="form-control" value="{{sName}}"  name="spy"></select>
+   	 	</div>
+   	 </div>
+
+	 <div class="form-custom-row">
+   	 	<div class="item">
+			<span class="item-label" style="width: 80px;">计发时刻: </span>
+	   	 	<input type="time" class="form-control" value="{{fcsj}}" name="fcsj">
+   	 	</div>
+		<div class="item">
+			<span class="item-label" style="width: 80px;">实际时刻: </span>
+	   	 	<input type="time" class="form-control" value="{{fcsjActual}}"  name="fcsjActual">
+   	 	</div>
+   	 </div>
+
+	<div class="form-custom-row">
+   	 	<div class="item">
+			<span class="item-label" style="width: 80px;">到达时刻: </span>
+	   	 	<input type="time" class="form-control" value="{{zdsjActual}}" name="zdsjActual">
+   	 	</div>
+		<div class="item">
+			<span class="item-label" style="width: 80px;">班次类型: </span>
+	   	 	<select type="text" class="form-control nt-dictionary" data-group="ScheduleType" data-code="{{bcType}}"  name="bcType"></select>
+   	 	</div>
+   	 </div>     
+
+	<div class="form-custom-row">
+   	 	<div class="item full">
+			<span class="item-label" style="width: 80px;">调整说明: </span><br>
+				<select class="form-control" style="width: 100%;margin-top: 4px;" name="reason">
+					<option value="">请选择..</option>
+	          		<option value="配车">配车</option>
+					<option value="保养">保养</option>
+					<option value="故障">故障</option>
+					<option value="肇事">肇事</option>
+					<option value="路阻">路阻</option>
+					<option value="纠纷">纠纷</option>
+					<option value="缺人">缺人</option>
+					<option value="客稀">客稀</option>
+					<option value="缺车">缺车</option>
+					<option value="气候">气候</option>
+					<option value="援外">援外</option>
+					<option value="吊慢">吊慢</option>
+					<option value="抽减">抽减</option>
+					<option value="其他">其他</option>
+	        	</select>
+   	 	</div>
+   	 </div> 
+
+	<div class="form-custom-row">
+   	 	<div class="item full">
+	   	 	<textarea class="form-control" rows="4" placeholder="备注" name="remarks">{{remarks}}</textarea>
+   	 	</div>
+   	 </div> 
+
+	<hr>
+	<div class="form-custom-footer">
+		<button type="button" class="btn blue-madison confirm"> <i class="fa fa-check"></i> &nbsp;&nbsp;确&nbsp;&nbsp;定 </button>
+		<button type="button" class="btn layui-layer-close"> 取消 </button>
+	</div>
+   </div>
+</form>
+<br>
+</script>
+
 <script id="real_outgo_adjust_body_temp" type="text/html">
 <form action="#" class="form-horizontal form-custom" id="realOutgoAdjust">
   <input type="hidden" name="id" value={{id}}>
@@ -396,4 +495,18 @@
 		<button type="button" class="btn layui-layer-close"> 取消 </button>
 	</div>
 </form>
-</script>
 \ No newline at end of file
+</script>
+
+<script id="sfsj_sch-detail-temp" type="text/html">
+<ul class="sfsj-sch-detail">
+	<li><span>路牌名：</span>{{lpName}}</li>
+	<li><span>车辆编码：</span>{{clZbh}}</li>
+	<li><span>计发时刻：</span>{{fcsj}}</li>
+	<li><span>实发时刻：</span>{{fcsjActual}}</li>
+	<li><span>计达时刻：</span>{{zdsj}}</li>
+	<li><span>实达时刻：</span>{{zdsjActual}}</li>
+	<li><span>驾驶员：</span>{{jName}}</li>
+	<li><span>售票员：</span>{{sName}}</li>
+	<li><span>终点站：</span>{{zdzName}}</li>
+</ul>
+</script>
-<script id="home_table_temp" type="text/html">
-{{each list as obj i}}
-<tr>
-   <td style="width: 22%;"> {{obj.nbbm}} </td>
-   <td style="width: 17%;"> 
-	{{if obj.currSch != null}}
-		{{obj.currSch.lpName}}
-	{{else}}
-		无
-	{{/if}}
-   </td>
-   <td  style="width: 17%;"> {{obj.speed}} </td>
-   <td style="width: 22%;" > 暂无 </td>
-   <td style="width: 22%;" class="col_hide_1680">
-{{if obj.nextSch != null}}
-	{{obj.nextSch.dfsj}}
-{{else}}
-	无
-{{/if}}
-	</td>
-</tr>
-{{/each}}
-</script>
 \ No newline at end of file
@@ -43,7 +43,8 @@
 			<table
 				class="table table-striped table-bordered table-advance table-hover vehicDataTable"
 				style="table-layout: fixed;" id="tab_{{lineObj.lineCode}}_0">
-				<tbody></tbody>
+				<tbody>
+				</tbody>
 			</table>
 		</div>
 	</div>
@@ -118,6 +119,30 @@
 </div>
 </script>
+<script id="home_table_temp" type="text/html">
+{{each list as obj i}}
+<tr data-nbbm="{{obj.nbbm}}">
+   <td style="width: 22%;"> {{obj.nbbm}} </td>
+   <td style="width: 17%;"> 
+	{{if obj.currSch != null}}
+		{{obj.currSch.lpName}}
+	{{else}}
+		无
+	{{/if}}
+   </td>
+   <td  style="width: 17%;"> {{obj.speed}} </td>
+   <td style="width: 22%;" > 暂无 </td>
+   <td style="width: 22%;" class="col_hide_1680">
+{{if obj.nextSch != null}}
+	{{obj.nextSch.dfsj}}
+{{else}}
+	无
+{{/if}}
+	</td>
+</tr>
+{{/each}}
+</script>
+
 <script id="ctrl_f_search_temp" type="text/html">
 <div class="ctrl_f_search">
 	<select class="form-control pd90" id="ctrlFSearchSelect" ></select>