综合分析-按月统计用能新增加的指标值，增加折线图统计

src/main/java/com/hb/proj/car/controller/HomeRptController.java

@@ -279,9 +279,13 @@ public class HomeRptController {
 			Calendar ca=Calendar.getInstance();
 			year=String.valueOf(ca.get(Calendar.YEAR));
 		}
+		Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
+		List<CarConsumeMulRptVO> indConsumes=service.carOilMulRptMonthGrp(year);
+		List<MonitorRemainOil> remainOils=service.carOilPeriodDiffMonthGrp(year);
+		EnergyWaterSumVOUtil.attachForMulRpt(voIndex, indConsumes,remainOils);
 		
 		if("chart".equals(type)){
-			Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
+			//Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
 			JsonOutUtils.returnOkWithData(response, voIndex);
 			return;
 		}
@@ -293,10 +297,8 @@ public class HomeRptController {
 			perMth=MapUtils.build("month",mthNames[i-1],"monthNum",String.format("%02d",i));
 			mths.add(perMth);
 		}
-		Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
-		List<CarConsumeMulRptVO> indConsumes=service.carOilMulRptMonthGrp(year);
-		List<MonitorRemainOil> remainOils=service.carOilPeriodDiffMonthGrp(year);
-		EnergyWaterSumVOUtil.attachForMulRpt(voIndex, indConsumes,remainOils);
+		//Map<String,EnergyWaterSumVO> voIndex=EnergyWaterSumVOUtil.build(service.erpMonthGrp(year), service.otherMonthGrp(year), service.wpgSumRpt(year), service.wpgCorrectSumRpt(year), service.workloadSumRpt(year),null,null);
+		
 		
 		Map<String,Object> rootMap=new HashMap<String,Object>();
 		rootMap.put("months", mths); 

src/main/webapp/page/rpt/js/multiRpt.js

@@ -334,6 +334,13 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 		return data==null?null:data.toFixed(decimal);
 	}
 	
+	function getDFData(pdata,key1,key2,decimal){
+		if(!pdata[key1]||!pdata[key1][key2]){
+			return null;
+		}
+		return decimalFormat(pdata[key1][key2],decimal);
+	}
+	
 	//用能用水按月统计图，绘制前先获取去年的数据
 	function loadEnergyMthGroupChart(yyyy){
 		var preYear=parseInt(yyyy)-1;
@@ -347,7 +354,7 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 			 }
 			var preData=resp.data;
 			var mths=["01","02","03","04","05","06","07","08","09","10","11","12"];
-			var ngas=[],power=[],oil=[],coil=[],lgas=[],coal=[],water=[];
+			var ngas=[],power=[],oil=[],coil=[],lgas=[],coal=[],water=[],coil100km=[],coilWellCount=[],oil100km=[],oilWellCount=[],engineWellCount=[],engineCostTon=[];
 			for(var m=0,len=mths.length;m<len;m++){
 				ngas.push(decimalFormat(preData[mths[m]].wpg.ngasCount,4));
 				power.push(decimalFormat(preData[mths[m]].wpg.powerCount,4));
@@ -356,9 +363,16 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 				lgas.push(decimalFormat(preData[mths[m]].wpg.lgasCount,3));
 				coal.push(decimalFormat(preData[mths[m]].coals,3));
 				water.push(decimalFormat(preData[mths[m]].wpg.waterCount,4));
+				
+				coil100km.push(getDFData(preData[mths[m]],"indConsume","coilLiter100km",3));
+				coilWellCount.push(getDFData(preData[mths[m]],"indConsume","coilLiterWellCount",3));
+				oil100km.push(getDFData(preData[mths[m]],"indConsume","oilLiter100km",3));
+				oilWellCount.push(getDFData(preData[mths[m]],"indConsume","oilLiterWellCount",3));
+				engineWellCount.push(getDFData(preData[mths[m]],"indConsume","engineLiterWellCount",3));
+				engineCostTon.push(getDFData(preData[mths[m]],"indConsume","engineCostTon",3));
 			}
 			//下一步从报表中获取当年数据并进行绘制
-			startEnergyMthGroupChart([ngas,power,oil,coil,lgas,coal,water]);
+			startEnergyMthGroupChart([ngas,power,oil,coil,lgas,coal,water,coil100km,coilWellCount,oil100km,oilWellCount,engineWellCount,engineCostTon]);
 			
 		 },function(){
 			 layer.msg("网络请求出现错误");
@@ -686,6 +700,8 @@ function createMonthGrpNgasChart($,id,ary1,ary2,yUnit){
 }
 
 function create2SeriesChart($,id,ary1,ary2,yunit){
+	ary1=ary1||[];
+	ary2=ary2||[];
 	for(var i=0,len=ary1.length;i<len;i++){
 		 if(parseFloat(ary1[i])==0){
 			 ary1[i]='';

src/main/webapp/page/rpt/multiRpt.html

@@ -107,7 +107,7 @@ body{
 		</div>
     </div>
      
-    <div class="layui-col-md12">
+    <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart0">
 			  
@@ -115,7 +115,7 @@ body{
 		</div>
     </div>
     
-    <div class="layui-col-md12">
+    <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart1">
 			  
@@ -123,7 +123,7 @@ body{
 		</div>
     </div>
     
-     <div class="layui-col-md12">
+     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart2">
 			  
@@ -131,7 +131,7 @@ body{
 		</div>
     </div>
     
-     <div class="layui-col-md12">
+     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart3">
 			  
@@ -139,7 +139,7 @@ body{
 		</div>
     </div>
     
-     <div class="layui-col-md12">
+     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart4">
 			  
@@ -147,7 +147,7 @@ body{
 		</div>
     </div>
     
-     <div class="layui-col-md12">
+     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart5">
 			  
@@ -155,13 +155,69 @@ body{
 		</div>
     </div>
     
-     <div class="layui-col-md12">
+    <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
 			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart6">
 			  
 			</div>
 		</div>
     </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart7">
+			  
+			</div>
+		</div>
+    </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart8">
+			  
+			</div>
+		</div>
+    </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart9">
+			  
+			</div>
+		</div>
+    </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart10">
+			  
+			</div>
+		</div>
+    </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart11">
+			  
+			</div>
+		</div>
+    </div>
+    
+     <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart12">
+			  
+			</div>
+		</div>
+    </div>
+    
+    <div class="layui-col-md6">
+        <div class="layui-card layui-card-remain">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart13">
+			  
+			</div>
+		</div>
+    </div>
    
     
      <div class="layui-col-md6">

src/main/webapp/page/rpt/tmp/homeEnergyMonthCost.ftl

@@ -106,7 +106,7 @@
 		<tr class="dataRow dbline-row">
 			<td><div class="rpt-table-cell rpttab-cell-0 dbline-head">汽油车行驶油耗<br>(升/百公里)</div></td>
 			<#list months as mth>
-			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.oilLiterWellCount)!0;m3M3}</div></td>
+			<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].indConsume.oilLiter100km)!0;m3M3}</div></td>
 			</#list>
 		</tr>