bsthlq <2519941818@qq.com>

李强
1 parent d7fda2e7
Showing 4 changed files with 70 additions and 13 deletions
src/main/resources/static/pages/base/timesmodel/gantt.html
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
@@ -71,6 +71,11 @@
                                 </a>
                             </li>
                             <li>
+                                <a href="javascript:" class="tool-action editlp">
+                                    <i class="fa fa-pencil"></i>&nbsp;修改路牌
+                                </a>
+                            </li>
+                            <li>
                                 <a href="javascript:" class="tool-action addlp">
                                     <i class="fa fa-plus"></i>&nbsp;添加路牌
                                 </a>
@@ -58,7 +58,7 @@ var BaseFun = function() {
 				var array = new Array();
 				if(len>0) {
 					for(var y = 0; y<len; y++) {
-						array.push({lp:null,lpNo:y+1,lpName:y+1,lpType:'普通路牌'});//添加一个路牌对象
+						array.push({lp:null,lpNo:y+1, parent :y+1, lpName:y+1,lpType:'普通路牌'});//添加一个路牌对象
 					};
 				}
 				return array;
@@ -348,8 +348,16 @@ var BaseFun = function() {
 						// 遍历班次数.
 						for(var i =0 ; i <jsonArray.length; i++) {
 							// 判断当期遍历的班次是否属于当前的路牌.
-							if(jsonArray[i].lpNo == lpNo)
+							if(jsonArray[i].lpNo == lpNo) {
+								jsonArray[i].lpName =  bxrclist[x].type + '_' + lpNo ;
 								lpbc.push(jsonArray[i]);
+							}
+								
+						}
+						for(var l = 0 ; l <cara.length;l++  ) {
+							if(cara[l].lpNo == lpNo) {
+								cara[l].lpName = bxrclist[x].type + '_' + lpNo ;
+							}
 						}
 						// 按照发车序号顺序排序.
 						lpbc.sort(function(a,b){return b.fcno-a.fcno});
@@ -376,8 +384,10 @@ var BaseFun = function() {
 					// 遍历班次数.
 					for(var x =0 ; x <jar.length; x++) {
 						// 判断当期遍历的班次是否属于当前的路牌.
-						if(jar[x].lpNo == lpNo_)
+						if(jar[x].lpNo == lpNo_) {
+							delete jar[x].fcint;
 							lpbc_.push(jar[x]);
+						}
 					}
 					// 按照发车序号顺序排序.
 					lpbc_.sort(function(a,b){return a.fcno-b.fcno});
@@ -521,7 +531,7 @@ var BaseFun = function() {
 				var fcno = 0,dxfno = 0,stas = false;
 				for(var b = 0 ; b < bc.length;b++) {
 					var fxdm = baseF.dirDmToIndex(bc[b].xlDir);
-					var car = {'lp':bc[b].lp, 'lpNo':bc[b].lpNo, 'lpName':bc[b].lpName, 'lpType':bc[b].lpType};
+					var car = {'lp':bc[b].lp, 'lpNo':bc[b].lpNo, 'lpName':bc[b].lpName, 'lpType':bc[b].lpType };
 					if(b==0) {
 						var dqbcfcsj = baseF.getDateTime(bc[b].fcsj);
 						result.push(baseF.getbcObj(
@@ -245,17 +245,46 @@ $(&#39;.aboutread&#39;).on(&#39;click&#39;,function() {
 			layer.closeAll();
 			// 执行选择框关闭函数.
 			RelationshipGraph.gClose();
-			// 执行均匀发车间隙函数.
+			// 执行调整班次函数.
 			RelationshipGraph.aboutread();
 		});
 	}else {
-		// 执行均匀发车间隙函数
+		// 执行调整班次函数
 		RelationshipGraph.aboutread();
 	}
 });
 /************************************************************************************************************************************************/
 /** 
+ * @description : (TODO) 修改路牌点击事件
+ * 
+ * @status OK.
+ ************************************************************************************************************************************************/
+$('.editlp').on('click',function() {
+	// 判断选择框是否存在.
+	if(RelationshipGraph.getFlagIndex()>0) {
+		// 关闭所有提示弹出层.
+		layer.closeAll();
+		layer.confirm('您正处于【批量班次操作】过程中...是否确定退出当前操作进行【修改路牌】!', {
+			btn : [ '确认提示并提交', '取消' ]
+		},function () {
+			// 关闭所有提示弹出层.
+			layer.closeAll();
+			// 执行选择框关闭函数.
+			RelationshipGraph.gClose();
+			// 执行修改路牌函数.
+			RelationshipGraph.editlpEvents();
+		});
+	}else {
+		// 执行修改路牌函数
+		RelationshipGraph.editlpEvents();
+	}
+});
+/************************************************************************************************************************************************/
+
+
+
+/** 
  * @description : (TODO) 监听保存数据事件.
  * 
  * @status OK. 
@@ -438,7 +467,7 @@ var createTooltip = function createTooltip(self) {
             count = keys.length,
             rows = [];
         var showKeys = self.configuration.showKeys;
-        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','lpName','lp','lpType',
+        var hiddenKeys = ['_PRIVATE_' ,'PARENTCOLOR', 'SETNODECOLOR', 'SETNODESTROKECOLOR','lpNo','parent','lp','lpType',
                           'jhlc','tcc','ttinfo','xl','isfb','qdz','zdz','isSwitchXl','bz','bcs',/*'fcno'*/];
         while (count--) {
             var element = keys[count];
@@ -459,7 +488,7 @@ var createTooltip = function createTooltip(self) {
                        		changeKey = '停息时间:';
                        else if(element=='xlDir')
                        		changeKey = '行驶方向:';
-                       else if(element=='parent')
+                       else if(element=='lpName')
                       		changeKey = '当前路牌:';
                        else if(element=='bcType')
                      		changeKey = '班次类型:';
@@ -607,7 +636,6 @@ var RelationshipGraph = function () {
 						   .attr('height', this.configuration.height + this.configuration.heightMargin)
 						   .attr('style', 'display: block')
 						   .append('g').attr("class", "gantt-chart");
-        	
         	// 创建时间线性区域
         	var x = d3.time
         			  .scale()
@@ -1197,6 +1225,7 @@ var RelationshipGraph = function () {
     		 $_GlobalGraph.configuration.taskTypes.push({'lp':null,'lpName':len+1,'lpNo':len+1,'lpType':'普通路牌'});
     		 // 添加路牌编码
     		 $_GlobalGraph.configuration.lpNoA.push(len+1);
+    		 $_GlobalGraph.configuration.lpNameA.push(len+1);
     		 // 修改图形高度
     		 $_GlobalGraph.configuration.height = $_GlobalGraph.configuration.lpNoA.length*60 + 240;
     		 // 修改初始化图形时间轴开始时间
@@ -1374,6 +1403,15 @@ var RelationshipGraph = function () {
     	}
     }, {
+    	key : 'editlpEvents',
+    	value : function() {
+    		// 弹出层mobal页面
+    		$.get('/pages/base/timesmodel/editlp.html', function(m){
+    			$(pjaxContainer).append(m);
+    			$('#editlp_mobal').trigger('editlpMobal.show',[$_GlobalGraph,BaseFun]);
+    		});
+    	}
+    }, {
     	key : 'checkAdd',
     	value : function checkAdd() {
     		var xl = $_GlobalGraph.configuration.dataMap.map.lineName.split('_');
@@ -1520,7 +1558,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setYValue',
     	value : function setYValue(obj) {
-        	return $_GlobalGraph.configuration.y(obj.parent) + $_GlobalGraph.configuration.offsetY;
+        	/*return $_GlobalGraph.configuration.y(obj.parent) + $_GlobalGraph.configuration.offsetY;*/
+    		return $_GlobalGraph.configuration.y(obj.lpName) + $_GlobalGraph.configuration.offsetY;
         }
     }, {
     	/**
@@ -1747,7 +1786,8 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setCirclecyV',
     	value : function setCirclecyV(obj) {
-        	return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 12;
+        	/*return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 12;*/
+    		return $_GlobalGraph.configuration.y(obj.lpName) +   $_GlobalGraph.configuration.offsetY + 12;
         }
     }, {
     	/**
@@ -1902,7 +1942,9 @@ var RelationshipGraph = function () {
     	 * */
     	key : 'setText04YV',
     	value : function setText04YV(obj) {
-    		return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 16;
+    		/*return $_GlobalGraph.configuration.y(obj.parent) +  $_GlobalGraph.configuration.offsetY + 16;*/
+    		return  $_GlobalGraph.configuration.y(obj.lpName) +$_GlobalGraph.configuration.offsetY + 16;
+    		
         }
     }, {
     	/**
@@ -378,7 +378,7 @@
 			ra.push(arr[i].lpNo);
 			name.push(arr[i].lpName);
 		}
-		return {'lpNoA':ra,'lpNameA':name};
+		return {'lpNoA':ra,'lpNameA':name,};
 	}
 	/**
 	 * @description : (TODO) 获取甘特图参数配置信息.