Merge branch 'minhang' into pudong

徐烜
2 parents 45829904 b880f6cd
Showing 12 changed files with 179 additions and 28 deletions
src/main/java/com/bsth/entity/oil/Ylxxb.java
src/main/java/com/bsth/repository/oil/YlxxbRepository.java
src/main/java/com/bsth/service/oil/impl/CwjyServiceImpl.java
src/main/java/com/bsth/service/report/impl/CulateMileageServiceImpl.java
src/main/resources/fatso/handle_real_ctl.js
src/main/resources/fatso/start.js
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
src/main/resources/static/pages/oil/jyglList.html
src/main/resources/static/pages/oil/list_ph.html
@@ -45,6 +45,9 @@ public class Ylxxb {
 	@Transient
 	private String fgsname;
  
+	@Transient
+	private Double zjzl;
+	
  
 	public Integer getId() {
 		return id;
@@ -184,5 +187,13 @@ public class Ylxxb {
 	public void setFgsname(String fgsname) {
 		this.fgsname = fgsname;
 	}
+	public Double getZjzl() {
+		return zjzl;
+	}
+	public void setZjzl(Double zjzl) {
+		this.zjzl = zjzl;
+	}
+	
+	
  
 }
@@ -20,7 +20,7 @@ public interface YlxxbRepository extends BaseRepository&lt;Ylxxb, Integer&gt;{
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nylx=?2 and gsdm like %?3%",nativeQuery=true)
 	List<Ylxxb> obtainYlxx(String rq,int nylx,String gsdm);
  
-	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and ssgs=?2",nativeQuery=true)
+	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and gsdm=?2",nativeQuery=true)
 	List<Ylxxb> checkYlxx(String rq,String gs);
  
 	@Query(value="SELECT * FROM bsth_c_ylxxb  where to_days(?1)=to_days(yyrq) and nbbm =?2 and jylx=1",nativeQuery=true)
@@ -31,6 +31,7 @@ import com.bsth.repository.oil.CwjyRepository;
 import com.bsth.repository.oil.YlxxbRepository;
 import com.bsth.service.impl.BaseServiceImpl;
 import com.bsth.service.oil.CwjyService;
+import com.bsth.util.Arith;
 import com.bsth.util.PageHelper;
 import com.bsth.util.PageObject;
  
@@ -314,7 +315,19 @@ public class CwjyServiceImpl extends BaseServiceImpl&lt;Cwjy,Integer&gt; implements Cw
 				 return t;
 			 }
 		});
-		
+		List<Ylxxb> list= ylxxbRepository.checkYlxx(rq, gsdm);
+		for (int i = 0; i < yList.size(); i++) {
+			Ylxxb t=yList.get(i);
+			Double zjzl=0.0;
+			for (int j = 0; j < list.size(); j++) {
+				Ylxxb y=list.get(j);
+				if(t.getNbbm().equals(y.getNbbm())){
+					zjzl=Arith.add(zjzl, y.getJzl());
+				}
+				
+			}
+			t.setZjzl(zjzl);
+		}
 		return yList;
 	}
  
@@ -529,11 +529,8 @@ public class CulateMileageServiceImpl  implements CulateMileageService{
 			if(!scheduleRealInfo.isSflj()){
 				if (scheduleRealInfo.getBcType().equals("in") 
 						|| scheduleRealInfo.getBcType().equals("out")|| scheduleRealInfo.getBcType().equals("ldks")) {
-					double jhlcOrig=scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig();
-					if(jhlcOrig-scheduleRealInfo.getJhlc()>0){
+					if(!scheduleRealInfo.isSflj()){
 						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlcOrig()==null?0:scheduleRealInfo.getJhlcOrig());
-					}else{
-						jcclc =Arith.add(jcclc, scheduleRealInfo.getJhlc()==null?0:scheduleRealInfo.getJhlc());
 					}
 				}
 			}
@@ -17,7 +17,7 @@ var pName = &#39;bsth_control&#39;
     , path = process.cwd()
     //根目录
     , root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-    , workspace = root.substr(0, root.indexOf(separator + pName))
+    , workspace = root.substr(0, root.lastIndexOf(separator + pName))
     //临时目录
     , dest = (workspace + separator + pName + '@fatso_copy')//.replace(/\//g, '\\')
     , _static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static';
@@ -22,7 +22,7 @@ var excludes = [&#39;scheduleApp&#39;, &#39;trafficManage&#39;, &#39;control&#39;]
 	,path = process.cwd()
 	//根目录
 	,root = path.substr(0, path.indexOf(separator + 'src'+separator+'main'))
-	,workspace = root.substr(0, root.indexOf(separator + pName))
+	,workspace = root.substr(0, root.lastIndexOf(separator + pName))
 	//临时目录
 	,dest = (workspace + separator + pName+'@fatso_copy')
 	,_static = separator + 'src'+separator+'main'+separator+'resources'+separator+'static'
@@ -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) 获取甘特图参数配置信息.
@@ -69,7 +69,7 @@
 								<th width="3%">油价</th>
 								<th width="4%">路单工号</th>
 								<th width="4%">备注</th>
-								<th width="10%">操作</th>
+								<th width="10%">总加注量</th>
 							</tr>
 							<tr role="row" class="filter">
 								<td></td>
@@ -160,7 +160,7 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             type="text" value="{{obj.bz}}" style=" width:45px" />
 	</td>
 	<td>
-		<!--<a class="btn btn-sm blue btn-outline" onclick="editCyjy('{{obj.nbbm}}')" data-pjax><i class="fa fa-edit"></i> 编辑</a>-->
+		{{obj.zjzl}}
 	</td>
 </tr>
 {{/each}}
@@ -200,7 +200,6 @@ $(function(){
         	params['fgsbm']=$("#jyglListFgsdmId").val();
         	params['rq']=$("#rq").val();
         	 var i = layer.load(2);
-        	 console.log(params);
         	 $post('/cwjy/savejzl', params, function(){
         		 layer.close(i);
 		        		 var cells = $('tr.filter')[0].cells
@@ -316,7 +315,7 @@ $(function(){
 		params['page'] = page;
 		params['rq']=$("#rq").val();
  
-		var i = 2;
+		var i = layer.load(2);;
 		/* var jyglGsdm=$("#jyglListGsdmId").val();
 		var jyglFgsdm=$("#jyglListFgsdmId").val();
 		if(jyglGsdm=="" || jyglGsdm==null){
@@ -340,7 +339,6 @@ $(function(){
 			$.each(data, function(i, obj) {
                 obj.yyrq = $("#rq").val();
             });
-			console.log(data)
 			var bodyHtm = template('jygl_list_temp', {list: data});
 			$('#datatable_cwjy tbody').html(bodyHtm);
 			 iCheckChange();
@@ -229,7 +229,9 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             onafterpaste="this.value=this.value.replace(/[^(\d||/.)]/g,'').replace('.','$#$').replace(/\./g,'').replace('$#$','.')">
         </td>
         <td>
-			 {{obj.yh}}
+			 
+			<input data-id="{{obj.id}}" href="javascript:;" class="in_carpark_yh" 
+            type="text" value="{{obj.yh}}" style=" width:50px"  disabled="true"　readOnly="true"  />
         </td>
         <td>
 			<select data-id="{{obj.id}}" class="in_carpark_rylx" style=" width:80px" >
@@ -319,7 +321,6 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
             }
         });
  
-        
         //保存
         $("#saveButton").on('click',function(){
         	var ylArray = [];
@@ -627,9 +628,83 @@ onkeyup=&quot;this.value=this.value.replace(/[^(\d||/.)]/g,&#39;&#39;).replace(&#39;.&#39;,&#39;$#$&#39;).rep
         		});
 //                 startOptJzylLink($('#ll_oil_list .in_carpark_jzyl'));
 //                 startOptShylLink($('#ll_oil_list .in_carpark_shyl'));
+            	 $('input').on('input propertychange',function(){
+                 	var id=$(this).data('id');
+                 	var jzl =$('.in_carpark_jzl[data-id='+id+']', '#ll_oil_list').html();
+            		if(jzl=="" || jzl ==null){
+            			jzl=0;
+            		}
+            		var czyl=$('.in_carpark_czyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(czyl=="" || czyl==null){
+            			czyl=0;
+            		}
+            		var jzyl=$('.in_carpark_jzyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(jzyl=="" || jzyl==null){
+            			jzyl=0;
+            		}
+            		
+            		var sh =  $('.in_carpark_shyl[data-id='+id+']', '#ll_oil_list').val();
+            		if(sh=="" || sh==null){
+            			sh=0;
+            		}
+            		var addNum=accAdd(jzl,czyl);
+            		var subNum=accAdd(jzyl,sh);
+            		var sub=numSubtr(addNum*1000,subNum*1000);
+            		var subValue=0;
+            		if(sub/1000>=0){
+            			subValue=sub/1000;
+            		}
+            		$('.in_carpark_yh[data-id='+id+']', '#ll_oil_list').val(subValue);
+            		
+                 });
             });
         }
+		
+		//页面计算防止精度丢失
+		var accAdd = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (mul(a, e) + mul(b, e)) / e;
+	    };
  
+	    var numSubtr = function (a, b) {
+	        var c, d, e;
+	        try {
+	            c = a.toString().split(".")[1].length;
+	        } catch (f) {
+	            c = 0;
+	        }
+	        try {
+	            d = b.toString().split(".")[1].length;
+	        } catch (f) {
+	            d = 0;
+	        }
+	        return e = Math.pow(10, Math.max(c, d)), (a * e - b * e) / e;
+	    };
+	    
+	    function mul(a, b) {
+	        var c = 0,
+	            d = a.toString(),
+	            e = b.toString();
+	        try {
+	            c += d.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        try {
+	            c += e.split(".")[1].length;
+	        } catch (f) {
+	        }
+	        return Number(d.replace(".", "")) * Number(e.replace(".", "")) / Math.pow(10, c);
+	    }
         //改变状态
         function startOptJzylLink(es) {
             es.editable({