Browse Source

修改媒体报表图表数据的显示样式

ying.rong 9 years ago
parent
commit
87758272de

+ 7 - 5
src/main/webapp/assets/js/report_back.js

@@ -238,9 +238,11 @@ $(document).ready(function(){
 		var xlabels = [lll['xlabel'],pv['xlabel'],uv['xlabel'],adbaoguang['xlabel'],adtianchong['xlabel'],adclick['xlabel'],adclickl['xlabel'],ecpm['xlabel'],shouru['xlabel']];
 		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++){
 		for(var i = 0;i<chartDivs;i++){
 			if(i==0){
 			if(i==0){
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total","{point.y:.2f}%",color);
+			}else if(i==4 || i==6){
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"","{point.y:.2f}%",color);
 			}else{
 			}else{
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"","{point.y:.2f}",color);
 			}
 			}
 		}
 		}
 	}
 	}
@@ -282,7 +284,7 @@ $(document).ready(function(){
 		return result;
 		return result;
 	}
 	}
 	
 	
-	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,color){
+	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,defaultParsent,color){
 		obj.highcharts({
 		obj.highcharts({
 			chart: {
 			chart: {
 				type: 'column'
 				type: 'column'
@@ -312,13 +314,13 @@ $(document).ready(function(){
 				     pointWidth: 30,
 				     pointWidth: 30,
 				     dataLabels: {
 				     dataLabels: {
 				    	 enabled: true,
 				    	 enabled: true,
-				        format: '{point.y:.2f}%'
+				        format: defaultParsent
 				    }
 				    }
 				}
 				}
 			},
 			},
 			tooltip: {
 			tooltip: {
 				headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
 				headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-				pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> '+defaultValue+'<br/>'
+				pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>'+defaultParsent+'</b> '+defaultValue+'<br/>'
 			},
 			},
 			series: [{
 			series: [{
 				name: name,
 				name: name,

+ 7 - 5
src/main/webapp/assets/js/report_operator.js

@@ -238,9 +238,11 @@ $(document).ready(function(){
 		var xlabels = [lll['xlabel'],pv['xlabel'],uv['xlabel'],adbaoguang['xlabel'],adtianchong['xlabel'],adclick['xlabel'],adclickl['xlabel'],ecpm['xlabel'],shouru['xlabel']];
 		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++){
 		for(var i = 0;i<chartDivs;i++){
 			if(i==0){
 			if(i==0){
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total",color);
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"of total","{point.y:.2f}%",color);
+			}else if(i==4 || i==6){
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"","{point.y:.2f}%",color);
 			}else{
 			}else{
-				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"",color);
+				getHighchart_other($("#linechart"+i),names[i],names[i],values[i],xlabels[i],"","{point.y:.2f}",color);
 			}
 			}
 		}
 		}
 	}
 	}
@@ -282,7 +284,7 @@ $(document).ready(function(){
 		return result;
 		return result;
 	}
 	}
 	
 	
-	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,color){
+	function getHighchart_other(obj,title,name,value,uselllxlabel,defaultValue,defaultParsent,color){
 		obj.highcharts({
 		obj.highcharts({
 			chart: {
 			chart: {
 				type: 'column'
 				type: 'column'
@@ -312,13 +314,13 @@ $(document).ready(function(){
 				     pointWidth: 30,
 				     pointWidth: 30,
 				     dataLabels: {
 				     dataLabels: {
 				    	 enabled: true,
 				    	 enabled: true,
-				        format: '{point.y:.2f}%'
+				        format: defaultParsent
 				    }
 				    }
 				}
 				}
 			},
 			},
 			tooltip: {
 			tooltip: {
 				headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
 				headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-				pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> '+defaultValue+'<br/>'
+				pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>'+defaultParsent+'</b> '+defaultValue+'<br/>'
 			},
 			},
 			series: [{
 			series: [{
 				name: name,
 				name: name,