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

潘钊
2 parents 34509f59 c7ee0976
Showing 9 changed files with 174 additions and 61 deletions
src/main/resources/static/pages/base/timesmodel/add.html
src/main/resources/static/pages/base/timesmodel/css/index.css
src/main/resources/static/pages/base/timesmodel/edit-detail.html
src/main/resources/static/pages/base/timesmodel/gantt.html
src/main/resources/static/pages/base/timesmodel/js/add-form-wizard.js
src/main/resources/static/pages/base/timesmodel/js/base-fun.js
src/main/resources/static/pages/base/timesmodel/js/d3.relationshipgraph.js
src/main/resources/static/pages/base/timesmodel/js/gantt.js
src/main/resources/static/pages/base/timesmodel/reladplus.html
@@ -109,7 +109,7 @@
 								<!--  线路名称 (* 必填项) START -->
 								<div class="col-md-6">
 									<label class="control-label col-md-5">
-			          					<span class="required"> * </span> 线路名称&nbsp;：
+			          					<span class="required"> * </span> 线路名称&nbsp;&nbsp;&nbsp;&nbsp;：
 			                    	</label>
 				                 	<div class="col-md-6">
 				                 		<select name="lineName" class="form-control input-medium"   id="lineSelect"></select>
@@ -138,7 +138,7 @@
 							 </div>
 							 <!-- 客容总量 -->
 							<div class="form-group" id="krlGroup">
-								<label class="col-md-3 control-label"><span class="required"> * </span>客容总量&nbsp;&nbsp;：</label>
+								<label class="col-md-3 control-label"><span class="required"> * </span>客容总量&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;：</label>
 								<div class="col-md-9">
 									<input type="text" class="form-control input-medium" name="krl" id="krlInput" placeholder="客容总量">
 								</div>
@@ -118,7 +118,7 @@ text.alert-danger {
 .ganttSvgContainer {
     height: 400px;
-    overflow: auto;
+    overflow: hidden;
     position: relative;
 }
@@ -156,3 +156,72 @@ text.alert-danger {
 ::selection {
 	background:rgba(255, 255, 255, 0); 
 }
+
+.tipsdscontinue {
+	width:100%;
+	overflow: hidden;
+}
+
+.tipsdscontinue span {
+	display:block; 
+	float:left;
+	font-size:x-small;
+	line-height:10px;
+	padding: 2px 8px 4px 8px;
+}
+
+.dscrp {
+	width: 28%;
+    height: 6px;
+    padding: 8px 8px 8px 30px;
+    float: left;
+}
+
+.sx {
+	 background-color: #233f5d;
+}
+
+.xx {
+	 background-color: #31394a;
+}
+
+.tipso_bubble {
+	border: 1px #E91E63 solid;
+   /*  box-shadow: 10px 10px 5px #888888; */
+    box-shadow: 4px 4px 2px #888888;
+    background: #ffffff !important;
+}
+.tipso_arrow {
+	    /* border-color: transparent #E91E63 transparent transparent  !important;	 */
+}
+
+ 
+
+.ganttSvgContainer::-webkit-scrollbar {
+width:6px;
+height:6px;
+}
+.ganttSvgContainer::-webkit-scrollbar-button    {
+/* background-color:#FF7677; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-track     {
+/* background:#FF66D5; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-track-piece {
+/* background:#ff0000; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-thumb{
+background:rgba(197, 196, 196, 0.81);
+border-radius:10px !important;
+}
+.ganttSvgContainer::-webkit-scrollbar-corner {
+/* background:#82AFFF; */
+background:rgba(255, 255, 255, 0);
+}
+.ganttSvgContainer::-webkit-scrollbar-resizer  {
+/* background:#FF0BEE; */
+background:rgba(255, 255, 255, 0);
+}
 \ No newline at end of file
@@ -232,6 +232,7 @@
  * @params [obj--甘特图对象;d--当前修改班次对象数据] 
  */
 $('#editDetail_mobal').on('editDetailMobal.show', function(e,obj,nodeContext,bf,map){
+	debugger;
 	// 定义当前班次数据.
 	var dqbcData = nodeContext.dqbcData;
 	var ddbcminztjx = isUpdsgbctzsj(dqbcData.bcType) || isUpdsgbctzsj(nodeContext.nextData.bcType) ? dqbcData.STOPTIME : obj.configuration.dataMap.minztjx,lastminztjx = 0;
@@ -22,13 +22,14 @@
 	<!-- col-md-12 组件START -->
 	<div class="col-md-12">
 		<!-- portlet 组件START -->
-		<div class="portlet light porttlet-fit bordered">
+		<div class="portlet light porttlet-fit bordered" >
 			<!-- portlet-title组件START -->
 			<div class="portlet-title">
 				<!-- caption 组件START  -->
-				<div class="caption">
+				<div class="caption offset">
 					 <i class="fa fa-bar-chart font-dark"></i>
-					 <span class="caption-subject font-dark sbold uppercase">时刻表明细模型</span>
+					 <span class="caption-subject font-dark sbold uppercase skmxTitle"></span>
+					 <i class="fa fa-question-circle tipso-animation" style="color: rgba(158, 158, 158, 0.49);float: right;margin-left: 2px;"></i>
 				</div>
 				<!-- caption 组件END -->
 				<div class="tools" style="margin-left: 20px;margin-top: -10px;">
@@ -92,7 +93,7 @@
 			<!-- portlet-title组件END -->
 			<!-- portlet-body组件START -->
-			<div class="portlet-body">
+			<div class="portlet-body" id="scrllmouseEvent">
 				<!-- ganttSvgContainer SVG组件START -->
 				<div class="ganttSvgContainer">
 					<div id="ganttSvg"></div>
@@ -612,8 +612,9 @@ var SKBFormWizard = function() {
 					function submit(p,argus) {
 						storage.setItem("Gantt_AgursData",JSON.stringify(argus));
 						if(p!=null) {
-							console.log(JSON.stringify(p.rsLp));
 							storage.setItem('isDoDate',JSON.stringify({'rsD':p.rsD,'rsLP':p.rsLp}));
+						}else {
+							storage.setItem('isDoDate','');
 						}
 						loadPage('gantt.html');
 					}
@@ -269,11 +269,11 @@ var BaseFun = function() {
 					for(var a =0;a<carArray.length;a++) {
 						var _mmstartTime = baseF.getDateTime(gatps.earlyStartTime);// 获取早高峰开始时间点，并转为时间对象.
 						var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-(ca.length-parseInt(carArray[a].lpNo))*ma[0].fcjx));
-						var cctag = baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+						var cctag = gatps.linePlayType=='1' ? 0 : baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 						var kssj = baseF.getDateTime(time[0]); // 获取该时段的开始时间点，并转为时间对象.
 						var sjAndDir = baseF.getBeganTime(tempTime,kssj,type, ma,dataMap.zgfsjd,dataMap.wgfsjd,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag, dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 						kssj = sjAndDir.d1;
-						cctag = sjAndDir.dir;
+						cctag = gatps.linePlayType=='1' ? 0 : sjAndDir.dir;
 						var	endTime = baseF.getDateTime(
 								baseF.getEndStrt(type,dataMap.smbcsjArr,time[1],cctag));// 获取该时段的结束时间点，并转为时间对象.
 						var $_cfn = 0,$_cfw = 0;
@@ -287,7 +287,7 @@ var BaseFun = function() {
 								dataMap.dira[cctag],xhNo++,dataMap.cclcArr[cctag],gatps,0,dataMap.qdzArr[cctag],null,null,0,0));// 出场班次
 						var fxTagDm = 0;
 						while(kssj<=endTime) {
-							cctag = baseF.getfx(fxTagDm,cctag);
+							cctag = gatps.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 							fxTagDm = 1;
 							if(kssj> new Date (baseF.getCFDate(10,30)) && 
 									kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
@@ -556,7 +556,6 @@ var BaseFun = function() {
 			getRankRule : function(list,clzs,seMap) {
 				// 定义班型人次数据的长度.路牌数组长度.
 				var bxgs = list.data.length,clzslen = clzs.length;
-				
 				/**
 				 * 分配规则：获取总人数与车辆数的关系.返回值[-1-- 总人数小与车辆总数; 0--总人数等于车辆数; 1--总人数大与车辆数]
 				 * 
@@ -570,6 +569,7 @@ var BaseFun = function() {
 				 * */
 				switch(baseF.isrcNumEqualCarNum(list.rsa,clzslen)){
 					case -1:
+						baseF.fprclp(bxgs,list,clzs);
 						break;
 					case 0:
 						// 判断.班型人次是否为一种还是多种情况.
@@ -584,6 +584,7 @@ var BaseFun = function() {
 					case 1:
 						// 定义最大工时值.
 						var maxhoursV = parseFloat((((baseF.getDateTime(seMap.e) - baseF.getDateTime(seMap.s))/60000)/60).toFixed(2));
+						// var maxhoursV = 24;
 						// 定义总人数.
 						var rsdx = 0 ;
 						for(var n = 0 ; n < list.rsa.length;n++) {
@@ -598,9 +599,9 @@ var BaseFun = function() {
 							for(var a = b ; a<bxgs; a++) {
 								var pphours = list.data[a].hoursV;
 								var zhnum = pphours+dqhours;
-								if(zhnum>maxhoursV) 
+								if(zhnum>maxhoursV){
 									continue;
-								else if(zhnum<maxhoursV) {
+								}else if(zhnum<maxhoursV) {
 									zhHoursA.push({'bx1':list.data[b].type,'bx2':list.data[a].type,'countGs':zhnum});
 								}
@@ -608,43 +609,53 @@ var BaseFun = function() {
 						}
 						// 按照工时倒序排序.
 						zhHoursA.sort(function(a,b){return b.countGs-a.countGs});
-						var bxppA = zhHoursA[0],clp = null,dlp = null,pqobj = new Array(),bxpprc= new Array();
-						for(var m = 0 ; m<list.data.length;m++) {
-							if(list.data[m].type==bxppA.bx1 || list.data[m].type==bxppA.bx2) {
-								bxpprc.push(list.data[m].rs);
-								var czDx = list.data[m].rs - _rcDx;
-								if(czDx<0) {
-									var djbctype = null,absInt = Math.abs(czDx);
-									if(list.data[m].type==bxppA.bx1)
-										djbctype = bxppA.bx2;
-									else if(list.data[m].type==bxppA.bx2)
-										djbctype = bxppA.bx1;
-									var bqbc = zhHoursA[1];
-									for(var k  = 0 ; k<bxgs ; k++) {
-										if(list.data[k].type == djbctype)
-											list.data[k].rs = list.data[k].rs + Math.abs(czDx);
-										if(list.data[k].type==bqbc.bx1 || list.data[k].type==bqbc.bx2) {
-											if(bqbc.bx1==bqbc.bx2)
-												list.data[k].rs = list.data[k].rs -  absInt*2;
-											else if(bqbc.bx1!=bqbc.bx2)
-												list.data[k].rs = list.data[k].rs -  absInt;
+						if(zhHoursA.length>0) {
+							var bxppA = zhHoursA[0],clp = null,dlp = null,pqobj = new Array(),bxpprc= new Array();
+							for(var m = 0 ; m<list.data.length;m++) {
+								if(list.data[m].type==bxppA.bx1 || list.data[m].type==bxppA.bx2) {
+									bxpprc.push(list.data[m].rs);
+									var czDx = list.data[m].rs - _rcDx;
+									if(czDx<0) {
+										var djbctype = null,absInt = Math.abs(czDx);
+										if(list.data[m].type==bxppA.bx1)
+											djbctype = bxppA.bx2;
+										else if(list.data[m].type==bxppA.bx2)
+											djbctype = bxppA.bx1;
+										var bqbc = zhHoursA[1];
+										for(var k  = 0 ; k<bxgs ; k++) {
+											if(list.data[k].type == djbctype)
+												list.data[k].rs = list.data[k].rs + Math.abs(czDx);
+											if(list.data[k].type==bqbc.bx1 || list.data[k].type==bqbc.bx2) {
+												if(bqbc.bx1==bqbc.bx2)
+													list.data[k].rs = list.data[k].rs -  absInt*2;
+												else if(bqbc.bx1!=bqbc.bx2)
+													list.data[k].rs = list.data[k].rs -  absInt;
+											}
 										}
+										pqobj.push({'type':bqbc.bx1 + '</br></br>' + bqbc.bx2 ,'minueV':bqbc.countGs,'rs':absInt});
+									}
+									czDx = czDx < 0 ? 0:czDx;
+									list.data[m].rs =  czDx;
+									if(list.data[m].rs<=0) {
+										list.data.splice(m,1);
+										m--;
 									}
-									pqobj.push({'type':bqbc.bx1 + '</br></br>' + bqbc.bx2 ,'minueV':bqbc.countGs,'rs':absInt});
-								}
-								czDx = czDx < 0 ? 0:czDx;
-								list.data[m].rs =  czDx;
-								if(list.data[m].rs<=0) {
-									list.data.splice(m,1);
-									m--;
 								}
 							}
+							list.data.push({'type':bxppA.bx1 + '</br></br>' + bxppA.bx2 , 
+											'minueV' : bxppA.countGs,
+											'rs':Math.min.apply(null, bxpprc) <_rcDx ? Math.min.apply(null, bxpprc) : _rcDx});
+							if(pqobj.length>0)
+								list.data.push(pqobj[0]);
+						}else {
+							list.data.sort(function(a,b){return (b.rs*b.hoursV)-(a.rs*a.hoursV)});
+							var fpchuqugs = Math.abs(_rcDx) * parseFloat(list.data[0].hoursV);
+							var avglp = parseFloat((fpchuqugs / clzslen).toFixed(2));
+							list.data[0].rs = list.data[0].rs - Math.abs(_rcDx);
+							for(var c = 0 ;c <list.data.length;c++) {
+								list.data[c].hoursV = parseFloat(list.data[c].hoursV) + avglp;
+							}
 						}
-						list.data.push({'type':bxppA.bx1 + '</br></br>' + bxppA.bx2 , 
-										'minueV' : bxppA.countGs,
-										'rs':Math.min.apply(null, bxpprc) <_rcDx ? Math.min.apply(null, bxpprc) : _rcDx});
-						if(pqobj.length>0)
-							list.data.push(pqobj[0]);
 						list.data.sort(function(a,b){return b.rs-a.rs});
 						baseF.fprclp(list.data.length,list,clzs);
 						break;
@@ -749,13 +760,13 @@ var BaseFun = function() {
 					var _mmstartTime = baseF.getDateTime(map.earlyStartTime);// 获取早高峰开始时间点，并转为时间对象.
 					var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-(len - cara[c].lpNo)*saa[0].fcjx));
 					var kssj = dataMap.zgfsjd[0].st;
-					var cctag = baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+					var cctag = map.linePlayType=='1' ? 0 : baseF.getdefaultDir(dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 					var sjAndDir = baseF.getBeganTime(tempTime,kssj,null, saa,dataMap.zgfsjd,dataMap.wgfsjd,dataMap.pcxssjArr,dataMap.gfxxsjArr,cctag, dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 					kssj = sjAndDir.d1;
-					cctag = sjAndDir.dir;
+					cctag = map.linePlayType=='1' ? 0 : sjAndDir.dir;
 					var endTime = baseF.getDateTime(seMap.e),fxTagDm = 0 , xhNo = 3,$_cfn = 0,$_cfw = 0;
 					while(kssj<=endTime) {
-						cctag = baseF.getfx(fxTagDm,cctag);
+						cctag = map.linePlayType=='1' ? 0 : baseF.getfx(fxTagDm,cctag);
 						fxTagDm = 1;
 						if(kssj> new Date (baseF.getCFDate(10,30)) && 
 								kssj<new Date (baseF.getCFDate(12,0)) && $_cfn<1 ) {
@@ -783,6 +794,10 @@ var BaseFun = function() {
 				return rs;
 			},
+			/**
+			 * @description : (TODO) 该方法可去除.
+			 * 
+			 * */
 			getGfData : function (type, saa , cara , map, seMap ,dataMap,len,car) {
 				var _mmstartTime = null,kssj = null,end = null ,result = new Array(),fxTagDm = 0 , xhNo = 0;
 				if(type == 'mm') {
@@ -1093,11 +1108,11 @@ var BaseFun = function() {
 				return sortGattArray;
 			},
 			addbc : function(obj,lastObj,kssj,tzsj,xhNo,jsonArray,num) {
-				var cctag = baseF.dirDmToIndex(lastObj.xlDir);
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 :  baseF.dirDmToIndex(lastObj.xlDir);
 				var carArray = {'lp':lastObj.lp,'lpNo':lastObj.lpNo,'lpName':lastObj.lpName,'lpType':lastObj.lpType};
 				var ags =  {'tcc_id':lastObj.tcc,'skbName':lastObj.ttinfo,'lineName':lastObj.xl+'_'};
 				for(var t = 0 ; t<num;t++){
-					cctag = baseF.getfx(1,cctag);
+					cctag = obj.configuration.dataMap.map.linePlayType=='1'? 0: baseF.getfx(1,cctag);
 					var _xxsj = baseF.getxssj(obj.configuration.dataMap.zgfsjd,
 											obj.configuration.dataMap.wgfsjd,
 											kssj,
@@ -1172,7 +1187,7 @@ var BaseFun = function() {
 				var _mmstartTime = new Date(obj.configuration.dataMap.zgfsjd[0].st);
 				var tempTime = new Date(_mmstartTime.setMinutes(_mmstartTime.getMinutes()-
 						((parseInt(obj.configuration.dataMap.map.clzs)-parseInt(theCar)))*obj.configuration.stopAraay[0].fcjx));
-				var cctag = bf.getdefaultDir(obj.configuration.dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.getdefaultDir(obj.configuration.dataMap.smbcsjArr);// 获取出场类型 [0--上行出场；1--下行出场]
 				var kssj = new Date(obj.configuration.dataMap.zgfsjd[0].st); // 获取该时段的开始时间点，并转为时间对象.
 				var sjAndDir = bf.getBeganTime(tempTime,kssj,null, 
 							obj.configuration.stopAraay,
@@ -1181,7 +1196,7 @@ var BaseFun = function() {
 							obj.configuration.dataMap.pcxssjArr,
 							obj.configuration.dataMap.gfxxsjArr,cctag, obj.configuration.dataMap.ztjxA);// 计算当前路牌第一个首班时间点.
 				kssj = sjAndDir.d1;
-				cctag = sjAndDir.dir;
+				cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : sjAndDir.dir;
 				dqlpbc.push(bf.getbcObj(
 						kssj,obj.configuration.dataMap.ccsjArr[cctag],
 						car,obj.configuration.dataMap.bcTypeArr.bd,
@@ -1196,7 +1211,7 @@ var BaseFun = function() {
 								obj.configuration.dataMap.qdzArr[cctag],null,null,0,0));// 出场班次
 				var fxTagDm = 0;
 				for(var i = 0 ; i<numqs;i++) {
-					cctag = bf.getfx(fxTagDm,cctag);
+					cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.getfx(fxTagDm,cctag);
 					fxTagDm = 1;
 					var _xxsj = bf.getxssj(obj.configuration.dataMap.zgfsjd,
 							obj.configuration.dataMap.wgfsjd,kssj,
@@ -1242,11 +1242,13 @@ var RelationshipGraph = function () {
     		//console.log(tempa);
     		//console.log(tempa.upArr.concat(tempa.downArr).length);
     		// 5、均匀上行班次的发车间距.
-    		BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
+    		if(tempa.upArr.length>0)
+    			BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//var sxbc = BaseFun.jhfcjx(tempa.upArr,upDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//console.log('getDirBc---- '+tempa.downArr.length);
     		// 6、均匀下行班次的发车间距.
-    		BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
+    		if(tempa.downArr.length>0)
+    			BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//var xxbc = BaseFun.jhfcjx(tempa.downArr,downDir,zzsj,$_GlobalGraph.configuration.dataMap);
     		//console.log('jhfcjx---'+ xxbc.length);
     		//console.log(sxbc.concat(xxbc).length);
@@ -10,8 +10,28 @@
 	var objD = window.localStorage.isDoDate; 
 	// 获取表单参数配置数据.
 	var map  = JSON.parse(window.localStorage.Gantt_AgursData);
+	$('.skmxTitle').text( '【' + map.skbmc + '】' + '时刻表明细模型');
 	// 延迟500毫秒执行.
 	setTimeout(function(){
+		var offsetY = -parseInt($('.offset').offset().top)+16;
+		var offsetX = -parseInt($('.offset').offset().left)+50;
+		$('.tipso-animation').tipso({
+		      speed           : 100,
+		      background      : '#E91E63',
+		      color           : '#E91E63',
+		      position		  :'right',
+		      width           : 410,
+		      delay           : 400,
+		      animationIn	  : 'bounceIn',
+		      animationOut	  : 'bounceOut',
+		      offsetX         : offsetX,
+		      offsetY         : offsetY,
+		      content	      :'<div class="tipsdscontinue"> <span>图例：</span> <div class="dscrp sx"></div><span>：上行</span>  <div class="dscrp xx"></div> <span>：下行</span></br><div/></br>' +
+		      				   '<div class="tipsdscontinue"> <span>该模块支持鼠标拖拽、鼠标绘制(鼠标右键按下3S开始)框选功能.</span> <div/>' 
+		    
+		});
+		$('.tipso-animation').tipso('show');
+		setTimeout(function(){$('.tipso-animation').tipso('hide');},4000);
 		// 1、定义开始与结束时间点字符串.
 		var seMap = getStartAndEndDate(map);
 		// 2、获取开始与结束时间对象.
@@ -47,8 +67,6 @@
 		}else {
 			var jsonA = JSON.parse(objD);
-			console.log(jsonA.rsD);
-			console.log(jsonA.rsLP);
 			// 使用已有的时刻表明细数据渲染视图.
 			data = {'json':jsonA.rsD,'bxrcgs':null};
 			CSMap = {'gattA':null,'stopSpace': Math.round(map.zzsj/map.clzs),'maxCar':jsonA.rsLP};
@@ -153,8 +171,8 @@
 	 * @return 返回开始与结束时间字符串集合.
 	 * */
 	function getStartAndEndDate(map) {
-		return {'s':getMinDate(map.startStationFirstTime,map.endStationFirstTime),
-				'e':getMaxDate(map.startStationEndTime,map.endStationEndTime)}
+		return {'s': map.linePlayType=='1'? map.startStationFirstTime : getMinDate(map.startStationFirstTime,map.endStationFirstTime),
+				'e': map.linePlayType=='1'? map.startStationEndTime : getMaxDate(map.startStationEndTime,map.endStationEndTime)}
 	}
 	/**
@@ -676,4 +694,10 @@
 		layer.closeAll();
 		layer.msg('操作成功!已【'+ msg + '】!');
 	}
+	
+	$('#scrllmouseEvent').on('mousemove',function() {
+		$('.ganttSvgContainer').css('overflow','auto');
+	}).on('mouseleave',function() {
+		$('.ganttSvgContainer').css('overflow','hidden');
+	});
 })();
 \ No newline at end of file
@@ -102,7 +102,7 @@ $(&#39;#reladplus_mobal&#39;).on(&#39;reladplusMobal.show&#39;, function(e,obj,bf,cardata){
 			var zhbcA = bf.getLastTime(jsonArray,params.theCar);
 			if(zhbcA.length>0) {
 				var lastObj = zhbcA[0];
-				var cctag = bf.dirDmToIndex(lastObj.xlDir);
+				var cctag = obj.configuration.dataMap.map.linePlayType=='1' ? 0 : bf.dirDmToIndex(lastObj.xlDir);
 				// cctag = baseF.getfx(0,cctag);
 				// 定义停站时间
 				var	tzsj = obj.configuration.dataMap.ztjxA[cctag];