Browse Source

前端页面修改

ying.rong 10 years ago
parent
commit
fb75624287
57 changed files with 1769 additions and 9216 deletions
  1. 3 3
      src/main/webapp/WEB-INF/pages/back/main/ad/message/list.ftl
  2. 151 878
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl
  3. 139 40
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl
  4. 113 387
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl
  5. 132 1263
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl
  6. 129 1251
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl
  7. 134 1273
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl
  8. 131 1448
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl
  9. 126 1252
      src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl
  10. 44 179
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl
  11. 12 6
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/create.ftl
  12. 15 10
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/dimension.ftl
  13. 13 7
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/edit.ftl
  14. 35 168
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl
  15. 35 168
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl
  16. 35 167
      src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl
  17. 6 8
      src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl
  18. 63 68
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/details.ftl
  19. 3 3
      src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl
  20. 9 9
      src/main/webapp/WEB-INF/pages/back/main/authority/create.ftl
  21. 10 10
      src/main/webapp/WEB-INF/pages/back/main/authority/edit.ftl
  22. 15 10
      src/main/webapp/WEB-INF/pages/back/main/authority/list.ftl
  23. 4 4
      src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl
  24. 5 6
      src/main/webapp/WEB-INF/pages/back/main/client-account/create.ftl
  25. 4 4
      src/main/webapp/WEB-INF/pages/back/main/client-account/edit.ftl
  26. 15 10
      src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl
  27. 103 112
      src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl
  28. 89 95
      src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/deposit.ftl
  29. 43 49
      src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/index.ftl
  30. 6 1
      src/main/webapp/WEB-INF/pages/back/main/public-head.ftl
  31. 1 1
      src/main/webapp/WEB-INF/pages/login.ftl
  32. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report.ftl
  33. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl
  34. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl
  35. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl
  36. 2 6
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl
  37. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl
  38. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl
  39. 2 6
      src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl
  40. 20 98
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl
  41. 21 99
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl
  42. 5 11
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/index.ftl
  43. 32 42
      src/main/webapp/WEB-INF/pages/operator/main/ad/zone/update.ftl
  44. 3 3
      src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/create.ftl
  45. 3 3
      src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/edit.ftl
  46. 4 4
      src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/list.ftl
  47. 4 4
      src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/relationship.ftl
  48. 4 4
      src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/update.ftl
  49. 3 3
      src/main/webapp/WEB-INF/pages/operator/main/authority/create.ftl
  50. 3 3
      src/main/webapp/WEB-INF/pages/operator/main/authority/edit.ftl
  51. 4 4
      src/main/webapp/WEB-INF/pages/operator/main/authority/list.ftl
  52. 3 3
      src/main/webapp/WEB-INF/pages/operator/main/authority/loginperson.ftl
  53. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/banner-audit/index.ftl
  54. 2 2
      src/main/webapp/WEB-INF/pages/operator/main/dashboard.ftl
  55. 7 7
      src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/list.ftl
  56. 5 5
      src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/withdraw-deposit.ftl
  57. 5 5
      src/main/webapp/WEB-INF/pages/operator/main/public-head.ftl

+ 3 - 3
src/main/webapp/WEB-INF/pages/back/main/ad/message/list.ftl

@@ -6,9 +6,9 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){

+ 151 - 878
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report.ftl

@@ -1,889 +1,162 @@
 <@override name="head">
 <title>总体报表</title>
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zone.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-
-<!-- 下拉框js -->
-
-<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	function loadDataForPullDownList2(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedZoneId}==val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedZoneId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	//调用loadDataForPullDownList,给广告位准备数据
-	function loadZone(operatorId) {
-		loadDataForPullDownList2($('#selectedZoneId'), "zoneList", "/ssp_web/widget/selector/provide/zone?parentId=" + operatorId, "全部广告位");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		p=${selectedOperatorId};
-		//alert(p);
-		loadZone(p);
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			clearPullDownList($('#selectedZoneId'), "全部广告位");
-			var id = $(this).val();
-			loadZone(id);
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$(".adver-choose  input[name=zoneId]").val(null);
-			
-			transcalender();
-		});	
-		//广告位value change调用此函数, 清除活动列表和策略列表
-		$('#selectedZoneId').change(function() {
-			var id = $(this).val();
-			if(id == -1){
-				$(".adver-choose  input[name=selectedZoneId]").val(null);
-			} else {
-				$(".adver-choose  input[name=selectedZoneId]").val(id);
-			}
-			transcalender();
-		});	
-});	
-		
-</script>
-<script type="text/javascript">
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('ffenlchange');
-			$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	  		$("#pv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#pv1").removeClass().addClass('ffenlchange');
-				$("#pvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#uv1").removeClass().addClass('ffenlchange');
-				$("#uvname1").removeClass().addClass("ffenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#bgs1").removeClass().addClass('ffenlchange');
-				$("#bgsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-	  			})	
-	  			
-	  		$("#djs1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#djs1").removeClass().addClass('ffenlchange');
-				$("#djsname1").removeClass().addClass("ffenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart5").hide(); 
-	  			})				
-	
-	  			$("#shr1").click(function(){
-	  			$(".ffenlchange").removeClass().addClass('ffenl');
-	  			$(".ffenlnamechange").removeClass().addClass('ffenlname');
-	  			$(".ffenldatachange").removeClass().addClass('ffenldata');
-	  			$("#shr1").removeClass().addClass('ffenlchange');
-				$("#shrname1").removeClass().addClass("ffenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("ffenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart5").show(); 
-	  			})	
-	  				
-	  		});
-	  		
-			
-	  			
-</script>
-
-<script type="text/javascript">
-			 
-		 //将毫秒转化为日期
-			function getDate(tm){ 
-					var tt=new Date(parseInt(tm)).toLocaleDateString();
-				
-					return tt; 
-			} 
- 
-			function getele1(){
-					try{
-		  				var d=document.getElementsByName("hr");
-		  				var c=[];
-		  				var e=[];
-		  				for(i=0;i<=d.length;i++){
-		  					c[i]=d[i].childNodes[0].nodeValue;
-		  					e[i]=c[i];
-		  				}
-		  				
-		  			}
-					catch(e){}
-					return c;
-			}
-		
-$(function () {
-
-			u=${startDate};
-			v=${endDate}; 	
-			if(u==v){
-							var m=getele1();
-							n=24;
-							var color=[];
-							for(i=0;i<n;i++){
-								color[i]='red';
-							}
-							n1=n*6;
-							var xlabel=[];		
-							var j=0;
-								for(i=0;i<n1;i+=6){
-										xlabel[j]=m[i];
-										j++;
-								}
-							//	alert(xlabel);
-						   //取y轴
-							var uv=[];
-							var j=0;
-							for(i=2;i<n1;i+=6){
-									uv[j]=parseFloat(m[i]);
-								 j++;
-							}
-							var pv=[];
-							var j=0;
-							for(i=1;i<n1;i+=6){
-									pv[j]=parseFloat(m[i]);
-									 j++;
-							}							
-							var adbaoguang=[];
-							var j=0;
-							for(i=3;i<n1;i+=6){		
-									adbaoguang[j]=parseFloat(m[i]);
-									j++;
-							}
-							var adclick=[];
-							var j=0;
-							for(i=4;i<n1;i+=6){
-									adclick[j]=parseFloat(m[i]);
-									j++;
-							}
-							var shouru=[];
-							var j=0;
-							for(i=5;i<n1;i+=6){
-									shouru[j]=parseFloat(m[i]);
-								   j++;
-							}	
-							setinterval=1;			
-	}else{
-					var selectedOperatorId=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	var selectedZoneId=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	if(selectedZoneId==null){selectedZoneId=-1}
-					var dateRangePicker=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/listChartData?dateRangePicker="+dateRangePicker+"&selectedOperatorId="+selectedOperatorId+"&selectedZoneId="+selectedZoneId;
-					var pv = [];
-					var uv = [];
-					var adbaoguang = [];
-					var adclick = [];
-					var shouru = [];
-					var xlabel = []
-					var k = 0;
- 					$.ajaxSettings.async = false; //getJSON同步执行
-					$.getJSON(url, function(data) {
-						$.each(data, function(key, val) {
-	
-						   		xlabel[k] = val.reportDate;
-						   		xlabel[k] = getDate(xlabel[k]);
-								pv[k] = val.pv;
-								uv[k] = val.uv;
-								adbaoguang[k] = val.impression;
-								adclick[k] = val.click;
-								shouru[k] = val.income;
-								k++;
-							});	
-						});	
-					setinterval=parseInt(xlabel.length/10);										
-}			
-    $('#linechart1').highcharts({
-        title: {
-            text: 'PV',
-          
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-               color: '#36aeea'
-           }]
-        },
-        
-        legend: {
-           layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [{
-            name: 'PV',
-            data: pv,
-            color:'#36aeea'
-        }]
-    });
-    $('#linechart2').highcharts({
-        title: {
-            text: 'UV',
-        },
-        xAxis: {
-            categories:xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: 'UV',
-            data: uv,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart3').highcharts({
-        title: {
-            text: '广告曝光数',
-        },
-        xAxis: {
-            categories: xlabel,
-            tickInterval: setinterval 
-        },
-        yAxis: {
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告曝光数',
-            data: adbaoguang,
-            color:'#36aeea'
-        }]
-    });
-     $('#linechart4').highcharts({
-        title: {
-            text: '广告点击数',
-        },
-        xAxis: {
-            categories: xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-                color: '#36aeea'
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '广告点击数',
-            data: adclick,
-            color:'#36aeea'
-        }]
-    });
-    
-     $('#linechart5').highcharts({
-        title: {
-            text: '收入',
-        },
-       
-        xAxis: {
-            categories: xlabel,
-             tickInterval: setinterval 
-        },
-        yAxis: {
-          
-            plotLines: [{
-                value: 0,
-                width: 1,
-            }]
-        },
-        legend: {
-            layout: 'vertical',
-            align: 'right',
-            verticalAlign: 'middle',
-            borderWidth: 0
-        },
-        series: [ {
-            name: '收入',
-            data: shouru,
-            color:'#36aeea'
-        }]
-    });
-});
-						   		
-</script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-<script type="text/javascript">
-function transcalender(){
-					var url = ""; 
-					var type = "";
-					var ids = [];
-					var page = $("#page").val();
-					a=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	c=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	if(c==null){c=-1}
-				 	//如果b为空,默认为昨天的
-				 	if($("#dateRangePicker").val()==""){
-				 	$(".yesterday").trigger("click");
-				 	}
-				 	b=$("#dateRangePicker").val();
-				 	//判断是否超过一年
-				 	var outyear=b.split("to",1);
-					outyear = outyear[0].replace(/-/g,"/");  
-				 	var yeartomi = (new Date(outyear)).getTime();
-				 	var todaydate1 = new Date();
-				 	todaydate = todaydate1.getTime();
-				 	if(todaydate-yeartomi<=31536000000){
-					 	url = "${ctx}/back/main/ad/operator/operator-report?dateRangePicker=" + b+"&selectedZoneId="+c+"&page="+page+"&selectedOperatorId="+a; 
-				 	
-				 	}else{
-				 		alert("您好,请选择一年之内的时间!");
-				 		$(".yesterday").trigger("click");
-				 		var date = $("#dateRangePicker").val();
-					 	url = "${ctx}/back/main/ad/operator/operator-report?dateRangePicker="+date+"&selectedZoneId="+c+"&page="+page+"&selectedOperatorId="+a; 	
-				 	}
-				 	console.log(url); 
-					location.href = url;
-}
-function transdaochu(){
-					var url = ""; 
-					a=$(".media-choose  input[name=selectedOperatorId]").val();
-				 	c=$(".adver-choose  input[name=selectedZoneId]").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel?dateRangePicker=" + b+"&selectedZoneId="+c+"&selectedOperatorId="+a;  
-				 	location.href = url;
-}
-
-</script>	
- <style type="text/css">
- 		 #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 1px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;          
-        }
-        .icon-calendar{
-            margin-left:6px;
-           // border: 1px solid black;
-            margin-top: 6px;       
-        }
-       select {
-       		position:relative;
-       		left:-2px;
-       		top:-2px;
-       		font-size:12px;
-       		width:183px;
-       		line-height:14px;
-       		border:1px solid #dfdfdf;
-       	
-       		color:#4c637b;} 
-      .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	.adver-choose{
-       		float:left;
-       		}
-
-#pagecontent{
-	height:1000px;
-
-
-}
-select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-     #selectedZoneId{
-     	width:150px;
-     	border:none;
-     	border-radius:5px;
-     	height:30px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-
-
-
-   </style>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-		    <div id="second">
-					<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-					<div></div>
-				
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 		    </div>
-		 
-</br>
-<br>
-<br> 
- 			 <div id="third">
-			         <ul>
-			         <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页&nbsp;&nbsp;</a>
-				     <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			         <li style="color: #4c637b;">&nbsp;&nbsp;数据报表</li>
-			         
-			         </ul>  
- 			 </div>  
-   
-</br>
-  <br>  
-    <div id="form">
-        <form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">	
-        <input id="page" autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-		 <div class="control-group control-group-lfet">	
-				<div class="controls-reset">
-							<div class="row-fluid input-append date row-fluid-revise">
-							    <div class="controls-reset">
-							    	<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-							    	<div class="adver-choose">
-											<select id="selectedZoneId" name="selectedZoneId" >
-											<option value="-1">全部广告位</option>
-											</select>
-											<input type="hidden" id="aa"  name="selectedZoneId" value="${selectedZoneId!}"/>
-									</div>
-									<div class="calder">
-										<div class="singlechoo">
-											<span class="help-inline">
-												<a class="today da">今天</a> |
-												<a class="yesterday da">昨天</a> |
-												<a class="lastSevenDays da">前七天</a> |
-												<a class="lastWeek da">上周</a> |
-												<a class="thisMonth da">本月</a> |
-												<a class="lastMonth da">上月</a> 
-									  		</span>
-								  		</div>
-										<div class="widthdate">
-										
-										<span id="tex"><i class="icon-calendar"></i>   
-											<input  type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-								        </span>
-			   							</div>	
-			   							<div class="widthcheck">
-			   								 <button onclick="transcalender()" style="float:right" class="check_cal" id="check_cal ">查询</button>
-										</div>	
-									</div>
-						    
-							</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>数据报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					<ul id="main_zoneListUl">
+						<li class="select_box" id="zoneListUl_box">
+							<span id="zoneListUl_span">${selecteddimensionName!}</span>
+							<ul class="son_ul" id="son_zoneListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
+					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
 				</div>
-		</div>
-
-			 		 <div class="ffenall">	
-					   		
-					   		<div  id="pv1" class="ffenl">
-					   			<div id="pvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;PV</div>
-					   			<div id="pvdata1" class="ffenldata">${sumReport.pv}</div>
-					   		</div>
-					   		<div  id="uv1" class="ffenl">
-					   			<div id="uvname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;UV</div>
-					   			<div id="uvdata1" class="ffenldata">${sumReport.uv}</div>
-					   		</div>
-					   		<div id="bgs1" class="ffenl">
-					   			<div id="bgsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告曝光数</div>
-					   			<div id="bgsdata1"  class="ffenldata">${sumReport.impression}</div>
-					   		</div>
-					   		
-					   		<div id="djs1" class="ffenl">
-					   			<div id="djsname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;广告点击数</div>
-					   			<div  id="djsdata1" class="ffenldata">${sumReport.click}</div>
-					   		</div>
-					   		
-					   		<div id="shr1" class="ffenl">
-					   			<div id="shrname1" class="ffenlname">&nbsp;&nbsp;&nbsp;&nbsp;收入</div>
-					   			<div id="shrdata1" class="ffenldata">${sumReport.income}</div>
-					   		</div>
-					   	</div>
-	   	
-			         <div class="chart_index"> 
-			         	 <div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-			         	 <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					 </div>
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                    <th class="td1"  style="text-align:center; width:10%">日期</th>
-			                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-			                </tr> 
-			                </thead>
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-				                <tr id="tr22">
-				                    <td class="td2" id="tdriqi" style="text-align:center;">${report.reportDate?string('yyyy/MM/dd')}</td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.pv!}</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           	<div class="hourrpt">
-				 	   <#if rptZoneHourList ??>
-			                <#list rptZoneHourList as hourrpt>
-				                <div id="tr22">
-				                  	 <div name="hr" >${hourrpt.hour!}</div>
-				                    <div name="hr" >${hourrpt.pv!}</div>
-				                    <div name="hr" >${hourrpt.uv!}</div>
-				                    <div name="hr" >${hourrpt.impression!}</div>
-				                    <div name="hr" >${hourrpt.click!}</div>
-				                    <div name="hr" >${hourrpt.income!}</div>
-				                </div>
-				                </#list>  
-			            </#if>
-				 	</div>
-		            <div id="daochu" >
-							<!--<button class="btn2" >导出Excel</button>-->
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-					
+				<div id="content_dataFrame">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="dataFrame0" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">PV</div>
+					   	<div class="dataFrame_data">${sumReport.pv}</div>
+					</div>
+					<div id="dataFrame1" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">UV</div>
+					   	<div class="dataFrame_data">${sumReport.uv}</div>
+					</div>
+					<div id="dataFrame2" class="dataFrame dataFrame_style">
+						<div class="dataFrame_name">广告曝光数</div>
+					   	<div class="dataFrame_data">${sumReport.impression}</div>
+					</div>
+					<div id="dataFrame3" class="dataFrame dataFrame_style">
+					   	<div class="dataFrame_name">广告点击数</div>
+					   	<div class="dataFrame_data">${sumReport.click}</div>
 					</div>
-					<div id="pagemove">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
+					<div id="dataFrame4" class="dataFrame dataFrame_last_style">
+					   	<div class="dataFrame_name">收入</div>
+					   	<div class="dataFrame_data">${sumReport.income}</div>
 					</div>
-				 
-	     
-         </form>
-	  </div>        
-	 </div>       
+				</div>
+				<div id="chartDivs" value="total"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>	
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:15%">日期</th>
+			                <th class="theadTh" style="width:7%">PV</th>
+			                <th class="theadTh" style="width:6%">UV</th>
+			                <th class="theadTh" style="width:8%">广告曝光数</th>
+			                <th class="theadTh" style="width:8%">广告填充率</th>
+			                <th class="theadTh" style="width:8%">广告点击数</th>
+			                <th class="theadTh" style="width:8%">广告点击率</th>
+			                <th class="theadTh" style="width:7%">eCPM</th>
+			                <th class="theadTh" style="width:8%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd">${report.reportDate!?string('yyyy/MM/dd')}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		     	<div id="hourrpt">
+					<#if rptZoneHourList ??>
+			        <#list rptZoneHourList as hourrpt>
+				    <div id="tr22">
+				    	<div name="hr">${hourrpt.hour!}</div>
+				        <div name="hr">${hourrpt.pv!}</div>
+				        <div name="hr">${hourrpt.uv!}</div>
+				        <div name="hr">${hourrpt.impression!}</div>
+				        <div name="hr">${hourrpt.click!}</div>
+				        <div name="hr">${hourrpt.income!}</div>
+				    </div>
+				   	</#list>  
+			        </#if>
+				</div>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('total','${ctx}/back/main/ad/operator/operator-report/exportDataReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
-  </div>
-  <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-datepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-timepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/bootstrap-datetimepicker.zh-CN.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/daterangepicker.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.autosize-min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.maskedinput.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.dataTables.min.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery.dataTables.bootstrap.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-   $('.controls-reset .help-inline a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-    
-<script type="text/javascript">
-//控制页码
-      $('#dateRangePicker').dateRangePicker();
-      $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$(".singlechoo .help-inline a").click(function(){
-	  		$(".singlechoo .help-inline a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-		     
-
-<!-- basic scripts -->
-
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 139 - 40
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/apmac.ftl

@@ -1,40 +1,139 @@
-<html>
-<body>
-<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:center; width:5%">热点</th>
-				                    <th class="td1" style="text-align:center; width:7%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:6%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:6%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:9%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:8%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:8%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:center;">${report.apmac!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-</body>
-</html>
+<@override name="head">
+<title>热点报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
+</@override>
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>热点报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/apmac" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">热点</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.apmac!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('apmac','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 113 - 387
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/areal.ftl

@@ -1,28 +1,20 @@
 <@override name="head">
-	<title>地域报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
+<title>地域报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
 	
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-  <script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script> 
-<script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 
-	<script type="text/javascript">
+<script type="text/javascript">
 		$(function(){
 			
 			$("#img-city").live("click",function(){
@@ -31,14 +23,14 @@
 				if(img.attr("type") == "close"){
 					$.ajax({
 				    	type:"POST",
-				    	url:"${ctx}/back/main/ad/operator/operator-report/city",
-				    	data:{cn:cnName,page:$("#page").val(),dateRangePicker:$("#dateRangePicker").val(),selectedOperatorId:${selectedOperatorId}},
+				    	url:"${ctx}/back/main/ad/operator/operator-report/arealCtiy",
+				    	data:{cnName:cnName,page:$("#page").val(),dateRangePicker:$("#dateRangePicker").val()},
 				    	success:function(data){
 				    		var html = "";
 				    		if(data.length >0){
 				    			for(var i = 0;i<data.length;i++){
 				    				html += '<tr id='+cnName+' class="changeColor" style="background-color:#CCCCCC;">';
-				    				html += '<td class="td2" id="tdriqi" style="text-align:center;margin-left:20px;"><img src="${ctx}/assets/back/images/defaultLeaf.gif" style="position: relative;top:-2px;left:-5px;"/>'+data[i].cn_city+'</td>';
+				    				html += '<td class="td2" id="tdriqi" style="text-align:center;margin-left:20px;"><img src="${ctx}/assets/operator/images/defaultLeaf.gif" style="position: relative;top:-2px;left:-5px;"/>'+data[i].cn_city+'</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].viewRate+'%</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].pv+'</td>';
 				    				html += '<td class="td2" id="tdriqi" style="text-align:center;">'+data[i].uv+'</td>';
@@ -52,391 +44,125 @@
 				    			}
 				    		img.parents('tr').after(html);
 				    		}
-				    		img.attr("src","${ctx}/assets/back/images/folderOpen.gif");
+				    		img.attr("src","${ctx}/assets/images/folderOpen.gif");
 				    	}     
 					});	
 					img.attr("type","open");
 				}else if(img.attr("type") == "open"){
 				    $('tr').remove("#"+cnName);//删除id为cname的所有 tr
-				    img.attr("src","${ctx}/assets/back/images/folderClose.gif");
+				    img.attr("src","${ctx}/assets/images/folderClose.gif");
 				    img.attr("type","close");
 					//location.href = "${ctx}/back/main/ad/operator/operator-report/areal";
 				}
 			});
 			
-			// 分页中超链接跳转
-			$('#pagecontent .pagination ul li a[href]').live('click' ,function(){
-				var _page = $(this).attr('href').substr(1);
-				var _form = $('#formPage');
-				_form.find('input:hidden[name="page"]').val(_page);
-				_form.submit();
-				return false;
-			});
     	});
     	
     	//到处execl
-		function exportExcel(){
+		function exportExcel_areal(){
 			if($("#dateRangePicker").val()!=""){
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedOperatorId="+$("#selectedOperatorId").val());
+				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&dateRangePicker="+$("#dateRangePicker").val());
 			}else{
-				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1&selectedOperatorId="+$("#selectedOperatorId").val());
+				$("#exportExcel").attr("href","${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?location=1");
 			}
 		};
 	</script>
-    	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-		
-</script>
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 0px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-            margin-left:23px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-       #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -4px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-  .media-choose{
-       		float:left;
-       		margin-left:-15px;
-       		}
-       #pagecontent{
-		height:1000px;
-	  }  
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
+
 </@override>
 <@override name="body">
 <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-   		<div id="page-edit">
-    		
-		    
-		     <div id="second">
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-					<div class="report6all  re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-					<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-					<div></div>
-				
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 		    </div>
-			</br>
-			<br><br>  	    
-   			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic_areal" style="background-image:none;"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">地域报表</li>
-			    </ul>  
- 			</div> 
- 			
-			<form id="formPage" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">
-	    		<div id="date">
-	    			<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>
-					<span id="date-one">
-						<a class="today da">今天</a>|
-						<a class="yesterday da">昨天</a>|
-						<a class="lastSevenDays da">前七天</a>|
-						<a class="lastWeek da">上周</a>|
-						<a class="thisMonth da">本月</a>|
-						<a class="lastMonth da">上月</a> 
-					</span>
-					<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
-					<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-			   		</span>
-			   		<input id="sign" type="submit" value="查询"/>
-			  </div>
-			 <input type="hidden" id="page" name="page" value="${pager.page}">
-		  	 <div id="fig_areal">
-				<table border="1" class="tablefig1" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11' background:"#f2f6fa">
-							
-		                    <th class="td1" style="text-align:center; width:5%">地域</th>
-		                    <th class="td1" style="text-align:center; width:7%">浏览量占比</th>
-		                    <th class="td1" style="text-align:center; width:6%">PV</th>
-		                    <th class="td1" style="text-align:center; width:6%">UV</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告曝光数</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告填充率</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告点击数</th>
-		                    <th class="td1" style="text-align:center; width:9%">广告点击率</th>
-		                    <th class="td1" style="text-align:center; width:7%">eCPM</th>
-		                    <th class="td1" style="text-align:center; width:8%">收入</th>
-						</tr>
-					
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			       
-			                <td class="td2" id="tdriqi" style="text-align:center;"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/back/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.viewRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.pv!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.uv!}</td>  
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.impression!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.fillRate!}%</td> 
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.click!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.clickRate!}%</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.eCpm!}</td>
-			                <td class="td2" id="tdriqi" style="text-align:center;">${report.income!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	       
-			<div id="daochu_areal" >
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
-			</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>地域报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/areal" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+		 		<div id="content_choose">
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 						
-			<div id="pagemove_areal">
-							<div id="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-			</div>
-        </form>
-        </div>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">地域</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd"><img id="img-city" type="close" value="${report.cn!}" src='${ctx}/assets/images/folderClose.gif' style="position: relative;top:-2px;left:-5px;cursor:pointer;"/>${report.cn!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel_areal()">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
     </div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
- 	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    
-</script>
-
-<script type="text/javascript">
-  
-  //  var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#formPage');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-    
-</script>
-		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 132 - 1263
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/place.ftl

@@ -1,1270 +1,139 @@
 <@override name="head">
-	<title>场景报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
+<title>场景报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.n2.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
- 	<script type="text/javascript" src="${ctx}/assets/back/js/data.js"></script> 
- 	<script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-			$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  		});
- </script>
-<!--控制柱状图取值-->			
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-						}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			b=$("#dateRangePicker").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				if(m[i]!=null){
-				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;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			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;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			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;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			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;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;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;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			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;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			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;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			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;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-</script>
-    <style type="text/css">
-        #tex{
-            border: 1px solid #DFDFDF;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: medium none;
-            margin-top: 4px;
-            padding: 0px;
-            font-size: 14px;
-            height: 15px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #67BA2F none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 3px;
-            height: 21px;
-            display: inline;
-            font-size: 14px;
-            margin-top: -6px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-        #pagecontent{
-		height:1000px;
-	  } 
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
-    	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			transcalender();
-		});	
-	
-});	
-		
-</script>
-    <script type="text/javascript">
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?place=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}
-function transcalender(){
-					var url = ""; 
-					a=$("#selectedOperatorId").val();
-				 	b=$("#dateRangePicker").val();
-				 	var page = $('#myform').find('input:hidden[name="page"]').val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/place?dateRangePicker=" + b+"&page="+page+"&selectedOperatorId="+a; 
-				 	console.log(url); 
-				 	location.href = url;
-}
-</script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    	<div id= "pagecontent">
-    		<div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 		    </div>
-			<br><br><br>	   
-
-			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">场景报表</li>
-			    </ul>  
- 			</div>  
-			<br></br>			 
-
-    		<div id="form">
-	    		<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">
-	    		<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-					<div id="date">
-						<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-				    	<span id="date-one">&nbsp;
-							<a class="today da">今天</a> |
-							<a class="yesterday da">昨天</a> |
-							<a class="lastSevenDays da">前七天</a> |
-							<a class="lastWeek da">上周</a> |
-							<a class="thisMonth da">本月</a> |
-							<a class="lastMonth da">上月</a>
-						</span>
-						<span id="tex"><i class="icon-calendar"></i>
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-				        </span>
-				         <button onclick="transcalender()" style="float:right" class="check_cal_place" id="check_cal_place">查询</button>
-						
-		      		</div>
-				 	
-				   <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>场景报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/place" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-					 <div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-					<div class="fig">
-				    	<table border="1" class="tablefig1" id="tablefig">
-				        	<thead>
-				            	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-				                	
-				                    <th class="td1"  style="text-align:left; width:10%">&nbsp;&nbsp;&nbsp;&nbsp;场景</th>
-				                    <th class="td1" style="text-align:center; width:10%" >浏览量占比</th>
-				                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-				                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-				                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-				                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-				                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-				                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-				                </tr> 
-				           	</thead>
-							<tbody>
-				            <#if reportList ??>
-				            <#list reportList as report>
-				            	<tr id="tr22">
-					               
-					                <td class="td2" id="tdriqi" style="text-align:left;">&nbsp;&nbsp;&nbsp;&nbsp;${report.place!}</td> 
-					                <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-					                <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-					                <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-					                <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-					                <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-					                <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-					                <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-					                <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					             </tr>
-					             </#list>  
-				                 </#if>
-				             </tbody>
-			           	</table>
-			       	</div>
-			        <div id="daochu">
-						<!--<button class="btn2" >导出Excel</button>-->
-						<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-					</div>
-						
-					<div id="pagemove_place">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-					</div>
-	        	</form>
-	 		</div>
-	 		</div>       
-    	</div>
-	</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-<script type="text/javascript">
-	$('#dateRangePicker').dateRangePicker();
-	$(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-
-<!-- basic scripts -->
-
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">场景</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.place!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('place','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 129 - 1251
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/position.ftl

@@ -1,1261 +1,139 @@
 <@override name="head">
-	<title>位置报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/daterangepicker.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
+<title>位置报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
-  	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>  
-  	
-  	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?position=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}		
-</script>	
-  <style>
-  	 #pagecontent{
-		height:1000px;
-	  } 
-     #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 3px;
-            height: 16px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -5px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	 select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-  </style>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
- <div id=content_bg>
-     <#include "/back/main/public-head.ftl">
-   		<div id="pagecontent">
-   			<div id="page-edit"> 
-		   		<div id="second">
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-						<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-						<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-						<div></div>
-			 </div>
-	    </br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1">&nbsp;<i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">&nbsp;首页&nbsp;</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">&nbsp;&nbsp;数据报表&nbsp;&nbsp;</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">&nbsp;&nbsp;位置报表&nbsp;</li>
-			    </ul>  
- 			</div>  
- 			</br></br>  
-    		<form id="searchform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
-					<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>
-					<span id="date-one" style="margin-left:9px;">
-									<a class="today da">今天</a> |
-									<a class="yesterday da">昨天</a> |
-									<a class="lastSevenDays da">前七天</a> |
-									<a class="lastWeek da">上周</a> |
-									<a class="thisMonth da">本月</a> |
-									<a class="lastMonth da">上月</a> 
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>位置报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/position" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
+					
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
 					</span>
-					<span id="tex"><i class="icon-calendar"></i>
-					<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>		
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
 					</span>
-					<input type="submit" name="submit" id="sign" value="查询">
-					<div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-				   </div>		
-								
-			
-	  			 <div class="fig">
-					<table border="1" class="tablefig1" id="tablefig">					        
-						 <thead>
-					      	 <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">		                    
-			                    <th class="td1" style="text-align:center;width:10%;">位置</th>                
-			                    <th class="td1" style="text-align:center;width:10%;">浏览量占比(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">PV</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">UV</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">广告曝光数</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-impression">广告填充率(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-click">广告点击数</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-visit">广告点击率(%)</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-conversion">eCPM</th>
-			                    <th class="td1" style="text-align:center;width:10%;" class="hidden-income">收入</th>                  
-                			</tr>
-                		</thead>
-                	<tbody>
-                    <#if reportList ??>
-                	<#list reportList as report>
-	                	<tr>		                    
-		                    <td  class="td2" style="text-align:center;"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td>
-		                    <td  class="td2" style="text-align:center;">${report.viewRate!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.pv!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.uv!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-		                    <td  class="td2" style="text-align:center;">${report.click!}</td>
-		                    <td  class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-		                    <td  class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-	                	</tr>
-	                </#list>  
-                    </#if>
-               	 	</tbody>
-            	</table>
-        	</div>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">位置</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.position==1>认证<#elseif report.position==2>跳转<#elseif report.position==3>上网过程</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
 			</form>
-			<div id="daochu_size">
-			  <!--<button class="export">导出EXCEL</button>-->
-			  <a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-			</div> 
-			
-	</div>	
+	  	</div>        
+    </div>
 </div>
-</div>     		
-
-<style type="text/css">
-.calendar{
-float:right;
-margin:5px 10px;
-}
-.controls-reset{
-margin-left:25px;
-margin-top:20px;
-}
-
-</style>
-<script type="text/javascript">
-   Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    }
-    $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0:
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1:
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3:
-                var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4:
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5:
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-</script>
-<script type="text/javascript">
-  $('#dateRangePicker').dateRangePicker({});
-  
-    var tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body'); 
-$(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  		$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  		$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  		$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){ 
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			u=${startDate};
-			v=${endDate}; 				
-			m=getele();
-			n=${listSize};			
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}		
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				j++;
-			}
-			<!--取y轴-->
-			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;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			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;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			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;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			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;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;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;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			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;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			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;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			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;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-</script>
-<!-- basic scripts -->
-
 </@override>
 <@extends name="/common/simple.ftl"/>

+ 134 - 1273
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/size.ftl

@@ -1,1278 +1,139 @@
 <@override name="head">
-	<title>尺寸报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/zbone.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-	<link href="${ctx}/assets/css/font-awesome.min.css"  rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-    <script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-    <script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report_size_bar.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
-	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
-	
-	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-		
-</script>
-	 <style type="text/css">
-        .tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-          	border: none;
-            margin-top: 4px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: -5px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-        
-      
-  .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-      #pagecontent{
-		height:1000px;
-	  }  
-	  select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-   
-	   		
-    </style>
+<title>尺寸报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
-
- <@override name="body">
- <div id=content_bg>
-	 <#include "/back/main/public-head.ftl">
-   <div id= "pagecontent"> 
-	    
-	   <div id="page-edit"> 
-	     <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<@override name="body">
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
 		    </div>
-	    </br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">尺寸报表</li>
-			    </ul>  
- 			</div>  
- 			 </br></br>
-    
-	    <form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">
-	   
-	    	 <input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">	
-	    	 					<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-									</div>
-								<span id="date-one" style="margin-left:9px;">
-									<a class="today da">今天</a> |
-									<a class="yesterday da">昨天</a> |
-									<a class="lastSevenDays da">前七天</a> |
-									<a class="lastWeek da">上周</a> |
-									<a class="thisMonth da">本月</a> |
-									<a class="lastMonth da">上月</a> 
-								</span>
-								<span class="tex"><i class="icon-calendar"></i>
-								<input  type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
-								</span>
-								<input id="sign" type="submit" value="查询"/>
-					 <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-						
-					<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>		
-						
-						
-						 <div class="fig">
-						 		<table border="1" class="tablefig1" id="tablefig">
-					            
-					                <thead>
-					                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-					                    
-					                    <th class="td1" style="width:10%;">尺寸</th>
-					                    <th class="td1" style="width:10%;">浏览量占比(%)</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">PV</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">UV</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">广告曝光数</th>
-					                    <th class="td1" style="width:10%;" class="hidden-impression">广告填充率</th>
-					                    <th class="td1" style="width:10%;" class="hidden-click">广告点击数</th>
-					                    <th class="td1" style="width:10%;" class="hidden-visit">广告点击率</th>
-					                    <th class="td1" style="width:10%;" class="hidden-conversion">eCPM</th>
-					                    <th class="td1" style="width:10%;" class="hidden-income">收入</th>
-					                  
-					                </tr>
-					                
-					                </thead>
-					
-					                <tbody>
-					                   <#if reportList ??>
-					                     <#list reportList as report>
-					             
-						                 <tr id="tr22">
-						                  
-						                    <td class="td2" style="text-align:center;">${report.width!}×${report.height!}</td> 
-						                    <td class="td2" style="text-align:center;">${report.viewRate!}</td>
-						                    <td class="td2" style="text-align:center;">${report.pv!}</td>
-						                    <td class="td2" style="text-align:center;">${report.uv!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.click!}</td>
-						                    <td class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-						                 </tr>
-					                   </#list>  
-				                      </#if>
-					                </tbody>
-					            </table>
-                          </div>
-						
-			
-	    </form>	
-					
-
-    
-    		<div id="daochu_size">
-				<!--<button class="btn2" >导出Excel</button>-->
-				<a class="ljbtn2" onclick="transdaochu()">导出Excel</a>	
-			</div>
-			<div id="pagemove_size">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-			</div>
-        
-  </div>   
- </div>  
- 
-  </div>    
-
-	
-
-			     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date-one  a').click(function(e){
-       	e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-               	var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-    
-    
-    
-    
-<script type="text/javascript">
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?size=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}
-		$('#dateRangePicker').dateRangePicker();
-		  $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  	
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
- 
- <!--控制柱状图取值-->			
-<script type="text/javascript">
-
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");	  				
-		  				var c=[];	  			
-			  			for(i=0;i<b.length;i++){  
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}	
-					}
-					catch(e){}
-					return c;
-	}
-
-$(function () {
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			<!--给柱子加颜色-->
-			var color=[];
-			for(i=0;i<n;i++){
-					color[i]='#36aeea';
-			}
-			n2=10;
-			n1=n*n2;
-			<!--取x轴-->
-			var xlabel=[];
-			var j=0;
-			for(i=0;i<n1;i+=n2){
-				xlabel[j]=m[i];
-				   j++;
-			}
-			<!--取y轴-->
-			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;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			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;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			var uv=[];
-			var j=0;
-			for(i=3;i<n1;i+=n2){
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>尺寸报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/size" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-					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;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			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;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;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;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			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;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			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;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			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;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);			
-			
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]       
-    });   
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true     
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]       
-    });    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv          
-        }]        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang         
-        }]       
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchongxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]       
-    });    
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]      
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });
-    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                  
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]        
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouruxlabel
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru
-     }]       
-    });
-});
-</script>
- 
- 
- 
-<!-- basic scripts -->
-
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">尺寸</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender">${report.width!}×${report.height!}</td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('size','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
+</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 131 - 1448
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/system.ftl

@@ -1,1456 +1,139 @@
 <@override name="head">
 <title>系统报表</title>
 <link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/xitong.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-<link rel="stylesheet" href="/ssp_operator/assets/css/indexpage.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
-
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/jquery.validate.min.js"></script>
-<script src="${ctx}/assets/back/js/highcharts.js"></script>
-<script src="${ctx}/assets/back/js/exporting.js"></script>
- <script type="text/javascript" src="${ctx}/assets/back/js/data.js"></script> 
- <script type="text/javascript" src="${ctx}/assets/back/js/drilldown.js"></script> 
-	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			$('#sign').click();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?system=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}			
-</script>
-<script type="text/javascript">
-
-	var datefalg = true;
-    $('#f1').validate({
-        errorElement: 'span',
-        errorClass: 'help-inline',
-        focusInvalid: false,
-        onfocusout: function(element) {
-                $(element).valid();
-            },
-        rules: {
-             campaignName: {
-                required: true,
-                maxlength:50
-            },
-            totalBudget:{
-                number:true,
-                required:true
-            },
-           dailyBudget:{
-                number:true,
-                
-            },
-           maxImpression:{
-                 number:true,
-            },
-           maxClick: {
-                number:true,
-            },
-            maxConversion: {
-                 number:true,
-              
-            },
-           
-            dailyMaxImpression:{
-                digits:true,
-            },
-            dailyMaxclick:{
-                digits:true,
-            },
-            dailyMaxConversion:{
-                digits:true,
-            }
-           },
-        messages: {
-            campaignName:{
-                required:"请输入内容!",
-                maxlength:"输入的长度大于50超出范围!"
-            },
-            totalBudget:{
-                required:"请输入内容!",
-                number:"请输入数字!"
-            },
-            dailyBudget:{
-                number:"请输入数字!"
-            },
-            maxImpression:{
-                number:"请输入数字!"
-            },
-           maxClick:{
-                
-                number:"请输入数字!"
-            },
-            
-            maxConversion:{
-               
-                number:"请输入数字!"
-            },
-           
-            dailyMaxImpression:{
-                digits:"请输入整数!"
-            },
-            dailyMaxclick:{
-                digits:"请输入整数!"
-            },
-            dailyMaxConversion:{
-                digits:"请输入整数!"
-            }
-           
-        },
-      invalidHandler: function (event, validator) { //display error alert on form submit
-            $('.alert-error', $('.login-form')).show();
-        },
-        highlight: function (e) {
-            $(e).closest('.p1').removeClass('info').addClass('error');
-            $(e).closest('.p1').find("span.c1").addClass('hidden');
-        },
-        success: function (e) {
-            $(e).closest('.p1').removeClass('error').addClass('info');
-            $(e).closest('.p1').find("span.c1").removeClass('hid');
-            $(e).remove();
-        },
-        errorPlacement: function (error, element) {
-        	element.next($("span .c1")).addClass('hid')
-            error.insertAfter(element.after());
-        },
-        
-    });
-
-$('input[name=startDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate!==null||startDate!==""){
-            $(this).nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-            if(startDate>endDate){
-                $('input[name=endDate]').nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $('input[name=endDate]').nextAll(".date-inline").text("选择开始投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-    $('input[name=endDate]').change(function(){
-        var startDate = $('input[name=startDate]').val();
-        var endDate = $('input[name=endDate]').val();
-        if(startDate==null||startDate==""){
-            $('input[name=startDate]').nextAll(".date-inline").text("请输入内容").addClass("loginerror");
-        }else{
-            if(startDate>endDate){
-                $(this).nextAll(".date-inline").text("必须大于或等于开始日期").addClass("loginerror");
-                datefalg = false;
-            }else{
-                $(this).nextAll(".date-inline").text("选择结束投放日期").removeClass("loginerror");
-                datefalg = true;
-            }
-        }
-    });
-</script>
-
-
-<script type="text/javascript">
-
-        	$(document).ready(function(){
-        	
-	        
-	        	 
-			$("#pv1").removeClass().addClass('fenlchange');
-			// alert("pv");
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			 //alert("pvname");
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			//alert("pvdata");
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-			
-     
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				 //alert("pv");
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				// alert("pvname");
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-	
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				// alert("uv");
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				// alert("uvname");
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})		
-	  			
-	  		//alert("hahaha");	
-	  			
-	  		});
-        </script>
-		
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			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;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			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;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			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;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			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;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;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;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			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;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			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;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			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;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-    $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-
- <style type="text/css">
-        #banner{
-            margin-left:10px;
-            
-            
-        }
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 1px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-         #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #36AEEA none repeat scroll 0px 0px;
-            cursor: pointer;
-            margin-left: 5px;
-            margin-top: 0px;
-            height: 21px;
-            display: inline;
-            font-size: 12px;
-            text-align: center;
-            width: 90px;
-        }
-		.date a{
-			color:#36aeea;
-		}
-		#third{
-			margin-top:5px;
-			margin-bottom:5px;
-			margin-left:2px;
-		}
-		 .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-      #pagecontent{
-		height:1000px;
-	  } 
-	   select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }		
-    </style>
-
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
+
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    <div id= "pagecontent">
-    <div id="page-edit">
-		    	 <div id="second">
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-							<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-							<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-							<div></div>
-						
-				 </div>
-			</br>	<br>	<br>
-		   	
-
-			<div id="third">
-				<ul>
-			        <li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">系统报表</li>
-			    </ul>  
- 			</div>  
-
-
-				<div id="form1">
-		    		<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">
-				    <input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">  
-				   		
-				        		<div class="control-group control-group-lfet">
-									<div class="controls-reset">
-										<div class="row-fluid input-append date " >
-										 <div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-										</div>  
-										<span id="banner">
-											<a >今天</a> |
-											<a class="yesterday">昨天</a> |
-											<a>前七天</a> |
-											<a>上周</a> |
-											<a>本月</a> |
-											<a>上月</a>
-										</span >			
-										<span id="tex" ><i class="icon-calendar"></i>
-										<input type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}" />
-										</span>
-										<input id="sign" type="submit" value="查询"/>
-									</div>
-									
-								</div>
-							</div>
-					
-							<div class="chart"> 
-								<div  id="linechart1" style="min-width: 94%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-							</div>
-					
-							<div class="fenall">	
-								<div  id="pv1" class="fenl">
-									<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-								</div>
-								<div  id="PV2" class="fenl">
-									<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-								</div>
-								<div  id="uv1" class="fenl">
-									<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-								</div>
-								<div id="bgs1" class="fenl">
-									<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-								</div>
-								<div  id="tan1" class="fenl">
-									<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-								</div>
-								<div id="djs1" class="fenl">
-									<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-								</div>
-								<div  id="dian1" class="fenl">
-									<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-								</div>
-								<div id="E1" class="fenl">
-									<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-								</div>
-								<div id="shr1" class="fenl">
-									<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-								</div>
-							</div>	
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/apmac">热点报表</a>
+		    </div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>系统报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/system" method="post">		
+        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-				       		<div class="fig">
-							    <table border="1" class="tablefig1" id="tablefig">
-							    	<thead>
-					                	<tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-						                   
-						                    <th  class="td1" style="width:10%;text-align:center;">系统</th>
-						                    <th class="td1" style="width:10%;text-align:center;">浏览量占比</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">PV</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">UV</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">广告曝光数</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-impression">广告填充率</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-click">广告点击数</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-visit">广告点击率</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-conversion">eCPM</th>
-						                    <th class="td1" style="width:10%;text-align:center;" class="hidden-income">收入</th>
-					                	</tr>
-				                	</thead>
-				                	<tbody>
-				                    <#if reportList ??>
-				                	<#list reportList as report>
-					                	 <tr id="tr22">
-						                 
-						                    <td class="td2" style="text-align:center;"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
-						                    <td class="td2" style="text-align:center;">${report.viewRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.pv!}</td>
-						                    <td class="td2" style="text-align:center;">${report.uv!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-						                    <td class="td2" style="text-align:center;">${report.click!}</td>
-						                    <td class="td2" style="text-align:center;">${report.clickRate!}%</td>  
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-						                    <td class="td2" style="text-align:center;" class="hidden-income">${report.income!}</td>
-					                	</tr>
-					                </#list>  
-				                    </#if>
-				                	</tbody>
-				            	</table>
-				        	</div>
-		       				 <div id="daochu_system">
-								<a  class="ljbtn2" onclick="transdaochu()" id="exportExcel">导出Excel</a>
-							</div>
-		       		
-				       		<div id="pagemove_system">
-							<div class="pageDiv pagemove">
-							       <#include "/common/pagination/simple.ftl"/>
-							</div>	
-							</div>
-		        </form>
-		     </div>
-   </div>
-  </div>
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">系统</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.system==1>windows<#elseif report.system==2>ios<#elseif report.system==3>android<#elseif report.system==4>mac<#elseif report.system==5>wp<#elseif report.system==6>other</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('system','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+				<div id="pageDiv">
+					<#include "/common/pagination/simple.ftl"/>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
-    <!-- basic scripts -->
 </@override>
-<@extends name="/common/simple.ftl"/>
-	     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-    
-    function getlastMonth_start(){
-    var now = new Date(); 
-    var nowMonth = now.getMonth(); 
-    var lastMonthDate = new Date(); 
-    lastMonthDate.setDate(1);
-    lastMonthDate.setMonth(lastMonthDate.getMonth()-1); 
-    
-    }
-
-    $('.controls-reset a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-</script>
-
-<script type="text/javascript">
-  
-    var $tooltip = $("<div class='tooltip right in' style='display:none;'><div class='tooltip-arrow'></div><div class='tooltip-inner'></div></div>").appendTo('body');
-    $('#dateRangePicker').dateRangePicker();
-    
-     $(function(){
-      	$('.pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			$('#sign').click();//触发搜索
-			//transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#banner a").click(function(){
-	  		$("#banner a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>
-		     
-		     
-
-
+<@extends name="/common/simple.ftl"/>

+ 126 - 1252
src/main/webapp/WEB-INF/pages/back/main/ad/operator/operator-report/type.ftl

@@ -1,1260 +1,134 @@
 <@override name="head">
-	<title>类型报表</title>
-	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
-	<link rel="stylesheet" href="/ssp_operator/assets/css/indexpage.css"/>
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
-	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />	
-	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
+<title>类型报表</title>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/report_operator.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script src="${ctx}/assets/back/js/highcharts.js"></script>
-	<script src="${ctx}/assets/back/js/exporting.js"></script>
- 	<script type="text/javascript" src="http://cdn.hcharts.cn/highcharts/modules/data.js"></script>
- 	<script type="text/javascript" >
-		//给下拉列表框准备数据
-function loadDataForPullDownList1(controlView, parentId, url, defaultLabel) {
-		//清空下拉框列表
-		controlView.empty();
-		//json请求,请求地址是url, 返回数据为data,回调函数去处理
-		$.getJSON(url, function(data) {
-			//打印控制台信息
-			
-			//console.log(data);
-			//console.log(data[parentId]);
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}==val.value){
-				controlView.append(
-					'<option selected="selected" value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-			//增加一个默认的列
-			controlView.append(
-				'<option value="-1">' + defaultLabel + '</option>'
-			);
-			//遍历后端传回来的json数据,追加在select后面,value是id,label是值
-			$.each(data[parentId], function(key, val) {
-				if(${selectedOperatorId}!=val.value){
-				controlView.append(
-					'<option value=' + val.value + '>' + val.label + '</option>'
-				);
-				}
-			});
-		});
-		//设置默认显示的列是-1;
-		controlView.val("-1");
-	}
-	
-	
-	//清除下拉框数据
-	function clearPullDownList(controlView, defaultLabel) {
-		controlView.empty();
-		controlView.append(
-			'<option value="-1">' + defaultLabel + '</option>'
-		);
-	}
-	
-	//调用loadDataForPullDownList,给媒体准备数据
-	function loadOperator() {
-		loadDataForPullDownList1($('#selectedOperatorId'), "operatorList", "/ssp_web/widget/selector/provide/operator?parentId=1", "全部媒体");
-	}
-	
-$(document).ready(function(){
-		loadOperator();
-		
-		//媒体value change调用此函数, 清除活动列表和策略列表
-		$('#selectedOperatorId').change(function() {
-			
-			var id = $(this).val();
-			
-			if(id == -1){
-				$(".media-choose  input[name=selectedOperatorId]").val(null);
-			} else {
-				$(".media-choose  input[name=selectedOperatorId]").val(id);
-			}
-			transcalender();
-		});	
-	
-});	
-function transdaochu(){
-					var url = ""; 
-					c=$("#selectedOperatorId").val();
-				 	//alert(c);
-				 	b=$("#dateRangePicker").val();
-					url = "${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel?device=1&dateRangePicker="+b+"&selectedOperatorId="+c;  
-				 	location.href = url;				 	
-}			
-</script>
-
- <style type="text/css">
-        #tex{
-            border:1px solid #dfdfdf;
-        }
-        #dateRangePicker{
-            width: 180px;
-            border: none;
-            margin-top: 4px;
-            height: 17px;
-            padding: 0px;
-            font-size:14px;
-        }
-        .icon-calendar{
-            margin-left:6px;
-        }
-        #sign{
-            border: medium none;
-            border-radius: 5px;
-            color: #FFF;
-            background: #67BA2F none repeat scroll 0% 0%;
-            cursor: pointer;
-            margin-left: 3px;
-            height: 21px;
-            display: inline;
-            font-size: 14px;
-        }
-        .media-choose{
-       		float:left;
-       		margin-left:5px;
-       		}
-       	#pagecontent{
-			height:1000px;
-		}
-		 select::-ms-expand { display: none; }	
-     #selectedOperatorId{
-     	width:150px;
-     	border: none;
-     	
-     	border-radius:5px;
-        appearance:none;
-	    -moz-appearance:none; /* Firefox */
-	    -webkit-appearance:none; /* Safari 和 Chrome */
-	    background:url(${ctx}/assets/back/images/triangle1.png) no-repeat scroll 95% 50%;
-	    background-color:#f2f6fa;
-     }
-      #selectedOperatorId option{
-      border:none;
-      }
-    </style>
-
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/exporting.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/report_operator.js"></script>
 </@override>
 <@override name="body">
-   <div id=content_bg>
-	<#include "/back/main/public-head.ftl">
-    	<div id= "pagecontent">
-    	  <div id="page-edit">
-		    <div id="second">
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report" >总体报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/size" >尺寸报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/position" >位置报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/system" >系统报表</a></div>
-				<div class="report6all re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/type" >类型报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/areal" >地域报表</a></div>
-				<div class="report6 re"><a class="alj" href="${ctx}/back/main/ad/operator/operator-report/place"  >场景报表</a></li>
-				<div></div>
+<div id=content_bg>
+	<#include "/operator/main/public-head.ftl">
+    <div id="pagecontent">
+   		<div id="content">
+		    <div id="selectBar">
+				<a href="${ctx}/back/main/ad/operator/operator-report">总体报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/size">尺寸报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/position">位置报表</a>
+				<a class="selectBar_change" href="${ctx}/back/main/ad/operator/operator-report/system">系统报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/type">类型报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/areal">地域报表</a>
+				<a href="${ctx}/back/main/ad/operator/operator-report/place">场景报表</a>
 		    </div>
-			</br></br></br>
-   		 	<div id="third">
-				<ul>
-			    	<li class="size1"><i class="icon-home homepic"></i> <a href="${ctx}/back/main/dashboard" style="color:#36aeea">首页</a>
-				    <span class="divider1"><i class="icon-angle-right"></i></span></li>
-			        <li class="size2"><a href="${ctx}/back/main/ad/operator/operator-report" style="color:#36aeea">数据报表</a></li>
-			        <li><span class="divider2"><i class="icon-angle-right"></i></span></li>
-			        <li style="color: #4c637b;" class="size3">类型报表</li>
-			    </ul>  
- 			</div>  
-	 		<br></br>	
-	 		<form action="${ctx}/back/main/ad/operator/operator-report/type" method="post">	
-	 				<div class="media-choose">
-											<select id="selectedOperatorId" name="selectedOperatorId" >
-											 <option value="-1">全部媒体</option>
-											</select>
-											<input type="hidden" id="aa" name="selectedOperatorId" value="${selectedOperatorId!}"/>
-					</div>	 
-			    		<span id="date-one">&nbsp;
-							<a class="today da">今天</a> |
-							<a class="yesterday da">昨天</a> |
-							<a class="lastSevenDays da">前七天</a> |
-							<a class="lastWeek da">上周</a> |
-							<a class="thisMonth da">本月</a> |
-							<a class="lastMonth da">上月</a>
-						</span >
-						<span id="tex"><i class="icon-calendar"></i>   
-						<input class="inputrili" type="text" name="dateRangePicker"  id="dateRangePicker" value="${dateRangePicker!}"/>
-			            </span>
-			             <button onclick="transcalender()" style="float:right" class="check_cal_type" id="check_cal">查询</button>
-					 <div class="chart"> 
-						<div  id="linechart1" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart2" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart3" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart4" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart5" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart6" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart7" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart8" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					    <div  id="linechart9" style="min-width: 84%; height: 325px; margin: 0 auto"></div>
-					</div>
-				 
-				 	<div class="fenall">	
-						<div  id="pv1" class="fenl">
-							<div id="pvname1" class="fenlname"><span class="lala">浏览量占比</span></div>
-						</div>
-						<div  id="PV2" class="fenl">
-							<div id="PVname1" class="fenlname"><span class="lala">PV</span></div>
-						</div>
-						<div  id="uv1" class="fenl">
-							<div id="uvname1" class="fenlname"><span class="lala">UV</span></div>
-						</div>
-						<div id="bgs1" class="fenl">
-							<div id="bgsname1" class="fenlname"><span class="lala">广告曝光数</span></div>
-						</div>
-						<div  id="tan1" class="fenl">
-							<div id="tanname1" class="fenlname"><span class="lala">广告填充率</span></div>
-						</div>
-						<div id="djs1" class="fenl">
-							<div id="djsname1" class="fenlname"><span class="lala">广告点击数</span></div>
-						</div>
-						<div  id="dian1" class="fenl">
-							<div id="dianname1" class="fenlname"><span class="lala">广告点击率</span></div>
-						</div>
-						<div id="E1" class="fenl">
-							<div id="Ename1" class="fenlname"><span class="lala">eCPM</span></div>
-						</div>
-						<div id="shr1" class="fenl">
-							<div id="shrname1" class="fenlname"><span class="lala">收入</span></div>
-						</div>
-					</div>	
-				 
-				 
-					<div class="fig">
-			            <table border="1" class="tablefig1" id="tablefig">
-			                <thead>
-			                <tr class="tr1"  id ='tr11' style="background:#f2f6fa;">
-			                
-			                    <th class="td1"  style="text-align:center; width:10%">类型</th>
-			                    <th class="td1" style="text-align:center; width:10%" >浏览量占比</th>
-			                    <th class="td1" style="text-align:center; width:10%" >PV</th>
-			                    <th class="td1" style="text-align:center; width:10%" >UV</th>
-			                    <th class="td1" style="text-align:center;  width:10%" >广告曝光数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告填充率</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击数</th>
-			                    <th class="td1" style="text-align:center; width:10%">广告点击率</th>
-			                    <th class="td1" style="text-align:center; width:10%">eCPM</th>
-			                    <th class="td1" style="text-align:center; width:10%" >收入</th>
-			                </tr> 
-			                </thead>
-			
-			                <tbody>
-			                    <#if reportList ??>
-			                <#list reportList as report>
-			             
-				                <tr id="tr22">
-				                	
-				                    <td class="td2" id="tdriqi" style="text-align:center;"><#if report.device==1>网页<#else>app</#if></td> 
-				                    <td class="td2" id="tdpv"  class="shishi" style="text-align:center;">${report.viewRate!}%</td>
-				                    <td class="td2" id="tduv" style="text-align:center;">${report.pv!}</td>
-				                     <td class="td2" id="tduv" style="text-align:center;">${report.uv!}</td>
-				                    <td class="td2" id="tdimpression" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
-				                    <td class="td2" id="tdfillrate" style="text-align:center;" class="hidden-impression">${report.fillRate!}%</td>
-				                    <td class="td2" id="tdclick" style="text-align:center;">${report.click!}</td>
-				                    <td class="td2" id="tdclickrate" style="text-align:center;">${report.clickRate!}%</td>  
-				                    <td class="td2" id="tdecpm" style="text-align:center;" class="hidden-income">${report.eCpm!}</td>
-				                    <td class="td2" id="tdincome" style="text-align:center;" class="hidden-income">${report.income!}</td>
-				                	
-				                </tr>
-				                </#list>  
-			                    </#if>
-			                </tbody>
-		           		 </table>
-		           	</div>
-		           			
-        </form>
-		           <div id="daochu_type">
-							
-							<a class="ljbtn2" onclick="transdaochu()" >导出Excel</a>
-				
-					</div>
+ 			<div id="navDiv">
+				<ul id="navDiv_ul">
+					<li><i class="icon-home"></i><a href="${ctx}/operator/main/dashboard">首页</a></li>
+					<li><i class="icon-angle-right"></i></li>
+					<li><a href="${ctx}/back/main/ad/operator/operator-report">数据报表</a></li>
+					<li><i class="icon-angle-right"></i></li>
+				    <li>类型报表</li>
+				</ul>  
+ 			</div>
+        	<form id="myform" action="${ctx}/back/main/ad/operator/operator-report/type" method="post">		
+        		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
+        		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
+		 		<div id="content_choose">	
+		 			<ul id="main_operatorListUl">
+						<li class="select_box" id="operatorListUl_box">
+							<span id="operatorListUl_span">${selectedOperatorName!}</span>
+							<ul class="son_ul" id="son_operatorListUl"></ul>
+						</li>
+					</ul>
+					<input type="hidden" name="selectedOperatorId" id="selectedOperatorId" value="${selectedOperatorId!}">
+					<input type="hidden" name="selectedOperatorName" id="selectedOperatorName" value="${selectedOperatorName!}">
 					
-				
-		
-  		</div>    
-	 </div>       
- 
+					<span id="dateChoose_span">
+						<a value="today">今天</a> |
+						<a id="yesterday" value="yesterday">昨天</a> |
+						<a value="lastSevenDays">前七天</a> |
+						<a value="lastWeek">上周</a> |
+						<a value="thisMonth">本月</a> |
+						<a value="lastMonth">上月</a> 
+					</span>
+					<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+						<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+					</span>
+					<input id="btn_formSubmit" type="submit" value="查询"/>
+				</div>
+				<div id="chartDivs"> 
+			    	<div id="linechart0" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart1" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart2" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart3" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart4" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart5" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart6" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart7" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+			        <div id="linechart8" class="linechart" style="min-width:93%;height:325px;margin:0 auto;"></div>
+				</div>
+				<div id="content_chartLender">
+					<input id="dataFrame" name="dataFrame" type="hidden" value="${dataFrame!}"/>
+					<div id="chartLender0" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">浏览量占比</span></div>
+					<div id="chartLender1" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">PV</span></div>
+					<div id="chartLender2" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">UV</span></div>
+					<div id="chartLender3" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告曝光数</span></div>
+					<div id="chartLender4" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告填充率</span></div>
+					<div id="chartLender5" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击数</span></div>
+					<div id="chartLender6" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">广告点击率</span></div>
+					<div id="chartLender7" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">eCPM</span></div>
+					<div id="chartLender8" class="chartLender_name"><span class="chartLender_box"></span><span class="chartLender_span">收入</span></div>
+				</div>
+				<table border="1" class="tableFig">
+			    	<thead>
+			    		<tr class="theadTr">
+			            	<th class="theadTh" style="width:10%">类型</th>
+			                <th class="theadTh" style="width:10%">浏览量占比(%)</th>
+			                <th class="theadTh" style="width:9%">PV</th>
+			                <th class="theadTh" style="width:9%">UV</th>
+			                <th class="theadTh" style="width:9%">广告曝光数</th>
+			                <th class="theadTh" style="width:9%">广告填充率</th>
+			                <th class="theadTh" style="width:9%">广告点击数</th>
+			                <th class="theadTh" style="width:9%">广告点击率</th>
+			                <th class="theadTh" style="width:9%">eCPM</th>
+			                <th class="theadTh" style="width:9%">收入</th>
+			            </tr> 
+			        </thead>
+			        <tbody>
+			        	<#if reportList ??>
+			            <#list reportList as report>
+				        <tr id="tbodyTr">
+				        	<td class="tbodyTd tbodyTdLender"><#if report.device==1>网页<#else>app</#if></td> 
+				        	<td class="tbodyTd">${report.viewRate!}</td> 
+				            <td class="tbodyTd">${report.pv!}</td>
+				            <td class="tbodyTd">${report.uv!}</td>
+				            <td class="tbodyTd">${report.impression!}</td>
+				            <td class="tbodyTd">${report.fillRate!}</td>
+				            <td class="tbodyTd">${report.click!}</td>
+				            <td class="tbodyTd">${report.clickRate!}</td>  
+				            <td class="tbodyTd">${report.eCpm!}</td>
+				            <td class="tbodyTd">${report.income!}</td>
+				        </tr>
+				        </#list>  
+			        	</#if>
+			    	</tbody>
+		     	</table>
+		        <div id="exportReport">
+					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/back/main/ad/operator/operator-report/exportOtherReportExcel','back')">导出Excel</a>
+				</div>
+			</form>
+	  	</div>        
+    </div>
 </div>
- 			     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-     $('#date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-    });
-    </script>   
-    
-<script type="text/javascript">
-         $('#dateRangePicker').dateRangePicker();
-          $(function(){
-      	$('#pagemove .pagination ul li a[href]').click(function(){
-			console.log('aaa');
-			var _page = $(this).attr('href').substr(1);//获取当前点击的页码
-			console.log(_page);
-			var _form = $('#myform');
-			_form.find('input:hidden[name="page"]').val(_page);//将当前点击的页码赋值给搜索form中页码输入框
-			console.log(_form.find('input:hidden[name="page"]').val());
-			//$('#check_cal').click();//触发搜索
-			transcalender();
-			return false;
-		});
-		//控制昨天今天上周颜色
-	  
-	  	$("#date-one a").click(function(){
-	  		$("#date-one a").css("color","#36aeea");
-	  		$(this).css("color","#4c637b")
-	  	
-	  	})	 	
-      });
-</script>    
-
-<script type="text/javascript">
-		function transcalender(){
-					var url = ""; 
-					a=$("#selectedOperatorId").val();
-				 	b=$("#dateRangePicker").val();
-				 	url = "${ctx}/back/main/ad/operator/operator-report/type?dateRangePicker=" + b+"&selectedOperatorId="+a;  
-				 	location.href = url;
-		}
-</script>
-		     
-<!--控制柱状图的显示隐藏变化-->
-<script type="text/javascript">
-        	$(document).ready(function(){
-        	$("#pv1").removeClass().addClass('fenlchange');
-			$("#pvname1").removeClass().addClass("fenlnamechange"); 
-			$("#pvdata1").removeClass().addClass("fenldatachange"); 
-			$("#linechart2").hide(); 
-			$("#linechart3").hide();  
-			$("#linechart4").hide();  
-			$("#linechart5").hide(); 
-			$("#linechart6").hide();  
-			$("#linechart7").hide();
-			$("#linechart8").hide(); 
-			$("#linechart9").hide();   
-
-	  		$("#pv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#pv1").removeClass().addClass('fenlchange');
-				$("#pvname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart2").hide(); 
-				$("#linechart1").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-			    $("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			$("#PV2").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#PV2").removeClass().addClass('fenlchange');
-				$("#PVname1").removeClass().addClass("fenlnamechange"); 
-				$("#pvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").show(); 
-				$("#linechart3").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-				$("#linechart7").hide();
-				$("#linechart8").hide(); 
-				$("#linechart9").hide();   
-	  			})	
-	  		$("#uv1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#uv1").removeClass().addClass('fenlchange');
-				$("#uvname1").removeClass().addClass("fenlnamechange"); 
-				$("#uvdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart3").show(); 
-				$("#linechart2").hide();
-				$("#linechart4").hide(); 
-				$("#linechart5").hide();  
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide();   
-	  			})	
-	  			
-	  		$("#bgs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#bgs1").removeClass().addClass('fenlchange');
-				$("#bgsname1").removeClass().addClass("fenlnamechange"); 
-				$("#bgsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart4").show(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").hide(); 
-				$("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})	
-	  			
-	  			$("#tan1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#tan1").removeClass().addClass('fenlchange');
-				$("#tanname1").removeClass().addClass("fenlnamechange"); 
-				$("#tandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart5").show(); 
-				$("#linechart6").hide(); 
-			    $("#linechart4").hide(); 
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		$("#djs1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#djs1").removeClass().addClass('fenlchange');
-				$("#djsname1").removeClass().addClass("fenlnamechange"); 
-				$("#djsdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart6").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})				
-	  			$("#dian1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#dian1").removeClass().addClass('fenlchange');
-				$("#dianname1").removeClass().addClass("fenlnamechange"); 
-				$("#diandata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart7").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart4").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  		
-	  			$("#E1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#E1").removeClass().addClass('fenlchange');
-				$("#Ename1").removeClass().addClass("fenlnamechange"); 
-				$("#Edata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart8").show(); 
-				$("#linechart5").hide(); 
-			    $("#linechart4").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart6").hide(); 
-			    $("#linechart9").hide(); 
-	  			})		
-	  			$("#shr1").click(function(){
-	  			$(".fenlchange").removeClass().addClass('fenl');
-	  			$(".fenlnamechange").removeClass().addClass('fenlname');
-	  			$(".fenldatachange").removeClass().addClass('fenldata');
-	  			$("#shr1").removeClass().addClass('fenlchange');
-				$("#shrname1").removeClass().addClass("fenlnamechange"); 
-				$("#shrdata1").removeClass().addClass("fenldatachange"); 
-				$("#linechart1").hide(); 
-				$("#linechart2").hide(); 
-				$("#linechart3").hide(); 
-				$("#linechart4").hide(); 
-				$("#linechart9").show(); 
-			    $("#linechart6").hide();  
-	      		$("#linechart7").hide();
-			    $("#linechart8").hide(); 
-			    $("#linechart5").hide(); 
-	  			})			  				  			
-	  		});
- </script>
-<!--控制柱状图取值-->		
-<script type="text/javascript">
-	function getele(){
-					try{
-						var b=document.getElementsByTagName("td");
-			  			var c=[];
-			  			for(i=0;i<b.length;i++){
-			  				c[i]=b[i].childNodes[0].nodeValue;
-			  			}
-					}
-					catch(e){}
-					return c;
-	}
-$(function () {
-			b=$(".span11").val();
-			u=${startDate};
-			v=${endDate}; 	
-			m=getele();
-			n=${listSize};
-			n2=10;
-			var color=[];
-			for(i=0;i<n;i++){
-				color[i]='#36aeea';
-			}
-			n1=n*n2;
-			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;
-			//alert("uselll[a]是"+uselll[a]);
-			num=a;
-				 for(b=0;b<lll.length;b++){
-				 	if(uselll[a]<=lll[b]){
-				 	 uselll[a]=lll[b];
-				 	 uselllxlabel[a]=lllxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			lll[num]=0;
-			}
-			//alert("uselllxlabel是"+uselllxlabel);
-			//alert("uselll是"+uselll);
-
-			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;
-			//alert("usepv[a]是"+usepv[a]);
-			num=a;
-				 for(b=0;b<pv.length;b++){
-				 	if(usepv[a]<=pv[b]){
-				 	 usepv[a]=pv[b];
-				 	 usepvxlabel[a]=pvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			pv[num]=0;
-			}
-			//alert("usepvxlabel是"+usepvxlabel);
-			//alert("usepv是"+usepv);
-
-
-			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;
-			//alert("useuv[a]是"+useuv[a]);
-			num=a;
-				 for(b=0;b<uv.length;b++){
-				 	if(useuv[a]<=uv[b]){
-				 	 useuv[a]=uv[b];
-				 	 useuvxlabel[a]=uvxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			uv[num]=0;
-			}
-			//alert("useuvxlabel是"+useuvxlabel);
-			//alert("useuv是"+useuv);
-
-			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;
-			//alert("useadbaoguang[a]是"+useadbaoguang[a]);
-			num=a;
-				 for(b=0;b<adbaoguang.length;b++){
-				 	if(useadbaoguang[a]<=adbaoguang[b]){
-				 	 useadbaoguang[a]=adbaoguang[b];
-				 	 useadbaoguangxlabel[a]=adbaoguangxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adbaoguang[num]=0;
-			}
-			//alert("useadbaoguangxlabel是"+useadbaoguangxlabel);
-			//alert("useadbaoguang是"+useadbaoguang);
-			var adtianchong=[];
-			var j=0;
-			for(i=5;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;
-			//alert("useadtianchong[a]是"+useadtianchong[a]);
-			num=a;
-				 for(b=0;b<adtianchong.length;b++){
-				 	if(useadtianchong[a]<=adtianchong[b]){
-				 	 useadtianchong[a]=adtianchong[b];
-				 	 useadtianchongxlabel[a]=adtianchongxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adtianchong[num]=0;
-			}
-			//alert("useadtianchongxlabel是"+useadtianchongxlabel);
-			//alert("useadtianchong是"+useadtianchong);
-			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;
-			//alert("useadclick[a]是"+useadclick[a]);
-			num=a;
-				 for(b=0;b<adclick.length;b++){
-				 	if(useadclick[a]<=adclick[b]){
-				 	 useadclick[a]=adclick[b];
-				 	 useadclickxlabel[a]=adclickxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclick[num]=0;
-			}
-			//alert("useadclickxlabel是"+useadclickxlabel);
-			//alert("useadclick是"+useadclick);
-			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;
-			//alert("useadclickl[a]是"+useadclickl[a]);
-			num=a;
-				 for(b=0;b<adclickl.length;b++){
-				 	if(useadclickl[a]<=adclickl[b]){
-				 	 useadclickl[a]=adclickl[b];
-				 	 useadclicklxlabel[a]=adclicklxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			adclickl[num]=0;
-			}
-			//alert("useadclicklxlabel是"+useadclicklxlabel);
-			//alert("useadclickl是"+useadclickl);
-
-			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;
-			//alert("useecpm[a]是"+useecpm[a]);
-			num=a;
-				 for(b=0;b<ecpm.length;b++){
-				 	if(useecpm[a]<=ecpm[b]){
-				 	 useecpm[a]=ecpm[b];
-				 	 useecpmxlabel[a]=ecpmxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			ecpm[num]=0;
-			}
-			//alert("useecpmxlabel是"+useecpmxlabel);
-			//alert("useecpm是"+useecpm);
-
-			var shouru=[];
-			var j=0;
-			for(i=9;i<n1;i+=n2){
-					
-					if(m[i]!=null){
-					shouru[j]=parseFloat(m[i]);
-					}
-				   j++;
-			}
-			
-//排序
-			var shouruxlabel = xlabel;
-			var useshouruxlabel = [];
-			var useshouru = [];
-			var num;
-			for(a=0;a<shouru.length;a++){
-			useshouru[a]=0;
-			//alert("useshouru[a]是"+useshouru[a]);
-			num=a;
-				 for(b=0;b<shouru.length;b++){
-				 	if(useshouru[a]<=shouru[b]){
-				 	 useshouru[a]=shouru[b];
-				 	 useshouruxlabel[a]=shouruxlabel[b];
-				 	 num=b;
-				 	}
-				 }
-			//alert("num是"+num);
-			shouru[num]=0;
-			}
-			//alert("useshouruxlabel是"+useshouruxlabel);
-			//alert("useshouru是"+useshouru);	
-
-     $('#linechart1').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '浏览量占比'
-        },
-        xAxis: {
-            categories: uselllxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-
-        series: [{
-            name: "浏览量占比",
-            colorByPoint: true,
-              colors:color,
-            data: uselll
-        }]
-        
-    });
-    
-  $('#linechart2').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'PV'
-        },
-        xAxis: {
-            categories: usepvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "PV",
-            colorByPoint: true,
-              colors:color,
-            data: usepv
-        }]
-        
-    });
-    
-    
-     $('#linechart3').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: 'UV'
-        },
-        xAxis: {
-           categories: useuvxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true
-                   
-                }
-            }
-        },
-	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-           pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "UV",
-            colorByPoint: true,
-              colors:color,
-            data: useuv   
-        }]
-        
-    });
-     $('#linechart4').highcharts({
-        chart: {
-            type: 'column'
-        },
-         title: {
-            text: '广告曝光数'
-        },
-        xAxis: {
-           categories: useadbaoguangxlabel
-        },
-       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },
-		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-
-        series: [{
-            name: "  广告曝光数",
-            colorByPoint: true,
-              colors:color,
-            data: useadbaoguang  
-        }]
-        
-    });
-    $('#linechart5').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告填充率'
-        },
-        xAxis: {
-            categories: useadtianchong
-        },   
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告填充率",
-            colorByPoint: true,
-              colors:color,
-            data: useadtianchong
-        }]
-        
-    });   
-     $('#linechart6').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '广告点击数'
-        },
-        xAxis: {
-            categories: useadclickxlabel
-        },     
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },	
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "广告点击数",
-            colorByPoint: true,
-              colors:color,
-            data:  useadclick       
-        }]       
-    });
-    $('#linechart7').highcharts({
-        chart: {
-            type: 'column'
-        },
-       title: {
-            text: '广告点击率'
-        },
-        xAxis: {
-            categories: useadclicklxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },
-		plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true,
-                    format: '{point.y:.2f}%'
-                }
-            }
-        },
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-            pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}%</b> of total<br/>'
-        },
-        series: [{
-            name: "广告点击率",
-            colorByPoint: true,
-              colors:color,
-            data: useadclickl
-        }]        
-    });    
-     $('#linechart8').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: 'eCPM'
-        },
-        xAxis: {
-           categories: useecpmxlabel
-        },      
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                 pointWidth: 30,
-                dataLabels: {
-                    enabled: true                 
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "eCPM",
-            colorByPoint: true,
-              colors:color,
-            data: useecpm         
-        }]       
-    }); 
-     $('#linechart9').highcharts({
-        chart: {
-            type: 'column'
-        },
-        title: {
-            text: '收入'
-        },
-        xAxis: {
-            categories: useshouru
-        },       
-        legend: {
-            enabled: false
-        },
-        plotOptions: {
-            series: {
-                borderWidth: 0,
-                pointWidth: 30,
-                dataLabels: {
-                    enabled: true                   
-                }
-            }
-        },		
-        tooltip: {
-            headerFormat: '<span style="font-size:11px">{series.name}</span><br>',
-              pointFormat: '<span style="color:{point.color}">{point.name}</span>: <b>{point.y:.2f}</b> <br/>'
-        },
-        series: [{
-            name: "收入",
-            colorByPoint: true,
-              colors:color,
-            data: useshouru                      
-        }]       
-    });
-});
-
-</script>
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 44 - 179
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl

@@ -8,17 +8,21 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
+	<style>
+	#date-radio input {	
+		opacity: 1 !important;
+		position: relative !important;
+	}
+	</style>
 </@override>
 
 <@override name="body">
@@ -26,13 +30,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -44,6 +47,7 @@
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report" method="post">
 	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="date">
 				<ul id="main_dimensionul" style="float:left; margin-right:10px;">
 					<li class="select_box" id="dimensionul_box">
@@ -56,12 +60,12 @@
 				
 		        <a id="a-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a> 
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -85,22 +89,22 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		
 		   		<div id="date-radio" style="float:right;margin-right:20px;">
 		   			<span>显示列(此项可多选)</span>
@@ -109,7 +113,6 @@
 					<input type="checkbox" name="item" value="visit" checked onclick="hideVisit()"/><span>到达</span>
 					<input type="checkbox" name="item" value="conversion" checked onclick="hideConversion()"/><span>转化</span>
 					<input type="checkbox" name="item" value="consume" checked onclick="hideConsume()"/><span>花费</span>
-					
 				</div>
 		  	</div>
 		   		
@@ -134,7 +137,7 @@
 								<td style="text-align:center; width:5%">${dimension.dimension}</td>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center; width:5%">广告主</td>
+		            			<td style="text-align:center; width:5%">日期</td>
 		            		</#if>
 			                <td style="text-align:center; width:5%" class="hidden-impression">曝光数</td>
 			                <td style="text-align:center; width:5%" class="hidden-click">点击数</td>
@@ -179,7 +182,8 @@
 								</#if>
 							</#list>
 		            		<#else>
-		            			<td style="text-align:center;">${report.advertiserName!}</td> 
+		            			<#setting datetime_format="yyyy-MM-dd"/> 
+		            			<td style="text-align:center;">${report.reportDate!?datetime}</td>
 		            		</#if>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impression!}</td>
 			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.click!}</td>
@@ -198,7 +202,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('total','${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -209,145 +213,6 @@
 		</div>
 		
     </div>
-</div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?total=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&selecteddimensionId="+$("#dimensionId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportDataReportExcel"+params);
-	};
-	
-	
-</script>    
-<style>
-	#date-radio input {	
-		opacity: 1 !important;
-		position: relative !important;
-	}
-	</style>		     
-
-<!-- basic scripts -->
-
+</div>		     
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 12 - 6
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/create.ftl

@@ -5,15 +5,17 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{
-			margin-left:20px;
+			margin:10px 0 0 20px;
 			color:red;
 			position: absolute;
 		}
@@ -31,6 +33,10 @@
 				if (!$("#validation-form").validate()) {
 					return false;
 				}
+				if($("#selected_ops").val() == ""){
+					bootbox.alert("请选择维度方案!");
+					return false;
+				}
 				$.ajax({
 			    	type: "POST",
 			        url: "${ctx}/back/main/ad/report/advertiser-report/save",

+ 15 - 10
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/dimension.ftl

@@ -6,10 +6,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 	
@@ -46,13 +47,17 @@
 			$("#all-btn-delete").click(function(){
 				var checkboxs = $("#tablefig tbody input[type='checkbox']:checked");
 				var _param = checkboxs.serialize();
-				if(checkboxs.length==0){
-					alert("请选择需要删除的维度!");
-					return false;
+				if(checkboxs.length > 0){
+					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
+						if (ensure) {	
+							$.post("${ctx}/back/main/ad/report/advertiser-report/delete", _param, function(data) {
+								$('#formPage').submit();
+							});
+						}
+					});
+				}else{
+					bootbox.alert("请选择需要删除的维度!");
 				}
-				$.post("${ctx}/back/main/ad/report/advertiser-report/delete", _param, function(data) {
-					$('#formPage').submit();
-				});
 			});
 			
 			//删除

+ 13 - 7
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/edit.ftl

@@ -1,19 +1,21 @@
 <@override name="head">
-	<title>新增维度</title>
+	<title>编辑维度</title>
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/yf.yang.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dimension.js"></script>
 	
 	<style>
 		.spanVaildate{
-			margin-left:20px;
+			margin:10px 0 0 20px;
 			color:red;
 			position: absolute;
 		}
@@ -39,6 +41,10 @@
 				if (!$("#validation-form").validate()) {
 					return false;
 				}
+				if($("#selected_ops").val() == ""){
+					bootbox.alert("请选择维度方案!");
+					return false;
+				}
 				$.ajax({
 			    	type: "POST",
 			        url: "${ctx}/back/main/ad/report/advertiser-report/save",

+ 35 - 168
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/osReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -32,13 +31,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -51,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/osReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -69,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a>
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -158,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('system','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -168,137 +167,5 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?system=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 35 - 168
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/regionReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -32,13 +31,12 @@
 	<#include "/back/main/public-head.ftl">
     <div id="pagecontent" style="height:800px;">
 		<div id="content">
-			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -51,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/regionReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -69,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a> 
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -158,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('location','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -168,137 +167,5 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?location=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr; 
-		params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 35 - 167
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/sceneReport.ftl

@@ -8,16 +8,15 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/moment.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.custom.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.daterangepicker.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/date.js"></script>
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/report.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/zbcc.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/moment.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.daterangepicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/date.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/dropDownList.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/shortcutkey_datePicker.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/report_advertiser.js"></script>
 	<style>
 	#date-radio input {	
 		opacity: 1 !important;
@@ -34,10 +33,10 @@
 			
 			<div id="second">
 				<ul style="margin:0px;">
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab" onMouseOver="yanse()" onmouseout="yanse1()">总体报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj" onmouseover="yanse()" onmouseout="yanse1()">地域报表</span></a></li>
-					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">系统报表</span></a></li>
-					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab" onmouseover="yanse()" onmouseout="yanse1()">场景报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport"><span class="baobiao11 ab">场景报表</span></a></li>
 				</ul>
 			</div>
 	   		<div id="third">
@@ -50,7 +49,8 @@
 				 </ul>  
 	 		</div>
 	 		<form id="formPage" action="${ctx}/back/main/ad/report/advertiser-report/sceneReport" method="post">
-	 		 <input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="page" name="page" value="${pager.page}">
+	 		<input type="hidden" id="dateTab" name="dateTab" value="${dateTab!}">
 	 		<div id="selectuls">
 				<ul id="main_advertiserul">
 					<li class="select_box" id="advertiserul_box">
@@ -68,32 +68,32 @@
 				</ul>
 				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
 				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<ul id="main_activeul">
-					<li class="select_box" id="activeul_box">
-						<span id="activeul_span">${selectedcampaignName!}</span>
-						<ul class="son_ul" id="activeul_son_ul"></ul>
+				<ul id="main_campaignul">
+					<li class="select_box" id="campaignul_box">
+						<span id="campaignul_span">${selectedcampaignName!}</span>
+						<ul class="son_ul" id="campaignul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedcampaignId" id="activeId" value="${campaignId!}">
-				<input type="hidden" name="selectedcampaignName" id="activeName" value="${selectedcampaignName!}">
-				<ul id="main_putul">
-					<li class="select_box" id="putul_box">
-						<span id="putul_span">${selectedadGroupName!}</span>
-						<ul class="son_ul" id="putul_son_ul"></ul>
+				<input type="hidden" name="selectedcampaignId" id="campaignId" value="${campaignId!}">
+				<input type="hidden" name="selectedcampaignName" id="campaignName" value="${selectedcampaignName!}">
+				<ul id="main_adGroupul">
+					<li class="select_box" id="adGroupul_box">
+						<span id="adGroupul_span">${selectedadGroupName!}</span>
+						<ul class="son_ul" id="adGroupul_son_ul"></ul>
 					</li>
 				</ul>
-				<input type="hidden" name="selectedadGroupId" id="putId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="putName" value="${selectedadGroupName!}">
+				<input type="hidden" name="selectedadGroupId" id="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
 	 		</div>
 	
 			<div id="date">
 				<span id="date-one">
-					<a class="today da">今天</a>|
-					<a class="yesterday da">昨天</a>|
-					<a class="lastSevenDays da">前七天</a>|
-					<a class="lastWeek da">上周</a>|
-					<a class="thisMonth da">本月</a>|
-					<a class="lastMonth da">上月</a> 
+					<a class="today da" value="today">今天</a> |
+					<a id="yesterday" class="yesterday da" value="yesterday">昨天</a> |
+					<a class="lastSevenDays da" value="lastSevenDays">前七天</a> |
+					<a class="lastWeek da" value="lastWeek">上周</a> |
+					<a class="thisMonth da" value="thisMonth">本月</a> |
+					<a class="lastMonth da" value="lastMonth">上月</a>
 				</span>
 				<span id="tex"><i class="icon-calendar" style="background-image:none;"></i>
 				<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
@@ -157,7 +157,7 @@
 	        </div>
 	        
 			<div id="daochu" style="margin-left:20px;">
-				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel()">导出Excel</a>
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
 			</div>
 						
 			<div id="pageDiv" style="margin: 12px 10px 0 0;">
@@ -167,137 +167,5 @@
 		</form>
     </div>
 </div>
-     
-<script type="text/javascript">
-    Date.prototype.format = function(format)
-    {
-        var o = {
-            "M+" : this.getMonth()+1, //month
-            "d+" : this.getDate(),    //day
-            "h+" : this.getHours(),   //hour
-            "m+" : this.getMinutes(), //minute
-            "s+" : this.getSeconds(), //second
-            "q+" : Math.floor((this.getMonth()+3)/3),  //quarter
-            "S" : this.getMilliseconds() //millisecond
-        }
-        if(/(y+)/.test(format)) format=format.replace(RegExp.$1,
-                (this.getFullYear()+"").substr(4 - RegExp.$1.length));
-        for(var k in o)if(new RegExp("("+ k +")").test(format))
-            format = format.replace(RegExp.$1,
-                    RegExp.$1.length==1 ? o[k] :
-                            ("00"+ o[k]).substr((""+ o[k]).length));
-        return format;
-    }
-
-    function getlastDate(last)
-    {
-        //获取系统时间
-        var LSTR_ndate=new Date();
-        var LSTR_Year=LSTR_ndate.getFullYear();
-        var LSTR_Month=LSTR_ndate.getMonth();
-        var LSTR_Date=LSTR_ndate.getDate();
-        //处理
-        var uom = new Date(LSTR_Year,LSTR_Month,LSTR_Date);
-        uom.setDate(uom.getDate()-last);//取得系统时间的前一天,重点在这里,负数是前几天
-        var LINT_MM=uom.getMonth();
-        LINT_MM++;
-        var LSTR_MM=LINT_MM > 10?LINT_MM:("0"+LINT_MM)
-        var LINT_DD=uom.getDate();
-        var LSTR_DD=LINT_DD > 10?LINT_DD:("0"+LINT_DD)
-        //得到最终结果
-        var uom = (uom.format('yyyy-MM-dd'));
-        return uom;
-    }
-
-    $('#date #date-one a').click(function(e){
-        e.preventDefault;
-        var ind = $(this).index();
-        var input = $('#dateRangePicker');
-        switch (ind){
-            case 0://今天
-                var startDate = (Date.today().format('yyyy-MM-dd'));
-                var endDate = (Date.today().format('yyyy-MM-dd'));
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 1://昨天
-                var startDate = getlastDate(1);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 2://前七天
-                var startDate = getlastDate(7);
-                var endDate = getlastDate(1);
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-             case 3://上周
-               	var startDate=(moment().add(-1,'week').startOf('week').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'week').endOf('week').format('YYYY-MM-DD'));     
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 4://本月
-                var startDate=(moment().startOf('month').format('YYYY-MM-DD'));
-                var endDate=(Date.today().format('yyyy-MM-dd'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-            case 5://上月
-                var startDate=(moment().add(-1,'month').startOf('month').format('YYYY-MM-DD'));
-                var endDate=(moment().add(-1,'month').endOf('month').format('YYYY-MM-DD'));                                                                                       
-                var val = startDate+' to '+endDate;
-                input.val(val);
-                break;
-        }
-        
-    });
-    </script>   
-<script type="text/javascript">
-   
-	$('#dateRangePicker').dateRangePicker();
-	
-	//曝光
-	function hideImpression(){
-		$(".hidden-impression").toggle();
-	}
-	//点击
-	function hideClick(){	
-		$(".hidden-click").toggle();
-	}
-	//到达
-	function hideVisit(){
-		$(".hidden-visit").toggle();
-	}
-	//转化
-	function hideConversion(){
-		$(".hidden-conversion").toggle();
-	}
-	//花费
-	function hideConsume(){	
-		$(".hidden-consume").toggle();
-	}
-	
-	//导出execl
-	function exportExcel(){
-		var checkboxs = $("#date-radio input[name='item']:checked");
-		var checkboxStr = "";
-		checkboxs.each(function(i){
-			checkboxStr += $(this).val()+",";
-		});
-		if(checkboxStr!=""){
-			checkboxStr = checkboxStr.substring(0,checkboxStr.length-1);
-		}
-	    var params = "?place=1&dateRangePicker="+$("#dateRangePicker").val()+"&selectedadvertiserId="+$("#advertiserId").val()+"&selectedorderId="+$("#orderId").val()+"&selectedcampaignId="+$("#activeId").val()+"&selectedadGroupId="+$("#putId").val()+"&checkItems="+checkboxStr;
-	    params += "&selectedadvertiserName="+$("#advertiserName").val()+"&selectedorderName="+$("#orderName").val()+"&selectedcampaignName="+$("#activeName").val()+"&selectedadGroupName="+$("#putName").val();
-		$("#exportExcel").attr("href","${ctx}/back/main/ad/report/advertiser-report/exportOtherReportExcel"+params);
-	};
-</script>    
-		     
-
-<!-- basic scripts -->
-
 </@override>
-<@extends name="/common/simple.ftl"/>
-
+<@extends name="/common/simple.ftl"/>

+ 6 - 8
src/main/webapp/WEB-INF/pages/back/main/audit/audit-banner/index.ftl

@@ -4,7 +4,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/audit.js"></script>
+
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -42,10 +46,4 @@
 		
 	</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<!--linked js-->
-<script type="text/javascript" src="${ctx}/assets/back/js/audit.js"></script>
+<@extends name="/common/simple.ftl"/>

+ 63 - 68
src/main/webapp/WEB-INF/pages/back/main/audit/audit/details.ftl

@@ -4,7 +4,68 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	
+<script type="text/javascript">
+	$(function(){
+		$("#subNav span").click(function(){
+			var _href = $(this).attr('href');
+			window.location.assign(_href);
+		});
+		
+		//搜索输入框的样式改变
+		$("#searchBar input[name='searchValue']").focus(function(){
+			$(this).val("");
+		});
+		$("#searchBar input[name='searchValue']").blur(function(){
+			if($(this).val()== ""){
+				$(this).val("请输入需要搜索的内容");
+			}
+		});
+		$('#searchBar button').click(function(){
+			var _href = $(this).attr('href');
+			var _value = $(this).attr('value');
+			var _text = $(this).text();
+			if(_text == '审核通过'){
+				var _param = {
+            			'auditId':_value,
+            			'checkStatus':1,
+            	};
+				$.post(_href,_param,function(data){
+					if(data == "ok"){
+						window.location = document.referrer;
+					} else {
+						bootbox.alert("审核失败!");
+					}
+				})
+			} else{
+				 bootbox.prompt("请输入审核不通过的理由", function(result) {
+		            if(result === null){
+		            	
+		            } else if (result == '') {
+		            	bootbox.alert("请输入审核不通过的理由");
+		            } else {
+		            	var _param = {
+		            			'auditId':_value,
+		            			'checkMemo':result,
+		            			'checkStatus':-1,
+		            	};
+		            	$.post(_href,_param,function(data){
+		            		if(data == "ok"){
+		            			window.location = document.referrer; 
+							} else {
+								bootbox.alert("审核失败!");
+							}
+						})
+		            }
+		        });
+			}
+		});
+	});
+</script>
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -69,70 +130,4 @@
 		</div>
 	</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<script type="text/javascript">
-	$(function(){
-		$("#subNav span").click(function(){
-			var _href = $(this).attr('href');
-			window.location.assign(_href);
-		});
-		
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
-		//搜索输入框的样式改变
-		$("#searchBar input[name='searchValue']").focus(function(){
-			$(this).val("");
-		});
-		$("#searchBar input[name='searchValue']").blur(function(){
-			if($(this).val()== ""){
-				$(this).val("请输入需要搜索的内容");
-			}
-		});
-		$('#searchBar button').click(function(){
-			var _href = $(this).attr('href');
-			var _value = $(this).attr('value');
-			var _text = $(this).text();
-			if(_text == '审核通过'){
-				var _param = {
-            			'auditId':_value,
-            			'checkStatus':1,
-            	};
-				$.post(_href,_param,function(data){
-					if(data == "ok"){
-						window.location = document.referrer;
-					} else {
-						bootbox.alert("审核失败!");
-					}
-				})
-			} else{
-				 bootbox.prompt("请输入审核不通过的理由", function(result) {
-		            if(result === null){
-		            	
-		            } else if (result == '') {
-		            	bootbox.alert("请输入审核不通过的理由");
-		            } else {
-		            	var _param = {
-		            			'auditId':_value,
-		            			'checkMemo':result,
-		            			'checkStatus':-1,
-		            	};
-		            	$.post(_href,_param,function(data){
-		            		if(data == "ok"){
-		            			window.location = document.referrer; 
-							} else {
-								bootbox.alert("审核失败!");
-							}
-						})
-		            }
-		        });
-			}
-		});
-	});
-</script>
+<@extends name="/common/simple.ftl"/>

+ 3 - 3
src/main/webapp/WEB-INF/pages/back/main/audit/audit/index.ftl

@@ -4,7 +4,8 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/audit.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/audit.js"></script>
 </@override>
 <@override name="body">
 	<#include "/back/main/public-head.ftl">
@@ -43,5 +44,4 @@
 		</div>
 	</div>
 </@override>
-<@extends name="/common/simple.ftl"/>
-<script type="text/javascript" src="${ctx}/assets/back/js/audit.js"></script>
+<@extends name="/common/simple.ftl"/>

+ 9 - 9
src/main/webapp/WEB-INF/pages/back/main/authority/create.ftl

@@ -5,10 +5,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -179,16 +179,16 @@
 					<div class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
 						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" value="1" checked="checked"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:230px;"></span><span>暂停</span></label>
+						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
 					</div>
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限:</label>
 						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="71" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="61" /><span class="lbl" style="position:absolute;left:287px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="62" /><span class="lbl" style="position:absolute;left:484px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="73" /><span class="lbl" style="position:absolute;left:630px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="63" /><span class="lbl" style="position:absolute;left:801px;"></span><span class="input-checkbox-span">客户账号管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="61" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="62" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="63" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">

+ 10 - 10
src/main/webapp/WEB-INF/pages/back/main/authority/edit.ftl

@@ -5,10 +5,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{
@@ -175,17 +175,17 @@
 					<div class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>账号状态:</label>
 						<label class="form-align-radio"><input id="input-radio-open" autocomplete="off" name="state" type="radio" <#if account.state=="1">checked</#if> value="1"><span class="lbl" style="position:absolute;left:100px;"></span><span>开启</span></label> 
-						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span class="lbl" style="position:absolute;left:230px;"></span><span>暂停</span></label>
+						<label class="form-align-radio"><input id="input-radio-down" autocomplete="off" name="state" type="radio" <#if account.state=="0">checked</#if> value="0"><span class="lbl" style="position:absolute;left:155px;"></span><span>暂停</span></label>
 					</div>
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限:</label>
 						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
 						<input class="input-checkbox" id="input-checkbox1" type="checkbox" value="71" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" value="61" /><span class="lbl" style="position:absolute;left:287px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" value="62" /><span class="lbl" style="position:absolute;left:484px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" value="73" /><span class="lbl" style="position:absolute;left:630px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" value="63" /><span class="lbl" style="position:absolute;left:801px;"></span><span class="input-checkbox-span">客户账号管理</span>
+						<input class="input-checkbox" type="checkbox" value="61" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
+						<input class="input-checkbox" type="checkbox" value="62" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
+						<input class="input-checkbox" type="checkbox" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" value="63" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">
@@ -198,4 +198,4 @@
 	</div>
 </div>
 </@override>
-<@extends name="/common/simple.ftl"/>
+<@extends name="/common/simple.ftl"/>

+ 15 - 10
src/main/webapp/WEB-INF/pages/back/main/authority/list.ftl

@@ -7,10 +7,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){
@@ -46,13 +47,17 @@
 					url = "${ctx}/back/main/authority/disable";
 					type = "暂停";
 				}
-				if(checkboxs.length==0){
-					alert("请选择需要"+type+"的用户!");
-					return false;
+				if(checkboxs.length > 0){
+					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
+						if (ensure) {	
+							$.post(url, _param, function(data) {
+								$('#formPage').submit();
+							});
+						}
+					});
+				}else{
+					bootbox.alert("请选择需要"+$(this).text()+"的用户!");
 				}
-				$.post(url, _param, function(data) {
-					$('#formPage').submit();
-				});
 			});
 			
 			//开启,暂停

+ 4 - 4
src/main/webapp/WEB-INF/pages/back/main/authority/loginperson.ftl

@@ -4,10 +4,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 5 - 6
src/main/webapp/WEB-INF/pages/back/main/client-account/create.ftl

@@ -3,13 +3,12 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
-		<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 4 - 4
src/main/webapp/WEB-INF/pages/back/main/client-account/edit.ftl

@@ -5,10 +5,10 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
 	
 	<style>
 		.spanVaildate{

+ 15 - 10
src/main/webapp/WEB-INF/pages/back/main/client-account/list.ftl

@@ -7,10 +7,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/back/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 	
 	<script type="text/javascript" >
 		$(function(){
@@ -66,13 +67,17 @@
 					url = "${ctx}/back/main/client-account/disable";
 					type = "暂停";
 				}
-				if(checkboxs.length==0){
-					alert("请选择需要"+type+"的用户!");
-					return false;
+				if(checkboxs.length > 0){
+					bootbox.confirm("确定" +$(this).text() + "吗?", function(ensure) {					
+						if (ensure) {	
+							$.post(url, _param, function(data) {
+								$('#formPage').submit();
+							});
+						}
+					});
+				}else{
+					bootbox.alert("请选择需要"+$(this).text()+"的数据!");
 				}
-				$.post(url, _param, function(data) {
-					$('#formPage').submit();
-				});
 			});
 			
 			//开启,暂停

+ 103 - 112
src/main/webapp/WEB-INF/pages/back/main/dashboard.ftl

@@ -5,13 +5,111 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/dashboard.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/newforwebback.css"/>
 	<!--js dependence-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
+<script type="text/javascript">
+$(function () {
+	var flow=[];
+	var tipLabel=new Array("PV","UV","Impression","Click","Income");
+	var pv=tipLabel[0];
+	$.ajax({
+		type : 'post',
+		url : '/ssp_web/back/main/dashboard/list',
+		async : false,
+		cache : false,
+		dataType : 'json',
+		success : function(data){
+			var pvArray = [];
+			var uvArray = [];
+			var impressionArray = [];
+			var clickArray = [];
+			var incomeArray = [];
+			$.each(data,function(n,value) {
+				pvArray[n] = value.pv;
+				uvArray[n] = value.uv;
+				impressionArray[n] = value.impression;
+				clickArray[n] = value.click;
+				incomeArray[n] = value.income;
+			});
+			flow[0] = pvArray;
+			flow[1] = uvArray;
+			flow[2] = impressionArray;
+			flow[3] = clickArray;
+			flow[4] = incomeArray;	 
+		},
+		error : function (XMLHttpRequest, textStatus, errorThrown) {
+			// 通常 textStatus 和 errorThrown 之中
+			// 只有一个会包含信息
+			//alert('error');
+			this; // 调用本次AJAX请求时传递的options参数
+		}
+	});
+		
+	//设置日期,当前日期的前七天
+	var myDate = new Date(); //获取今天日期
+	var myYear = myDate.getFullYear();//获取年份
+	myDate.setDate(myDate.getDate() - 7);
+	var labels = [];
+	var dateTemp;
+	var flag = 1;
+	for (var i = 0; i < 7; i++) {
+		dateTemp = myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/" + myDate.getDate();
+		labels.push(dateTemp);
+		myDate.setDate(myDate.getDate() + flag);
+	}		
+	drawDiagram(myDate,flow[0],pv);
+		
+	$('#data_number td').click(function(){
+		$('#data_number td').css({"background-color":"#ffffff","color":"black"});
+		$(this).css({"background-color":"#36aeea","color":"#ffffff"});
+		var n = $(this).index();
+		pv=tipLabel[n];
+		var data = flow[n];
+		$('#baseTitle').text('近7天全部广告位' + pv);
+		drawDiagram(myDate,data,pv);
+	});
+		
+	function drawDiagram(myDate,data,pv){		
+		$('#diagram').highcharts({ 
+			chart: { type: 'line' },
+			title: { text: '' }, //标题
+			//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
+			xAxis: { categories: labels }, 
+			yAxis: { 
+				title: { text: '' }, 
+				plotLines: [{ value: 0, width: 1, color: '#808080' }]
+			}, 
+			tooltip: { crosshairs: true, shared: true }, 
+			legend: { 
+				enabled:false,
+			},
+			credits:{
+				enabled:false,
+			},
+			
+			series: [{ 
+				name: pv, 
+				data: data,
+				color:'#36aeea',
+				marker:{
+					symbol: 'circle',
+					fillColor:'#ffffff',
+					lineColor:'#87b9f6',
+					lineWidth: 2,
+					radius: 5,
+				}
+			}]
+		}); 
+	}
+});
+</script>
 </@override>
 
 <@override name="body">
-	<!-- PAGE CONTENT BEGINS HERE -->
-	<#include "public-head.ftl">
-		
+<!-- PAGE CONTENT BEGINS HERE -->
+<#include "public-head.ftl">
 	<div id="pagecontent">
 		<div id="quickJump">
 			<span><i class="icon-home">&nbsp;</i><a src="${ctx}/back/main/dashboard">首页</a></span>
@@ -50,111 +148,4 @@
 	</div>
 
 </@override>
-<@extends name="/common/simple.ftl"/>
-<script src="http://cdn.hcharts.cn/highcharts/highcharts.js" type="text/javascript"></script> 
-<!--修改个人信息js 控制上下切换-->
-<script type="text/javascript">
-	$(document).ready(function(){
-		  $("#divselect").click(function(){
-		  	$("#divselect ul").slideToggle("fast");
-		  });
-	});
-	
-	$(function () {
-		var flow=[];
-		var tipLabel=new Array("PV","UV","Impression","Click","Income");
-		var pv=tipLabel[0];
-		$.ajax({
-			type : 'post',
-			url : '/ssp_web/back/main/dashboard/list',
-			async : false,
-			cache : false,
-			dataType : 'json',
-			success : function(data){
-				var pvArray = [];
-				var uvArray = [];
-				var impressionArray = [];
-				var clickArray = [];
-				var incomeArray = [];
-				 $.each(data,function(n,value) {
-					 pvArray[n] = value.pv;
-					 uvArray[n] = value.uv;
-					 impressionArray[n] = value.impression;
-					 clickArray[n] = value.click;
-					 incomeArray[n] = value.income;
-			      });
-				 flow[0] = pvArray;
-				 flow[1] = uvArray;
-				 flow[2] = impressionArray;
-				 flow[3] = clickArray;
-				 flow[4] = incomeArray;
-				 
-			},
-			error : function (XMLHttpRequest, textStatus, errorThrown) {
-			    // 通常 textStatus 和 errorThrown 之中
-			    // 只有一个会包含信息
-				//alert('error');
-			    this; // 调用本次AJAX请求时传递的options参数
-			}
-		});
-		
-		//设置日期,当前日期的前七天
-		var myDate = new Date(); //获取今天日期
-		var myYear = myDate.getFullYear();//获取年份
-		myDate.setDate(myDate.getDate() - 7);
-		var labels = [];
-		var dateTemp;
-		var flag = 1;
-		for (var i = 0; i < 7; i++) {
-			dateTemp = myDate.getFullYear() + "/" + (myDate.getMonth() + 1) + "/" + myDate.getDate();
-			labels.push(dateTemp);
-			myDate.setDate(myDate.getDate() + flag);
-		}		
-		drawDiagram(myDate,flow[0],pv);
-		
-		$('#data_number td').click(function(){
-			$('#data_number td').css({"background-color":"#ffffff","color":"black"});
-			$(this).css({"background-color":"#36aeea","color":"#ffffff"});
-			var n = $(this).index();
-			pv=tipLabel[n];
-			var data = flow[n];
-			$('#baseTitle').text('近7天全部广告位' + pv);
-			drawDiagram(myDate,data,pv);
-		});
-		
-		function drawDiagram(myDate,data,pv){		
-			$('#diagram').highcharts({ 
-				chart: { type: 'line' },
-				title: { text: '' }, //标题
-				//subtitle: { text: 'Source: WorldClimate.com' }, //副标题
-				xAxis: { categories: labels }, 
-				yAxis: { 
-					title: { text: '' }, 
-					plotLines: [{ value: 0, width: 1, color: '#808080' }]
-				}, 
-				tooltip: { crosshairs: true, shared: true }, 
-				legend: { 
-					enabled:false,
-				},
-				credits:{
-					enabled:false,
-				},
-			
-				series: [{ 
-					name: pv, 
-					data: data,
-					color:'#36aeea',
-					marker:{
-						symbol: 'circle',
-						fillColor:'#ffffff',
-						lineColor:'#87b9f6',
-						lineWidth: 2,
-						radius: 5,
-					}
-				}]
-			}); 
-		}
-	});
-</script>
-
-
+<@extends name="/common/simple.ftl"/>

+ 89 - 95
src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/deposit.ftl

@@ -4,101 +4,12 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/finance.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">需求方充值</a>
-				</li>				         
-			</ul>
-		</div>
-		<div id="recharge">
-			<form id="form1" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
-				<div>
-					<span>选择需求方:</span>
-					<select id="agentId" name="agentId" class="agentId">
-						<option value="-1">请选择代理商</option>
-					</select>
-				</div>
-				<div>
-					<span>充值:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
-					<input type="text" name="money" value="100">
-					<span>元</span>
-					<span class='remind'></span>
-				</div>
-				<div>
-				<button type="submit" name="submit" value="submit">提交</button>
-				<button type='button' href='${ctx}/back/main/finance/finance-management'>取消</button>
-				</div>
-			</form>
-		</div>
-		<div id="searchBar">
-			<span>充值记录&nbsp;:</span>
-			<form action="${ctx}/back/main/finance/finance-management/deposit" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-		   		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-		   		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入日期进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-		   		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		
-		<div id="tableList">
-			<table class="table">
-				<thead>
-					<tr>
-						<th>日期</th>
-						<th>广告主/代理商</th>
-						<th>充值金额</th>
-						<th>余额</th>
-						<th>操作</th>
-					</tr>
-				</thead>
-				<tbody>
-					<#if advBalanceList ??>
-					<#list advBalanceList as advBalance>
-					<tr>
-						<td>${advBalance.actTime?date}</td>
-						<td>${advBalance.agentName!}</td>
-						<td>${advBalance.charge!}</td>
-						<td>${advBalance.balance!}</td>
-						<td><a href='${ctx}/back/main/finance/finance-management/backOut?advBalanceId=${advBalance.id}'>撤销</a></td>
-					</tr>
-				 	</#list>
-		            </#if>
-				</tbody>
-			</table>
-		</div>
-		<div id="footBar">
-			<button id="exportExcel" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</button>
-			<div id="paged">
-		       <#include "/common/pagination/simple.ftl"/>
-		    </div>
-		</div>
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<script type="text/javascript">
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript">
 	$(function(){
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
 		//搜索输入框的样式改变
 		$(document).on('focus',"#searchBar input[name='searchValue']",function(){
 			$(this).val("");
@@ -226,4 +137,87 @@
 			});
 		})
 	});
-</script>
+</script>
+</@override>
+<@override name="body">
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="shortcutBar">
+			<ul>
+				<li >
+					<i class="icon-home"></i>
+					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+				</li>
+				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+				<li >
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+					<a class="homepage2" href="">需求方充值</a>
+				</li>				         
+			</ul>
+		</div>
+		<div id="recharge">
+			<form id="form1" action="${ctx}/back/main/finance/finance-management/recharge" method="post">
+				<div>
+					<span>选择需求方:</span>
+					<select id="agentId" name="agentId" class="agentId">
+						<option value="-1">请选择代理商</option>
+					</select>
+				</div>
+				<div>
+					<span>充值:&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;</span>
+					<input type="text" name="money" value="100">
+					<span>元</span>
+					<span class='remind'></span>
+				</div>
+				<div>
+				<button type="submit" name="submit" value="submit">提交</button>
+				<button type='button' href='${ctx}/back/main/finance/finance-management'>取消</button>
+				</div>
+			</form>
+		</div>
+		<div id="searchBar">
+			<span>充值记录&nbsp;:</span>
+			<form action="${ctx}/back/main/finance/finance-management/deposit" method="post" class="search-form" >
+				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
+		   		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
+		   		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入日期进行搜索" onkeydown="if(event.keyCode==13){return false;}">
+		   		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
+			</form>
+		</div>
+		
+		<div id="tableList">
+			<table class="table">
+				<thead>
+					<tr>
+						<th>日期</th>
+						<th>广告主/代理商</th>
+						<th>充值金额</th>
+						<th>余额</th>
+						<th>操作</th>
+					</tr>
+				</thead>
+				<tbody>
+					<#if advBalanceList ??>
+					<#list advBalanceList as advBalance>
+					<tr>
+						<td>${advBalance.actTime?date}</td>
+						<td>${advBalance.agentName!}</td>
+						<td>${advBalance.charge!}</td>
+						<td>${advBalance.balance!}</td>
+						<td><a href='${ctx}/back/main/finance/finance-management/backOut?advBalanceId=${advBalance.id}'>撤销</a></td>
+					</tr>
+				 	</#list>
+		            </#if>
+				</tbody>
+			</table>
+		</div>
+		<div id="footBar">
+			<button id="exportExcel" href="${ctx}/back/main/finance/finance-management/exportExcel">导出Excel</button>
+			<div id="paged">
+		       <#include "/common/pagination/simple.ftl"/>
+		    </div>
+		</div>
+	</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 43 - 49
src/main/webapp/WEB-INF/pages/back/main/finance/finance-management/index.ftl

@@ -4,55 +4,12 @@
 	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/css/finance.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/back/js/jquery-1.9.1.min.js"></script>
-
-</@override>
-<@override name="body">
-	<#include "/back/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="shortcutBar">
-			<ul>
-				<li >
-					<i class="icon-home"></i>
-					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-				</li>
-				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
-				<li >
-					<span class="divider1"><i class="icon-angle-right"></i></span>
-					<a class="homepage2" href="">提现管理</a>
-				</li>				         
-			</ul>  
-		</div>
-		<div id="searchBar">
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management">媒体体现申请</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/deposit">需求方充值</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/enable">批量通过</button>
-			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/disable">批量不通过</button>
-			<form action="${ctx}/back/main/finance/finance-management/list" method="post" class="search-form" >
-				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
-          		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
-          		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入交易号进行搜索" onkeydown="if(event.keyCode==13){return false;}">
-          		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
-			</form>
-		</div>
-		<div id="tableList">
-			<#include "list.ftl">
-		</div>
-		
-	</div>
-</@override>
-<@extends name="/common/simple.ftl"/>
-<!-- 弹出框插件 -->
-<script type="text/javascript" src="${ctx}/assets/back/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/back/js/bootbox.min.js"></script>
-<script type="text/javascript" charset="utf-8">
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" charset="utf-8">
 	$(function(){
-		//个人信息栏的js控制
-		$("#divselect").click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-		
 		//搜索输入框的样式改变
 		$("#searchBar input[name='searchValue']").focus(function(){
 			$(this).val("");
@@ -185,4 +142,41 @@
 				}
 		});
 	});
-</script>
+</script>
+</@override>
+<@override name="body">
+	<#include "/back/main/public-head.ftl">
+	<div id= "pagecontent">
+		<div id="shortcutBar">
+			<ul>
+				<li >
+					<i class="icon-home"></i>
+					<a class="homepage" href="${ctx}/back/main/dashboard">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+				</li>
+				<li ><a class="homepage1" href="${ctx}/back/main/finance/finance-management">财务管理</a></li>
+				<li >
+					<span class="divider1"><i class="icon-angle-right"></i></span>
+					<a class="homepage2" href="">提现管理</a>
+				</li>				         
+			</ul>  
+		</div>
+		<div id="searchBar">
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management">媒体体现申请</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/deposit">需求方充值</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/enable">批量通过</button>
+			<button class="batch_btn" href="${ctx}/back/main/finance/finance-management/disable">批量不通过</button>
+			<form action="${ctx}/back/main/finance/finance-management/list" method="post" class="search-form" >
+				<input  autocomplete="off"  type="hidden" name="page" value="${pager.page!}">
+          		<input  autocomplete="off"  type="hidden" name="searchKey" value="name">
+          		<input  autocomplete="off"  class="search_btn" type="text" name="searchValue" value="请输入交易号进行搜索" onkeydown="if(event.keyCode==13){return false;}">
+          		<img id="serachData_img" src="${ctx}/assets/back/images/fangdajing1.png"/>
+			</form>
+		</div>
+		<div id="tableList">
+			<#include "list.ftl">
+		</div>
+		
+	</div>
+</@override>
+<@extends name="/common/simple.ftl"/>

+ 6 - 1
src/main/webapp/WEB-INF/pages/back/main/public-head.ftl

@@ -21,7 +21,12 @@
 			<li><a href="${ctx}/back/main/authority/loginperson" selectid="1">修改个人信息</a></li>
 			<li><a href="${ctx}/login" selectid="2">退出登录</a></li>       
 		</ul>
-		<input name="" type="hidden" value="" id="input-top"/>
+		<input type="hidden" value="${ctx!}" id="ctx"/>
+		<input type="hidden" id="role" value="${role!}"/>
+		<input type="hidden" id="agentId" value="${userSession.agentId!}"/>
+		<input type="hidden" id="sessionadvertiserId" value="${userSession.advertiserId!}"/>
+		<input type="hidden" id="sessionadvertiserName" value="${advertiserName!}"/>
+		<input type="hidden" id="sessionoperatorId" value="${userSession.operatorId!}"/>
 	</div>    		
 </div>	   	
 <script type="text/javascript">

+ 1 - 1
src/main/webapp/WEB-INF/pages/login.ftl

@@ -1,6 +1,6 @@
 <@override name="head">
 <title>用户登录</title>
-<script type="text/javascript" src='${ctx}/assets/back/js/jquery-1.9.1.min.js'></script>
+<script type="text/javascript" src='${ctx}/assets/js/lib/jquery-1.9.1.min.js'></script>
 <script type="text/javascript">
 $(function(){
 	$('title').each(function(){

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>总体报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/apmac.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>热点报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/areal.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>地域报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/place.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>场景报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 6
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/position.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>位置报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
@@ -40,7 +40,6 @@
 				</ul>  
  			</div>
         	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/position" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
         		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
         		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
 		 		<div id="content_choose">	
@@ -118,9 +117,6 @@
 		        <div id="exportReport">
 					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('position','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
 				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
 			</form>
 	  	</div>        
     </div>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/size.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>尺寸报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/system.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>系统报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>

+ 2 - 6
src/main/webapp/WEB-INF/pages/operator/main/ad/report/advertiser-report/type.ftl

@@ -1,7 +1,7 @@
 <@override name="head">
 <title>类型报表</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 <link rel="stylesheet" href="${ctx}/assets/css/report_operator.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
@@ -40,7 +40,6 @@
 				</ul>  
  			</div>
         	<form id="myform" action="${ctx}/operator/main/ad/report/advertiser-report/type" method="post">		
-        		<input id="page" type="hidden" name="page" value="${pager.page!}"/>	
         		<input id="dateTab" type="hidden" name="dateTab" value="${dateTab!}"/>
         		<input id="listSize" type="hidden" name="listSize" value="${listSize!}"/>
 		 		<div id="content_choose">	
@@ -118,9 +117,6 @@
 		        <div id="exportReport">
 					<a id="exportExcel" class="btn_export" href="javascript:void(0);" onclick="exportExcel('type','${ctx}/operator/main/ad/report/advertiser-report/exportOtherReportExcel','operator')">导出Excel</a>
 				</div>
-				<div id="pageDiv">
-					<#include "/common/pagination/simple.ftl"/>
-				</div>
 			</form>
 	  	</div>        
     </div>

+ 20 - 98
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/create.ftl

@@ -17,18 +17,16 @@
 		<link rel="stylesheet" href="${ctx}/assets/operator/css/uploadify.css"/>
 	 -->
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/yf.yang.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<!-- <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.uploadify.js"></script> -->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/ace-elements.min.js"></script>
-	
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/zone_operator.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
 	<style>
 		.spanVaildate{
 			margin-left:20px;
@@ -52,91 +50,15 @@
 			$(".cancelinfo").click(function(){
 				window.location.href = "${ctx}/operator/main/ad/zone";
 			});
-			//文件上传ajax文件上传
+			
+			//初始化加载上传控件
+		 	initFile($("#uploadfile"),null);
 			$('#uploadfilestr').unbind('click').click(function() {
-			  	var _href = $(this).attr('href');
-			    $.ajaxFileUpload({
-			        url:_href, 
-			        secureuri:false,
-			        fileElementId:'uploadfile',
-			        dataType: 'json',
-			        success: function (result, status) {
-			        	removeFile("uploadfile","filepicture",result);
-			        	var path = result.data['url'];
-			        	if (result.status == 'ok') {
-			        		var orgImg = path.substring(0,path.indexOf(","));
-			 				var smallImg = path.substring(path.indexOf(",")+1);
-				        	$("#uploadfilehidden").val(orgImg);
-				        	$("#default_path_small").val(smallImg);
-			 				$("#smallImg").attr("src",smallImg);
-			 				$("#imgspan").css("display","block");
-			 				$("#smallImg").css("display","block");
-							var result = 0;
-							removeFile("uploadfile","filepicture",result);
-							bootbox.alert("上传成功!");
-			        	}else if (result.status == 'error') {
-			        		$("#uploadfilehidden").val("");
-				        	$("#default_path_small").val("");
-			        		$("#imgspan").css("display","none");
-			 				$("#smallImg").css("display","none");
-			        		bootbox.alert(result.msg);
-			            }
-			        },
-			        error: function (data, status, e)
-			        {
-			        	removeFile("uploadfile","filepicture");
-			        	$("#uploadfilehidden").val("");
-				        $("#default_path_small").val("");
-			        	$("#imgspan").css("display","none");
-			 			$("#smallImg").css("display","none");
-			        	console.log(e);
-			        }
-			        
-			    });
-			    return false;
-		    });
-		    
-		    $('#uploadfile').ace_file_input({
-			    no_file:'No File ...',
-			    btn_choose:'选择',
-			    btn_change:'改变',
-			    droppable:false,
-			    onchange:null,
-			    thumbnail:false,
-			    whitelist:'jpg|gif'
-			});
-		
-			//上传文件时conle file 删除 file
-			 function removeFile(_elemId,_removeId,result){
-			    var filename = $('#'+_elemId).parent().find("span").attr("data-title");
-	      		var isChrome = navigator.userAgent.toLowerCase().match(/chrome/) != null;//判断是否是谷歌浏览器
-			    if(filename==null || filename==''){
-			    	filename = "No File ...";
-			    }
-			 	var option = {}; 
-			    var defaultOptions = {
-				    no_file:'No File ...',
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false,
-				    whitelist:'jpg|gif'
-				};
-				if(isChrome && result == 0){
-					option = {whitelist:'jpg|gif',no_file:filename };
-				}else if(isChrome && result == 1){
-					option = {whitelist:'jpg|gif',no_file:'No File ...' };
-				}else{
-					option = {whitelist:'jpg|gif',no_file:filename };
-				}
-			    var opts = $.extend(defaultOptions,option);
-				var newfile = $("#"+_elemId).clone();
-				$("#"+_removeId).find(".ace-file-input").remove();
-				$("#"+_removeId+" #uploadfilehidden").after(newfile);
-				$("#uploadfile").ace_file_input(opts);
-			 }
-			 
+				if($(this).html() == "上传"){
+		 			getUploadFile($(this),"uploadfile","filepicture","uploadfilehidden","default_path_small","imgspan","smallImg");
+		 		}
+		 	});
+			
 			 //鼠标划过小图片显示大图片
 			 $("#smallImg").mousemove(function(event){
 				var event = event || window.event;
@@ -174,7 +96,7 @@
 			     <form id="form_validate" action="${ctx}/operator/main/ad/zone/save" method="post" enctype="multipart/form-data">
 					<div id="created_ops">
 						<div class="choose_ops">
-							<span class="star">*</span><span>广告名称</span>
+							<span class="star">*</span><span>广告名称</span>
 							<div class="opsdiv_control">
 								<input name="name" type="text" verify="unspecial/255/1/0"></span><span class="spanVaildate"></span>							
 							</div>
@@ -230,7 +152,7 @@
 							        </div>
 							        <div id="fileurl" class="controls radioC">
 							            <label class="label1">点击地址</label>
-										<input id="default_url" type="text" name="default_url" style="position:absolute;margin:-35px 0 0 100px;" verify="text/255/1/0"></span><span class="spanVaildate" style="margin:-35px 0 0 440px;"></span>
+										<input id="default_url" type="text" name="default_url" style="position:absolute;margin:-35px 0 0 100px;" verify="text/255/0/0"></span><span class="spanVaildate" style="margin:-35px 0 0 440px;"></span>
 							        </div>
 						   		 </div>
 							</div>

+ 21 - 99
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/edit.ftl

@@ -15,18 +15,16 @@
 	<link rel="stylesheet" href="${ctx}/assets/operator/css/page.yf.yang.css"/>
 	<!-- <link rel="stylesheet" href="${ctx}/assets/operator/css/uploadify.css"/> -->
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/bootbox.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.validate.min.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/yf.yang.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/validate.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/divselect.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery.min.js"></script>
-	<!-- <script type="text/javascript" src="${ctx}/assets/operator/js/jquery.uploadify.js"></script> -->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/ajaxfileupload.js"></script>
-	<script type="text/javascript" src="${ctx}/assets/operator/js/ace-elements.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ajaxfileupload.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ace-elements.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/zone_operator.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/uploadFile.js"></script>
 	<style>
 		.spanVaildate{
 			margin-left:20px;
@@ -57,93 +55,16 @@
 			 	$("#smallImg").css("display","none");
 			}
 			
-			//文件上传ajax文件上传
+			//初始化加载上传控件
+			initFile($("#uploadfile"),$("#pictureName").val());
 			$('#uploadfilestr').unbind('click').click(function() {
-			  	var _href = $(this).attr('href');  
-			    $.ajaxFileUpload({
-			        url:_href, 
-			        secureuri:false,
-			        fileElementId:'uploadfile',
-			        dataType: 'json',
-			        success: function (result, status) {
-			        	removeFile("uploadfile","filepicture",result);
-			        	var path = result.data['url'];
-			        	if (result.status == 'ok') {
-			        		var orgImg = path.substring(0,path.indexOf(","));
-			 				var smallImg = path.substring(path.indexOf(",")+1);
-				        	$("#uploadfilehidden").val(orgImg);
-				        	$("#default_path_small").val(smallImg);
-			 				$("#smallImg").attr("src",smallImg);
-			 				$("#imgspan").css("display","block");
-			 				$("#smallImg").css("display","block");
-							var result = 0;
-							removeFile("uploadfile","filepicture",result);
-							bootbox.alert("上传成功!");
-			        	}else if (result.status == 'error') {
-			        		$("#uploadfilehidden").val("");
-				        	$("#default_path_small").val("");
-			        		$("#imgspan").css("display","none");
-			 				$("#smallImg").css("display","none");
-			        		bootbox.alert(result.msg);
-			            }
-			        },
-			        error: function (data, status, e)
-			        {
-			        	removeFile("uploadfile","filepicture");
-			        	$("#uploadfilehidden").val("");
-				        $("#default_path_small").val("");
-			        	$("#imgspan").css("display","none");
-			 			$("#smallImg").css("display","none");
-			        	console.log(e);
-			        }
-			        
-			    });
-			    return false;
-		    });
-		    
-		    $('#uploadfile').ace_file_input({
-			    no_file:'<#if pictureName??>${pictureName!}<#else>No File ...</#if>',
-			    btn_choose:'选择',
-			    btn_change:'改变',
-			    droppable:false,
-			    onchange:null,
-			    thumbnail:false,
-			    whitelist:'jpg|gif'
-			});
-		
-			//上传文件时conle file 删除 file
-			 function removeFile(_elemId,_removeId,result){
-			    var filename = $('#'+_elemId).parent().find("span").attr("data-title");
-	      		var isChrome = navigator.userAgent.toLowerCase().match(/chrome/) != null;//判断是否是谷歌浏览器
-			    if(filename==null || filename==''){
-			    	filename = "No File ...";
-			    }
-			 	var option = {}; 
-			    var defaultOptions = {
-				    no_file:'No File ...',
-				    btn_choose:'选择',
-				    btn_change:'改变',
-				    droppable:false,
-				    onchange:null,
-				    thumbnail:false,
-				    whitelist:'jpg|gif'
-				};
-				if(isChrome && result == 0){
-					option = {whitelist:'jpg|gif',no_file:filename };
-				}else if(isChrome && result == 1){
-					option = {whitelist:'jpg|gif',no_file:'No File ...' };
-				}else{
-					option = {whitelist:'jpg|gif',no_file:filename };
-				}
-			    var opts = $.extend(defaultOptions,option);
-				var newfile = $("#"+_elemId).clone();
-				$("#"+_removeId).find(".ace-file-input").remove();
-				$("#"+_removeId+" #uploadfilehidden").after(newfile);
-				$("#uploadfile").ace_file_input(opts);
-			 }
+				if($(this).html() == "上传"){
+		 			getUploadFile($(this),"uploadfile","filepicture","uploadfilehidden","default_path_small","imgspan","smallImg");
+		 		}
+		 	});
 			 
-			 //鼠标划过小图片显示大图片
-			 $("#smallImg").mousemove(function(event){
+			//鼠标划过小图片显示大图片
+			$("#smallImg").mousemove(function(event){
 				var event = event || window.event;
 				$("#enlarge_images").css("display","block");
 				var imgsrc = $(this).attr("src");
@@ -181,7 +102,7 @@
 			     	<input  autocomplete="off"  type="hidden" name="id" value="${zone.id}"/>
 					<div id="created_ops">
 						<div class="choose_ops">
-							<span class="star">*</span><span>广告名称</span>
+							<span class="star">*</span><span>广告名称</span>
 							<div class="opsdiv_control">
 								<input name="name" type="text" value="${zone.name}" verify="unspecial/255/1/0"></span><span class="spanVaildate"></span>							
 							</div>
@@ -232,7 +153,7 @@
 							        </div>
 							        <div id="fileurl" class="controls radioC">
 							            <label class="label1">点击地址</label>
-										<input id="default_url" type="text" name="default_url" style="position:absolute;margin:-35px 0 0 100px;" value="${zone.default_url!}" verify="text/255/1/0"></span><span class="spanVaildate" style="margin:-35px 0 0 440px;"></span>
+										<input id="default_url" type="text" name="default_url" style="position:absolute;margin:-35px 0 0 100px;" value="${zone.default_url!}" verify="text/255/0/0"></span><span class="spanVaildate" style="margin:-35px 0 0 440px;"></span>
 							        </div>
 						   		 </div>
 							</div>
@@ -243,6 +164,7 @@
 										<img id="smallImg" src="${zone.default_path_small!}" style="height:60px;width:150px;margin-top:-20px;margin-left:78px;display:none;cursor:pointer;"/>
 										<div id="enlarge_images"></div>
 										<input id="default_path_small" type="hidden" name="default_path_small" value="${zone.default_path_small!}"/>
+										<input id="pictureName" type="hidden" name="pictureName" value="${pictureName!}"/>
 									</div>
 								</div>
 							</div>

+ 5 - 11
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/index.ftl

@@ -5,7 +5,11 @@
 	<link rel="stylesheet" href="${ctx}/assets/operator/css/zone.css"/> 
 	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
 	<!--Include Required Prerequisites js-->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/ZeroClipboard.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
 
 </@override>
 <@override name="body">
@@ -78,19 +82,9 @@
 </@override>
 <@extends name="/common/simple.ftl"/>
 
-<script type="text/javascript" src="${ctx}/assets/operator/js/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/bootbox.js"></script>
-<script type="text/javascript" src="${ctx}/assets/operator/js/ZeroClipboard.min.js"></script>
-
-	     
 <!--修改个人信息js 控制上下切换-->
 <script type="text/javascript">
 	$(document).ready(function(){
-		$('#divselect').click(function(){
-			$("#divselect ul").slideToggle("fast");
-		});
-	
-	
 	
 	$("#search-input").keydown(function(e){
     if(!e){

+ 32 - 42
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/update.ftl

@@ -4,7 +4,37 @@
 	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
 	<link rel="stylesheet" href="${ctx}/assets/operator/css/zone-update.css"/>
 	<!--linked js-->
-	<script type="text/javascript" src="${ctx}/assets/operator/js/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
+	<script type="text/javascript" src="${ctx}/assets/js/divselect.js"></script>
+
+	<script type="text/javascript">
+		$(document).ready(function(){
+			//返回按钮
+			$("#button1").click(function(){
+				window.location.assign("${ctx}/operator/main/ad/zone"); 
+			});
+			
+			//导出excel
+			$("#exportExcel").click(function(){
+				var _href = $(this).attr('href');
+				window.location.assign(_href); 
+			});
+			
+			// 分页中超链接跳转
+			$(document).on('click','#pagecontent .pagination ul li a[href]',function(){
+				var _page = $(this).attr('href').substr(1);
+				var _href = window.location.href;
+				var _index = _href.indexOf('&page=');
+				if(_index == -1){
+					var _url = _href + '&page=' + _page;
+				} else {
+					var _url = _href.substring(0,_index) + '&page=' + _page;
+				}
+				window.location.assign(_url); 
+				return false;
+			});
+		});
+	</script>
 </@override>
 
 <@override name="body">
@@ -48,44 +78,4 @@
 	</div>
 
 </@override>
-<@extends name="/common/simple.ftl"/>
-
-<!--修改个人信息js 控制上下切换-->
-<script type="text/javascript">
-	$(document).ready(function(){
-		  $("#divselect").click(function(){
-		  	$("#divselect ul").slideToggle("fast");
-		  });
-	
-		//设置首页背景
-		var path = window.location.pathname;
-		if(path.indexOf("zone") != -1){
-			$("#top .nav li a:eq(1)").css("background-image","url(${ctx}/assets/operator/images/tophover_bg.jpg)");
-		};
-		
-		//返回按钮
-		$("#button1").click(function(){
-			window.history.back(-1); 
-		});
-		
-		//导出excel
-		$("#exportExcel").click(function(){
-			var _href = $(this).attr('href');
-			window.location.assign(_href); 
-		});
-		
-		// 分页中超链接跳转
-		$(document).on('click','#pagecontent .pagination ul li a[href]',function(){
-			var _page = $(this).attr('href').substr(1);
-			var _href = window.location.href;
-			var _index = _href.indexOf('&page=');
-			if(_index == -1){
-				var _url = _href + '&page=' + _page;
-			} else {
-				var _url = _href.substring(0,_index) + '&page=' + _page;
-			}
-			window.location.assign(_url); 
-			return false;
-		});
-	});
-</script>
+<@extends name="/common/simple.ftl"/>

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/create.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
 
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/edit.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 4 - 4
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/list.ftl

@@ -1,9 +1,9 @@
 <@override name="head">
 	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 4 - 4
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/relationship.ftl

@@ -1,9 +1,9 @@
 <@override name="head">
 	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 4 - 4
src/main/webapp/WEB-INF/pages/operator/main/ap/apmac/update.ftl

@@ -1,9 +1,9 @@
 <@override name="head">
 	<title>热点管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/ap-apmac.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/ap-apmac.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/authority/create.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>创建账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/authority/edit.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>编辑账号</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>

+ 4 - 4
src/main/webapp/WEB-INF/pages/operator/main/authority/list.ftl

@@ -1,9 +1,9 @@
 <@override name="head">
 	<title>账号管理</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/authority.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/authority/loginperson.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>个人信息</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/authority.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/authority.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/validate.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/banner-audit/index.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 	<title>广告投放系统</title>
 	<!--css-->
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/banner-audit.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/banner-audit.css"/>
 	<!--Include Required Prerequisites js-->
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>

+ 2 - 2
src/main/webapp/WEB-INF/pages/operator/main/dashboard.ftl

@@ -1,8 +1,8 @@
 <@override name="head">
 <title>广告投放系统</title>
 <!--linked css-->
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/dashboard.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/dashboard.css"/>
 <!--Include Required Prerequisites js-->
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/highcharts.js"></script>

+ 7 - 7
src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/list.ftl

@@ -1,12 +1,12 @@
 <@override name="head">
 <title>财务管理</title>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/ad-report.css">
-<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-<link rel="stylesheet" type="text/css" href="${ctx}/assets/operator/css/caiwu.css">
-<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
-<link rel="stylesheet" href="${ctx}/assets/operator/css/daterangepicker.css" />
+<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/ad-report.css">
+<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
+<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/caiwu.css">
+<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
+<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
 
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 5 - 5
src/main/webapp/WEB-INF/pages/operator/main/financial/financial-management/withdraw-deposit.ftl

@@ -1,10 +1,10 @@
 <@override name="head">	
 	<title>提现</title>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/public-head.css"/>
-	<link href="${ctx}/assets/operator/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/withdraw_deposit_H.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/zbone.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/operator/css/bootstrap.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
+	<link href="${ctx}/assets/css/font-awesome.min.css" rel="stylesheet"/ rel="stylesheet">
+	<link rel="stylesheet" href="${ctx}/assets/css/withdraw_deposit_H.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/zbone.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 	
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
 	<script type="text/javascript" src="${ctx}/assets/js/lib/jquery.min.js"></script>

+ 5 - 5
src/main/webapp/WEB-INF/pages/operator/main/public-head.ftl

@@ -1,9 +1,9 @@
 <#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
 <div id="top">	
 	 <div id="logoa">
-	<img class="logo1" src="${ctx}/assets/operator/images/datacross.png">		
-	<img class="logo2" src="${ctx}/assets/operator/images/cut-off-rule.png">		
-	<img class="logo3" src="${ctx}/assets/operator/images/wificross.png">	
+	<img class="logo1" src="${ctx}/assets/images/datacross.png">		
+	<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
+	<img class="logo3" src="${ctx}/assets/images/wificross.png">	
 	</div>	
 	<ul class="nav">
 		<li><a href="${ctx}/operator/main/dashboard"><span>首页</span></a></li>
@@ -70,10 +70,10 @@
 		if(path.indexOf("financial") != -1){
 			$("#top .nav li a:eq(4)").css("background-image","url(${ctx}/assets/operator/images/tophover_bg.jpg)");
 		};
-		if(path.indexOf("authority") != -1){
+		if(path.indexOf("ap/apmac") != -1){
 			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/operator/images/tophover_bg.jpg)");
 		};
-		if(path.indexOf("ap/apmac") != -1){
+		if(path.indexOf("authority") != -1){
 			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/operator/images/tophover_bg.jpg)");
 		};
 	});