综合分析-能耗各指标折线图显示顺序调整

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

@@ -371,8 +371,10 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 				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,coil100km,coilWellCount,oil100km,oilWellCount,engineWellCount,engineCostTon]);
+			//下一步从报表中获取当年数据并进行绘制,顺序对应
+			var dataMap={'coal':coal,'power':power,'oil':oil,'coil':coil,'oil100km':oil100km,'coil100km':coil100km,'oilWellCount':oilWellCount,'coilWellCount':coilWellCount,'lgas':lgas,'engineCostTon':engineCostTon,'water':water,'engineWellCount':engineWellCount,'ngas':ngas};
+			//var dataAry=[coal,power,oil,coil,oil100km,coil100km,oilWellCount,coilWellCount,lgas,engineCostTon,water,engineWellCount,ngas];
+			startEnergyMthGroupChart(dataMap);
 			
 		 },function(){
 			 layer.msg("网络请求出现错误");
@@ -382,12 +384,14 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 	}
 	
 	//从报表中获取当年数据并进行绘制
-	function startEnergyMthGroupChart(preSeries){
+	function startEnergyMthGroupChart(dataMap){
+		
 		var $tab=$("#energyMthGroupbox").find(".rpt-table-main>.rpt-table");
-		var yunit=null;
+		var yunit=null,dataSort=null,chartboxId=null;
 		var datas=null;
 		$tab.find("tr").each(function(idx,tr){
 			datas=[];
+			dataSort=$(tr).data("sort");
 			$(tr).find("td").each(function(i,td){
 				if(i==0){
 					yunit=$(td).find(".rpt-table-cell").text();
@@ -396,11 +400,14 @@ layui.use(['page','layer','myElement','myform','jquery','formula2','laydate','rp
 					datas.push($(td).find(".rpt-table-cell").text());
 				}
 			});
+			
+			chartboxId=$("div[data-chart='"+dataSort+"']")[0].id;
+			
 			if(yunit.indexOf("天然气")>=0){
-				createMonthGrpNgasChart($,"energyMthGroupChart"+idx,datas,preSeries[0],yunit);
+				createMonthGrpNgasChart($,chartboxId,datas,dataMap[dataSort],yunit);
 			}
 			else{
-				create2SeriesChart($,"energyMthGroupChart"+idx,datas,preSeries[idx],yunit);
+				create2SeriesChart($,chartboxId,datas,dataMap[dataSort],yunit);
 			}
 			
 		});

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

@@ -109,7 +109,7 @@ body{
      
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart0">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart0" data-chart="coal">
 			  
 			</div>
 		</div>
@@ -117,7 +117,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart1">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart1" data-chart="power">
 			  
 			</div>
 		</div>
@@ -125,7 +125,7 @@ body{
     
      <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart2">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart2" data-chart="oil">
 			  
 			</div>
 		</div>
@@ -133,7 +133,7 @@ body{
     
      <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart3">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart3" data-chart="coil">
 			  
 			</div>
 		</div>
@@ -141,7 +141,7 @@ body{
     
      <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart4">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart4" data-chart="oil100km">
 			  
 			</div>
 		</div>
@@ -149,7 +149,7 @@ body{
     
      <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart5">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart5" data-chart="coil100km">
 			  
 			</div>
 		</div>
@@ -157,7 +157,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart6">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart6" data-chart="oilWellCount">
 			  
 			</div>
 		</div>
@@ -165,7 +165,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart7">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart7" data-chart="coilWellCount">
 			  
 			</div>
 		</div>
@@ -173,7 +173,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart8">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart8" data-chart="lgas">
 			  
 			</div>
 		</div>
@@ -181,7 +181,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart9">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart9" data-chart="engineCostTon">
 			  
 			</div>
 		</div>
@@ -189,7 +189,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart10">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart10" data-chart="water">
 			  
 			</div>
 		</div>
@@ -197,7 +197,7 @@ body{
     
     <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart11">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart11" data-chart="engineWellCount">
 			  
 			</div>
 		</div>
@@ -205,7 +205,7 @@ body{
     
      <div class="layui-col-md6">
         <div class="layui-card layui-card-remain">
-			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart12">
+			<div class="layui-card-body" style="height:280px;" id="energyMthGroupChart12" data-chart="ngas">
 			  
 			</div>
 		</div>

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

@@ -36,66 +36,66 @@
   <div class="rpt-table-body rpt-table-main">
       <table cellpadding="0" cellspacing="0"  class="rpt-table" align="center">
 
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">天然气(万立方米)</div></td>
+		<tr class="dataRow"  data-sort="ngas">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="ngas">天然气(万立方米)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].wpg.ngasCount)!0;m4M4}</div></td>
 		</#list>
 		</tr>
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">电(万千瓦时)</div></td>
+		<tr class="dataRow"  data-sort="power">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="power">电(万千瓦时)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].wpg.powerCount)!0;m4M4}</div></td>
 		</#list>
 		
 		</tr>
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">汽油(吨)</div></td>
+		<tr class="dataRow"  data-sort="oil">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="oil">汽油(吨)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].oilTotal)!0;m3M3}</div></td>
 		</#list>
 		</tr>
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">柴油(吨)</div></td>
+		<tr class="dataRow"  data-sort="coil">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="coil">柴油(吨)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].coilTotal)!0;m3M3}</div></td>
 		</#list>
 		</tr>
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">液化气(吨)</div></td>
+		<tr class="dataRow"  data-sort="lgas">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="lgas">液化气(吨)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].wpg.lgasCount)!0;m3M3}</div></td>
 		</#list>
 		</tr>
 		
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">综合(吨标煤)</div></td>
+		<tr class="dataRow"  data-sort="coal">
+		<td><div class="rpt-table-cell rpttab-cell-0" data-sort="coal">综合(吨标煤)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].coals)!0;m3M3}</div></td>
 		</#list>
 		</tr>
 		
 		
-		<tr class="dataRow">
-		<td><div class="rpt-table-cell rpttab-cell-0">水(万立方米)</div></td>
+		<tr class="dataRow"  data-sort="water">
+		<td><div class="rpt-table-cell rpttab-cell-0"  data-sort="water">水(万立方米)</div></td>
 		<#list months as mth>
 		<td><div class="rpt-table-cell rpttab-cell-${mth_index+1}">#{(ds['${mth.monthNum}'].wpg.waterCount)!0;m4M4}</div></td>
 		</#list>
 		</tr>
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row" data-sort="coil100km">
 			<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.coilLiter100km)!0;m3M3}</div></td>
 			</#list>
 		</tr>
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row"  data-sort="coilWellCount">
 			<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.coilLiterWellCount)!0;m3M3}</div></td>
@@ -103,7 +103,7 @@
 		</tr>
 		
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row" data-sort="oil100km">
 			<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.oilLiter100km)!0;m3M3}</div></td>
@@ -111,21 +111,21 @@
 		</tr>
 		
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row" data-sort="oilWellCount">
 			<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>
 			</#list>
 		</tr>
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row" data-sort="engineCostTon">
 			<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.engineCostTon)!0;m3M3}</div></td>
 			</#list>
 		</tr>
 		
-		<tr class="dataRow dbline-row">
+		<tr class="dataRow dbline-row" data-sort="engineWellCount">
 			<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.engineLiterWellCount)!0;m3M3}</div></td>