Browse Source

修改报表管理中图表显示的数据

ying.rong 9 years ago
parent
commit
a4f980dd24

+ 7 - 0
src/main/webapp/assets/js/advertiser/operatoradGroup.js

@@ -318,6 +318,13 @@ $(document).ready(function(){
  			$(this).parent("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");
  		});
  	}
+ 	
+ 	//点击日期控件的按钮时,去掉前面时间标签的样式
+ 	$(".apply-btn").click(function(){
+		if(!$(this).hasClass("disabled")){
+			$('#dateRangePicker').val($(".start-day").text() +" to "+$(".end-day").text());
+		}
+	});
 	
  	$("#create-btn-save,#edit-btn-save").click(function(){
  		$("div.input-group").find("span.help-inline").text("").removeClass("help-inline").addClass("spanVaildate");

+ 44 - 235
src/main/webapp/assets/js/report_back.js

@@ -223,256 +223,65 @@ $(document).ready(function(){
 		}
 		n2=10;
 		n1=n*n2;
+		var lll = getData_other(m,n1,n2,1);
+		var pv = getData_other(m,n1,n2,2);
+		var uv = getData_other(m,n1,n2,3);
+		var adbaoguang = getData_other(m,n1,n2,4);
+		var adtianchong = getData_other(m,n1,n2,5);
+		var adclick = getData_other(m,n1,n2,6);
+		var adclickl = getData_other(m,n1,n2,7);
+		var ecpm = getData_other(m,n1,n2,8);
+		var shouru = getData_other(m,n1,n2,9);
+		var chartDivs = $("#chartDivs").find("div").length;
+		var names = ['浏览量占比','PV','UV','广告曝光数','广告填充率','广告点击数','广告点击率','eCPM','收入'];
+		var values = [lll['value'],pv['value'],uv['value'],adbaoguang['value'],adtianchong['value'],adclick['value'],adclickl['value'],ecpm['value'],shouru['value']];
+		var xlabels = [lll['xlabel'],pv['xlabel'],uv['xlabel'],adbaoguang['xlabel'],adtianchong['xlabel'],adclick['xlabel'],adclickl['xlabel'],ecpm['xlabel'],shouru['xlabel']];
+		for(var i = 0;i<chartDivs;i++){
+			if(i==0){
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
+			}else{
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
+			}
+		}
+	}
+	
+	function getData_other(m,n1,n2,index){
+		var result = new Object();
 		var xlabel=[];
 		var j=0;
 		for(i=0;i<n1;i+=n2){
 			xlabel[j]=m[i];
-			   j++;
-		}
-		var lll=[];
-		var j=0;
-		for(i=1;i<n1;i+=n2){
-			lll[j]=parseFloat(m[i]);
-		    j++;
-		}
-		//排序
-		var lllxlabel = xlabel;
-		var uselllxlabel = [];
-		var uselll = [];
-		var num;
-		for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			num=a;
-			for(b=0;b<lll.length;b++){
-				if(uselll[a]<=lll[b]){
-				 	uselll[a]=lll[b];
-				 	uselllxlabel[a]=lllxlabel[b];
-				 	num=b;
-				}
-			}
-			lll[num]=0;
-		}
-
-		var pv=[];
-		var j=0;
-		for(i=2;i<n1;i+=n2){
-			if(m[i]!=null){
-				pv[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var pvxlabel = xlabel;
-		var usepvxlabel = [];
-		var usepv = [];
-		var num;
-		for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			num=a;
-			for(b=0;b<pv.length;b++){
-				if(usepv[a]<=pv[b]){
-					usepv[a]=pv[b];
-					usepvxlabel[a]=pvxlabel[b];
-					num=b;
-			 	}
-			 }
-			pv[num]=0;
-		}
-
-		var uv=[];
-		var j=0;
-		for(i=3;i<n1;i+=n2){
-			if(m[i]!=null){
-				uv[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var uvxlabel = xlabel;
-		var useuvxlabel = [];
-		var useuv = [];
-		var num;
-		for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			num=a;
-			for(b=0;b<uv.length;b++){
-				if(useuv[a]<=uv[b]){
-					useuv[a]=uv[b];
-					useuvxlabel[a]=uvxlabel[b];
-					num=b;
-			 	}
-			}
-			uv[num]=0;
-		}
-
-		var adbaoguang=[];
-		var j=0;
-		for(i=4;i<n1;i+=n2){
-			if(m[i]!=null){
-				adbaoguang[j]=parseFloat(m[i]);
-			}
 			j++;
 		}
-		//排序
-		var adbaoguangxlabel = xlabel;
-		var useadbaoguangxlabel = [];
-		var useadbaoguang = [];
-		var num;
-		for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			num=a;
-			for(b=0;b<adbaoguang.length;b++){
-				if(useadbaoguang[a]<=adbaoguang[b]){
-					useadbaoguang[a]=adbaoguang[b];
-					useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-					num=b;
-			 	}
-			}
-			adbaoguang[num]=0;
-		}
-		var adtianchong=[];
+		var value=[];
 		var j=0;
-		for(i=5;i<n1;i+=n2){
+		for(i=index;i<n1;i+=n2){
 			if(m[i]!=null){
-				adtianchong[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var adtianchongxlabel = xlabel;
-		var useadtianchongxlabel = [];
-		var useadtianchong = [];
-		var num;
-		for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			num=a;
-			for(b=0;b<adtianchong.length;b++){
-			 	if(useadtianchong[a]<=adtianchong[b]){
-			 		useadtianchong[a]=adtianchong[b];
-			 		useadtianchongxlabel[a]=adtianchongxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adtianchong[num]=0;
-		}
-		var adclick=[];
-		var j=0;
-		for(i=6;i<n1;i+=n2){
-			if(m[i]!=null){
-				adclick[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var adclickxlabel = xlabel;
-		var useadclickxlabel = [];
-		var useadclick = [];
-		var num;
-		for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			num=a;
-			for(b=0;b<adclick.length;b++){
-			 	if(useadclick[a]<=adclick[b]){
-			 		useadclick[a]=adclick[b];
-			 		useadclickxlabel[a]=adclickxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adclick[num]=0;
-		}
-		var adclickl=[];
-		var j=0;
-		for(i=7;i<n1;i+=n2){
-			if(m[i]!=null){
-				adclickl[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var adclicklxlabel = xlabel;
-		var useadclicklxlabel = [];
-		var useadclickl = [];
-		var num;
-		for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			num=a;
-			for(b=0;b<adclickl.length;b++){
-			 	if(useadclickl[a]<=adclickl[b]){
-			 		useadclickl[a]=adclickl[b];
-			 		useadclicklxlabel[a]=adclicklxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adclickl[num]=0;
-		}
-
-		var ecpm=[];
-		var j=0;
-		for(i=8;i<n1;i+=n2){
-			if(m[i]!=null){
-				ecpm[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var ecpmxlabel = xlabel;
-		var useecpmxlabel = [];
-		var useecpm = [];
-		var num;
-		for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			num=a;
-			for(b=0;b<ecpm.length;b++){
-			 	if(useecpm[a]<=ecpm[b]){
-			 		useecpm[a]=ecpm[b];
-			 		useecpmxlabel[a]=ecpmxlabel[b];
-			 		num=b;
-			 	}
-			}
-			ecpm[num]=0;
-		}
-
-		var shouru=[];
-		var j=0;
-		for(i=9;i<n1;i+=n2){
-			if(m[i]!=null){
-				shouru[j]=parseFloat(m[i]);
+				value[j]=parseFloat(m[i]);
 			}
 			j++;
 		}
 		
 		//排序
-		var shouruxlabel = xlabel;
-		var useshouruxlabel = [];
-		var useshouru = [];
-		var num;
-		for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			num=a;
-			for(b=0;b<shouru.length;b++){
-			 	if(useshouru[a]<=shouru[b]){
-			 		useshouru[a]=shouru[b];
-			 		useshouruxlabel[a]=shouruxlabel[b];
-			 		num=b;
-			 	}
-			}
-			shouru[num]=0;
-		}
-		var chartDivs = $("#chartDivs").find("div").length;
-		var names = ['浏览量占比','PV','UV','广告曝光数','广告填充率','广告点击数','广告点击率','eCPM','收入'];
-		var values = [uselll,usepv,useuv,useadbaoguang,useadtianchong,useadclick,useadclickl,useecpm,useshouru];
-		var xlabels = [uselllxlabel,usepvxlabel,useuvxlabel,useadbaoguangxlabel,useadtianchongxlabel,useadclickxlabel,useadclicklxlabel,useecpmxlabel,useshouruxlabel];
-		for(var i = 0;i<chartDivs;i++){
-			if(i==0){
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
-			}else{
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
-			}
+		var temp = "";
+		var tempxlabel = "";
+		for (var a = 0; a < value.length; a++){//最多做n-1趟排序  
+            for(var b = 0 ;b < value.length - a; b++){
+                if(value[b] < value[b + 1]){ //把小的值交换到后面  
+                	temp = value[b];  
+                	value[b] = value[b + 1];  
+                	value[b + 1] = temp; 
+                	tempxlabel = xlabel[b];
+                	xlabel[b] = xlabel[b + 1];
+                	xlabel[b + 1] = tempxlabel;
+                }  
+            }      
 		}
+		result['xlabel'] = xlabel;
+		result['value'] = value;
+		return result;
 	}
+	
 	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,color){
 		obj.highcharts({
 			chart: {

+ 44 - 235
src/main/webapp/assets/js/report_operator.js

@@ -223,256 +223,65 @@ $(document).ready(function(){
 		}
 		n2=10;
 		n1=n*n2;
+		var lll = getData_other(m,n1,n2,1);
+		var pv = getData_other(m,n1,n2,2);
+		var uv = getData_other(m,n1,n2,3);
+		var adbaoguang = getData_other(m,n1,n2,4);
+		var adtianchong = getData_other(m,n1,n2,5);
+		var adclick = getData_other(m,n1,n2,6);
+		var adclickl = getData_other(m,n1,n2,7);
+		var ecpm = getData_other(m,n1,n2,8);
+		var shouru = getData_other(m,n1,n2,9);
+		var chartDivs = $("#chartDivs").find("div").length;
+		var names = ['浏览量占比','PV','UV','广告曝光数','广告填充率','广告点击数','广告点击率','eCPM','收入'];
+		var values = [lll['value'],pv['value'],uv['value'],adbaoguang['value'],adtianchong['value'],adclick['value'],adclickl['value'],ecpm['value'],shouru['value']];
+		var xlabels = [lll['xlabel'],pv['xlabel'],uv['xlabel'],adbaoguang['xlabel'],adtianchong['xlabel'],adclick['xlabel'],adclickl['xlabel'],ecpm['xlabel'],shouru['xlabel']];
+		for(var i = 0;i<chartDivs;i++){
+			if(i==0){
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
+			}else{
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
+			}
+		}
+	}
+	
+	function getData_other(m,n1,n2,index){
+		var result = new Object();
 		var xlabel=[];
 		var j=0;
 		for(i=0;i<n1;i+=n2){
 			xlabel[j]=m[i];
-			   j++;
-		}
-		var lll=[];
-		var j=0;
-		for(i=1;i<n1;i+=n2){
-			lll[j]=parseFloat(m[i]);
-		    j++;
-		}
-		//排序
-		var lllxlabel = xlabel;
-		var uselllxlabel = [];
-		var uselll = [];
-		var num;
-		for(a=0;a<lll.length;a++){
-			uselll[a]=0;
-			num=a;
-			for(b=0;b<lll.length;b++){
-				if(uselll[a]<=lll[b]){
-				 	uselll[a]=lll[b];
-				 	uselllxlabel[a]=lllxlabel[b];
-				 	num=b;
-				}
-			}
-			lll[num]=0;
-		}
-
-		var pv=[];
-		var j=0;
-		for(i=2;i<n1;i+=n2){
-			if(m[i]!=null){
-				pv[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var pvxlabel = xlabel;
-		var usepvxlabel = [];
-		var usepv = [];
-		var num;
-		for(a=0;a<pv.length;a++){
-			usepv[a]=0;
-			num=a;
-			for(b=0;b<pv.length;b++){
-				if(usepv[a]<=pv[b]){
-					usepv[a]=pv[b];
-					usepvxlabel[a]=pvxlabel[b];
-					num=b;
-			 	}
-			 }
-			pv[num]=0;
-		}
-
-		var uv=[];
-		var j=0;
-		for(i=3;i<n1;i+=n2){
-			if(m[i]!=null){
-				uv[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var uvxlabel = xlabel;
-		var useuvxlabel = [];
-		var useuv = [];
-		var num;
-		for(a=0;a<uv.length;a++){
-			useuv[a]=0;
-			num=a;
-			for(b=0;b<uv.length;b++){
-				if(useuv[a]<=uv[b]){
-					useuv[a]=uv[b];
-					useuvxlabel[a]=uvxlabel[b];
-					num=b;
-			 	}
-			}
-			uv[num]=0;
-		}
-
-		var adbaoguang=[];
-		var j=0;
-		for(i=4;i<n1;i+=n2){
-			if(m[i]!=null){
-				adbaoguang[j]=parseFloat(m[i]);
-			}
 			j++;
 		}
-		//排序
-		var adbaoguangxlabel = xlabel;
-		var useadbaoguangxlabel = [];
-		var useadbaoguang = [];
-		var num;
-		for(a=0;a<adbaoguang.length;a++){
-			useadbaoguang[a]=0;
-			num=a;
-			for(b=0;b<adbaoguang.length;b++){
-				if(useadbaoguang[a]<=adbaoguang[b]){
-					useadbaoguang[a]=adbaoguang[b];
-					useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-					num=b;
-			 	}
-			}
-			adbaoguang[num]=0;
-		}
-		var adtianchong=[];
+		var value=[];
 		var j=0;
-		for(i=5;i<n1;i+=n2){
+		for(i=index;i<n1;i+=n2){
 			if(m[i]!=null){
-				adtianchong[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-		//排序
-		var adtianchongxlabel = xlabel;
-		var useadtianchongxlabel = [];
-		var useadtianchong = [];
-		var num;
-		for(a=0;a<adtianchong.length;a++){
-			useadtianchong[a]=0;
-			num=a;
-			for(b=0;b<adtianchong.length;b++){
-			 	if(useadtianchong[a]<=adtianchong[b]){
-			 		useadtianchong[a]=adtianchong[b];
-			 		useadtianchongxlabel[a]=adtianchongxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adtianchong[num]=0;
-		}
-		var adclick=[];
-		var j=0;
-		for(i=6;i<n1;i+=n2){
-			if(m[i]!=null){
-				adclick[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var adclickxlabel = xlabel;
-		var useadclickxlabel = [];
-		var useadclick = [];
-		var num;
-		for(a=0;a<adclick.length;a++){
-			useadclick[a]=0;
-			num=a;
-			for(b=0;b<adclick.length;b++){
-			 	if(useadclick[a]<=adclick[b]){
-			 		useadclick[a]=adclick[b];
-			 		useadclickxlabel[a]=adclickxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adclick[num]=0;
-		}
-		var adclickl=[];
-		var j=0;
-		for(i=7;i<n1;i+=n2){
-			if(m[i]!=null){
-				adclickl[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var adclicklxlabel = xlabel;
-		var useadclicklxlabel = [];
-		var useadclickl = [];
-		var num;
-		for(a=0;a<adclickl.length;a++){
-			useadclickl[a]=0;
-			num=a;
-			for(b=0;b<adclickl.length;b++){
-			 	if(useadclickl[a]<=adclickl[b]){
-			 		useadclickl[a]=adclickl[b];
-			 		useadclicklxlabel[a]=adclicklxlabel[b];
-			 		num=b;
-			 	}
-			}
-			adclickl[num]=0;
-		}
-
-		var ecpm=[];
-		var j=0;
-		for(i=8;i<n1;i+=n2){
-			if(m[i]!=null){
-				ecpm[j]=parseFloat(m[i]);
-			}
-			j++;
-		}
-
-		//排序
-		var ecpmxlabel = xlabel;
-		var useecpmxlabel = [];
-		var useecpm = [];
-		var num;
-		for(a=0;a<ecpm.length;a++){
-			useecpm[a]=0;
-			num=a;
-			for(b=0;b<ecpm.length;b++){
-			 	if(useecpm[a]<=ecpm[b]){
-			 		useecpm[a]=ecpm[b];
-			 		useecpmxlabel[a]=ecpmxlabel[b];
-			 		num=b;
-			 	}
-			}
-			ecpm[num]=0;
-		}
-
-		var shouru=[];
-		var j=0;
-		for(i=9;i<n1;i+=n2){
-			if(m[i]!=null){
-				shouru[j]=parseFloat(m[i]);
+				value[j]=parseFloat(m[i]);
 			}
 			j++;
 		}
 		
 		//排序
-		var shouruxlabel = xlabel;
-		var useshouruxlabel = [];
-		var useshouru = [];
-		var num;
-		for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			num=a;
-			for(b=0;b<shouru.length;b++){
-			 	if(useshouru[a]<=shouru[b]){
-			 		useshouru[a]=shouru[b];
-			 		useshouruxlabel[a]=shouruxlabel[b];
-			 		num=b;
-			 	}
-			}
-			shouru[num]=0;
-		}
-		var chartDivs = $("#chartDivs").find("div").length;
-		var names = ['浏览量占比','PV','UV','广告曝光数','广告填充率','广告点击数','广告点击率','eCPM','收入'];
-		var values = [uselll,usepv,useuv,useadbaoguang,useadtianchong,useadclick,useadclickl,useecpm,useshouru];
-		var xlabels = [uselllxlabel,usepvxlabel,useuvxlabel,useadbaoguangxlabel,useadtianchongxlabel,useadclickxlabel,useadclicklxlabel,useecpmxlabel,useshouruxlabel];
-		for(var i = 0;i<chartDivs;i++){
-			if(i==0){
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
-			}else{
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
-			}
+		var temp = "";
+		var tempxlabel = "";
+		for (var a = 0; a < value.length; a++){//最多做n-1趟排序  
+            for(var b = 0 ;b < value.length - a; b++){
+                if(value[b] < value[b + 1]){ //把小的值交换到后面  
+                	temp = value[b];  
+                	value[b] = value[b + 1];  
+                	value[b + 1] = temp; 
+                	tempxlabel = xlabel[b];
+                	xlabel[b] = xlabel[b + 1];
+                	xlabel[b + 1] = tempxlabel;
+                }  
+            }      
 		}
+		result['xlabel'] = xlabel;
+		result['value'] = value;
+		return result;
 	}
+	
 	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,color){
 		obj.highcharts({
 			chart: {