Browse Source

提交back端创意报表功能

fan.yang@cloudcross.com 9 years ago
parent
commit
e8d5938789

+ 166 - 1
src/main/java/com/cloudcross/ssp/web/back/main/ad/report/AdvertiserReportController.java

@@ -457,7 +457,172 @@ public class AdvertiserReportController extends SimpleController {
 		return page("regionReport");
 		return page("regionReport");
 	}
 	}
 	
 	
-	
+	// 创意报表
+			@RequestMapping("/ideaReport")
+			public String idealReport(Model model,
+					@RequestParam HashMap<String, Object> paramMap,
+					@RequestParam(defaultValue = "1") int page) {
+				initParams(paramMap);
+				// 查询搜索对应的数据
+				int totalRow = adReportService.findCountForBanner(paramMap);
+				Pager pager = new Pager();
+				pager.setPage(page);
+				pager.setTotalRow(totalRow);
+				paramMap.put("pager", pager);
+				List<DeliverAnalysis> reportList = adReportService.findBannerByConditions(paramMap);
+//				if (reportList.size() == 0) {
+//					DeliverAnalysis map = new DeliverAnalysis();
+//					DeliverAnalysis deliver = new DeliverAnalysis();
+//					deliver.setImpression(0);
+//					deliver.setClick(0);
+//					deliver.setVisit(0);
+//					deliver.setConversion(0);
+//					deliver.setConsume(0);
+//					deliver.seteCmp(0);
+//					deliver.setClickRate(0);
+//					deliver.setVisitRate(0);
+//					deliver.setConversionRate(0);
+//					map = deliver;
+//					model.addAttribute("reportMap", map);
+//				} else {
+//					// 数据报表中第一栏 全部 的显示
+//					HashMap<String, Double> map = new HashMap<String, Double>();
+//					map.put("impressionSum", reportList.get(0).getImpressionSum());
+//					map.put("clickSum", reportList.get(0).getClickSum());
+//					map.put("visitSum", reportList.get(0).getVisitSum());
+//					map.put("conversionSum", reportList.get(0).getConversionSum());
+//					map.put("consumeSum", reportList.get(0).getConsumeSum());
+//					map.put("eCmpSum", reportList.get(0).geteCmpSum());
+//					map.put("clickRatesum", reportList.get(0).getClickRatesum());
+//					map.put("visitRatesum", reportList.get(0).getVisitRatesum());
+//					map.put("conversionRatesum", reportList.get(0)
+//							.getConversionRatesum());
+//					model.addAttribute("reportMap", map);
+//				}
+
+				model.addAllAttributes(paramMap);
+				model.addAttribute("pager", pager);
+				model.addAttribute("reportList", reportList);
+				return page("ideaReport");
+			}
+
+			/**
+			 * 初始化条件数据
+			 * 
+			 * @param paramMap
+			 */
+			private void initParams(HashMap<String, Object> paramMap) {
+				// 日期
+				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+				String startDate = null;
+				String endDate = null;
+
+				// 广告主,订单,活动,投放
+				Long advertiserId = null;
+				Long orderId = null;
+				Long campaignId = null;
+				Long adGroupId = null;
+
+				String advertiserName = "全部广告主";
+				String orderName = "全部订单";
+				String campaignName = "全部活动";
+				String adGroupName = "全部投放";
+				/**
+				 * 下面对下拉框中传进来的值进行判断,若是未操作,则为空值,前端设置时默认为全部(-1)
+				 * 注意前后层次关系,同时要考虑到登录帐号权限问题,此时暂未考虑 下拉框传值Id需要同步
+				 */
+
+				// 广告主选择与否
+				if (null == paramMap.get("selectedadvertiserId")
+						|| "".equals(paramMap.get("selectedadvertiserId"))) {
+					advertiserId = null;
+					advertiserName = "全部广告主";
+				} else {
+					// 如果要查询的是所有广告主则让广告主id为空
+					if (-1 == Long.parseLong((String) paramMap
+							.get("selectedadvertiserId"))) {
+						advertiserId = null;
+						advertiserName = "全部广告主";
+					} else {
+						advertiserId = Long.parseLong((String) paramMap
+								.get("selectedadvertiserId"));
+						advertiserName = (String)paramMap.get("selectedadvertiserName");
+					}
+				}
+
+				// 订单选择与否
+				if (null == paramMap.get("selectedorderId")
+						|| "".equals(paramMap.get("selectedorderId"))) {
+					orderId = null;
+					orderName = "全部订单";
+				} else {
+					if (-1 == Long.parseLong((String) paramMap.get("selectedorderId"))) {
+						orderId = null;
+						orderName = "全部订单";
+					} else {
+						orderId = Long.parseLong((String) paramMap
+								.get("selectedorderId"));
+						orderName = (String)paramMap.get("selectedorderName");
+					}
+				}
+
+				// 活动选择与否
+				if (null == paramMap.get("selectedcampaignId")
+						|| "".equals(paramMap.get("selectedcampaignId"))) {
+					campaignId = null;
+					campaignName = "全部活动";
+				} else {
+					if (-1 == Long.parseLong((String) paramMap
+							.get("selectedcampaignId"))) {
+						campaignId = null;
+						campaignName = "全部活动";
+					} else {
+						campaignId = Long.parseLong((String) paramMap
+								.get("selectedcampaignId"));
+						campaignName = (String)paramMap.get("selectedcampaignName");
+					}
+				}
+
+				// 投放选择与否
+				if (null == paramMap.get("selectedadGroupId")
+						|| "".equals(paramMap.get("selectedadGroupId"))) {
+					adGroupId = null;
+					adGroupName = "全部投放";
+				} else {
+					if (-1 == Long
+							.parseLong((String) paramMap.get("selectedadGroupId"))) {
+						adGroupId = null;
+						adGroupName = "全部投放";
+					} else {
+						adGroupId = Long.parseLong((String) paramMap
+								.get("selectedadGroupId"));
+						adGroupName = (String)paramMap.get("selectedadGroupName");
+					}
+				}
+
+				// 判断日期是否为默认值昨天,日期格式与上面相统一,用 to 分割
+				if (null == paramMap.get("dateRangePicker")
+						|| "".equals(paramMap.get("dateRangePicker"))) {
+					startDate = endDate = sdf.format(new Date((new Date()).getTime()
+							- 24 * 60 * 60 * 1000));
+				} else {
+					String[] choosedDate = ((String) paramMap.get("dateRangePicker"))
+							.split("to");
+					startDate = choosedDate[0].trim();
+					endDate = choosedDate[1].trim();
+				}
+
+				paramMap.put("advertiserId", advertiserId);
+				paramMap.put("orderId", orderId);
+				paramMap.put("campaignId", campaignId);
+				paramMap.put("adGroupId", adGroupId);
+				paramMap.put("selectedadvertiserName", advertiserName);
+				paramMap.put("selectedorderName", orderName);
+				paramMap.put("selectedcampaignName", campaignName);
+				paramMap.put("selectedadGroupName", adGroupName);
+				paramMap.put("startDate", startDate);
+				paramMap.put("endDate", endDate);
+			}
 	//下面是系统报表
 	//下面是系统报表
 	
 	
 	@RequestMapping("/osReport")
 	@RequestMapping("/osReport")

+ 219 - 218
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report.ftl

@@ -1,219 +1,220 @@
-<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<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/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">
-   <div id=content_bg>
-	<#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">总体报表</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">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">数据报表</li>
-				 </ul>  
-	 		</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">
-						<span id="dimensionul_span">${selecteddimensionName!}</span>
-						<ul class="son_ul" id="dimension_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
-				<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
-				
-		        <a id="a-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
-				<span id="date-one">
-					<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!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   	</div>
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<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="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="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		
-		   		<div id="date-radio" style="float:right;margin-right:20px;">
-		   			<span>显示列(此项可多选)</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<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>
-		   		
-			<div id="table" style="clear:both; width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<#if dimensionLength ??>
-								<th style="text-align:center; width:5%" colspan="${dimensionLength}"></th>
-		            		<#else>
-		            			<th style="text-align:center; width:5%" colspan=1></th>
-		            		</#if>
-		                    <th style="text-align:center; width:5%" class="hidden-impression">曝光</th>
-		                    <th style="text-align:center; width:10%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:10%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:10%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:10%" class="hidden-consume" colspan=2>花费</th>
-						</tr>
-						<tr>
-							<#if dimensionTarget ??>
-							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">${dimension.dimension}</td>
-							</#list>
-		            		<#else>
-		            			<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>
-			                <td style="text-align:center; width:5%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:5%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:5%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:5%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:5%" class="hidden-consume">花费</td>
-			            </tr>
-			            <tr>
-			            	<#if dimensionTarget ??>
-							<#list dimensionTarget as dimension>
-								<td style="text-align:center; width:5%">总计</td>
-							</#list>
-		            		<#else>
-		            			<td style="text-align:center;">总计</td>
-		            		</#if>
-		                    <td style="text-align:center;" class="hidden-impression">${reportMap.impressionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickSum!}</td>
-		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickRatesum!}%</td> 
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitSum!}</td>
-		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitRatesum!}%</td>   
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionSum!}</td>
-		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionRatesum!}%</td>  
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.eCmpSum!}</td>
-		                    <td style="text-align:center;" class="hidden-consume">${reportMap.consumeSum!}</td>
-	                	</tr>
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-							<#if dimensionTarget ??>
-							<#list dimensionTarget as dimension>
-								<#if dimension.dimensionTarget == "reportDate">
-								<#setting datetime_format="yyyy-MM-dd"/> 
-									<td style="text-align:center;">${report[dimension.dimensionTarget]?datetime}</td> 
-								<#else>
-									<td style="text-align:center;">${report[dimension.dimensionTarget]!}</td> 
-								</#if>
-							</#list>
-		            		<#else>
-		            			<#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>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<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: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-            
-            </form>
-		</div>
-		
-    </div>
-</div>		     
-</@override>
+<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	<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/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">
+   <div id=content_bg>
+	<#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">总体报表</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>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+				</ul>
+			</div>
+	   		<div id="third">
+				 <ul style="margin:0px;">
+				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				    <li class="size3">数据报表</li>
+				 </ul>  
+	 		</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">
+						<span id="dimensionul_span">${selecteddimensionName!}</span>
+						<ul class="son_ul" id="dimension_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selecteddimensionId" id="dimensionId" value="${dimensionId!}">
+				<input type="hidden" name="selecteddimensionName" id="dimensionName" value="${selecteddimensionName!}">
+				
+		        <a id="a-dimension" href="${ctx}/back/main/ad/report/advertiser-report/dimension">维度管理</a>
+				<span id="date-one">
+					<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!}"/>
+		   		</span>
+		   		<input id="sign" type="submit" value="查询"/>
+		   	</div>
+	 		<div id="selectuls">
+				<ul id="main_advertiserul">
+					<li class="select_box" id="advertiserul_box">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
+				<ul id="main_orderul">
+					<li class="select_box" id="orderul_box">
+						<span id="orderul_span">${selectedorderName!}</span>
+						<ul class="son_ul" id="orderul_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
+				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+				<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="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="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
+	 		
+		   		<div id="date-radio" style="float:right;margin-right:20px;">
+		   			<span>显示列(此项可多选)</span>
+					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+					<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>
+		   		
+			<div id="table" style="clear:both; width:99% !important;">
+				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
+					<thead>
+						<tr class="tr1"  id ='tr11'>
+							<#if dimensionLength ??>
+								<th style="text-align:center; width:5%" colspan="${dimensionLength}"></th>
+		            		<#else>
+		            			<th style="text-align:center; width:5%" colspan=1></th>
+		            		</#if>
+		                    <th style="text-align:center; width:5%" class="hidden-impression">曝光</th>
+		                    <th style="text-align:center; width:10%" class="hidden-click" colspan=2>点击</th>
+		                    <th style="text-align:center; width:10%" class="hidden-visit" colspan=2>到达</th>
+		                    <th style="text-align:center; width:10%" class="hidden-conversion" colspan=2>转化</th>
+		                    <th style="text-align:center; width:10%" class="hidden-consume" colspan=2>花费</th>
+						</tr>
+						<tr>
+							<#if dimensionTarget ??>
+							<#list dimensionTarget as dimension>
+								<td style="text-align:center; width:5%">${dimension.dimension}</td>
+							</#list>
+		            		<#else>
+		            			<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>
+			                <td style="text-align:center; width:5%" class="hidden-click">点击率</td> 
+			                <td style="text-align:center; width:5%" class="hidden-visit">到达数</td>
+			                <td style="text-align:center; width:5%" class="hidden-visit">到达率</td>   
+			                <td style="text-align:center; width:5%" class="hidden-conversion">转化数</td>
+			                <td style="text-align:center; width:5%" class="hidden-conversion">转化率</td>  
+			                <td style="text-align:center; width:5%" class="hidden-consume">eCPM</td>
+			                <td style="text-align:center; width:5%" class="hidden-consume">花费</td>
+			            </tr>
+			            <tr>
+			            	<#if dimensionTarget ??>
+							<#list dimensionTarget as dimension>
+								<td style="text-align:center; width:5%">总计</td>
+							</#list>
+		            		<#else>
+		            			<td style="text-align:center;">总计</td>
+		            		</#if>
+		                    <td style="text-align:center;" class="hidden-impression">${reportMap.impressionSum!}</td>
+		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickSum!}</td>
+		                    <td style="text-align:center;" class="hidden-click">${reportMap.clickRatesum!}%</td> 
+		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitSum!}</td>
+		                    <td style="text-align:center;" class="hidden-visit">${reportMap.visitRatesum!}%</td>   
+		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionSum!}</td>
+		                    <td style="text-align:center;" class="hidden-conversion">${reportMap.conversionRatesum!}%</td>  
+		                    <td style="text-align:center;" class="hidden-consume">${reportMap.eCmpSum!}</td>
+		                    <td style="text-align:center;" class="hidden-consume">${reportMap.consumeSum!}</td>
+	                	</tr>
+					</thead>
+					<tbody>
+					<#if reportList ??>
+		            <#list reportList as report>
+						<tr id="tr22">
+							<#if dimensionTarget ??>
+							<#list dimensionTarget as dimension>
+								<#if dimension.dimensionTarget == "reportDate">
+								<#setting datetime_format="yyyy-MM-dd"/> 
+									<td style="text-align:center;">${report[dimension.dimensionTarget]?datetime}</td> 
+								<#else>
+									<td style="text-align:center;">${report[dimension.dimensionTarget]!}</td> 
+								</#if>
+							</#list>
+		            		<#else>
+		            			<#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>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			            </tr>
+					</#list>
+					</#if>
+					</tbody>
+				</table>
+	        </div>
+	        
+			<div id="daochu" style="margin-left:20px;">
+				<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: -10px 38px 0 0;">
+               	<#include "/common/pagination/simple.ftl"/>
+            </div>
+            
+            </form>
+		</div>
+		
+    </div>
+</div>		     
+</@override>
 <@extends name="/common/simple.ftl"/>
 <@extends name="/common/simple.ftl"/>

+ 171 - 0
src/main/webapp/WEB-INF/pages/back/main/ad/report/advertiser-report/ideaReport.ftl

@@ -0,0 +1,171 @@
+<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
+	<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/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">
+   <div id=content_bg>
+	<#include "/back/main/public-head.ftl">
+    <div id="pagecontent">
+		<div id="content">
+			<div id="second">
+				<ul style="margin:0px;">
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report" style="text-decoration:none"><span class="baobiao11xt ab">总体报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/regionReport" style="text-decoration:none"><span class="baobiao11cj ab" id="baobiao11cj">地域报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/osReport" style="text-decoration:none"><span class="baobiao11 ab">系统报表</span></a></li>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/sceneReport" style="text-decoration:none"><span class="baobiao11 ab">场景报表</span></a></li>
+					<li class="report6all re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+				</ul>
+			</div>
+	   		<div id="third">
+				 <ul style="margin:0px;">
+				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#" style="text-decoration:none">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report" style="text-decoration:none">数据报表</a></li>
+				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
+				    <li class="size3">创意报表</li>
+				 </ul>  
+	 		</div>
+	 		<form id="formPage" action="${ctx}/advertiser/main/ad/report/advertiser-report/ideaReport" method="post">
+	 		<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">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
+				<ul id="main_orderul">
+					<li class="select_box" id="orderul_box">
+						<span id="orderul_span">${selectedorderName!}</span>
+						<ul class="son_ul" id="orderul_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
+				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+				<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="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="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
+	 		</div>
+	
+			<div id="date">
+				<span id="date-one">
+					<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!}"/>
+		   		</span>
+		   		<input id="sign" type="submit" value="查询"/>
+		   		<div id="date-radio">
+		   			<span>显示列(此项可多选)</span>
+					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+					<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>
+		   		
+			<div id="table">
+				<table border="1" class="tablefig" id="tablefig">
+					<thead>
+						<tr class="tr1"  id ='tr11'>
+							<th style="text-align:center; width:10%"></th>
+		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
+		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
+		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
+		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
+		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						</tr>
+						<tr>
+			               	<td style="text-align:center; width:10%"></td>     
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
+			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
+			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+			            </tr>
+					</thead>
+					<tbody>
+					<#if reportList ??>
+		            <#list reportList as report>
+						<tr id="tr22">
+			            	<td id="tdriqi" style="text-align:center;">${report.bannerName!}</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
+			                <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>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			            </tr>
+					</#list>
+					</#if>
+					</tbody>
+				</table>
+	        </div>
+	        
+			<div id="daochu" style="margin-left:20px; margin-top:20px;">
+				<a class="ljbtn2" id="exportExcel" href="javascript:void(0);" onClick="exportExcel('place','${ctx}/advertiser/main/ad/report/advertiser-report/exportOtherReportExcel')">导出Excel</a>
+			</div>
+						
+			<div id="pageDiv" style="margin-right:37px !important;">
+               	<#include "/common/pagination/simple.ftl"/>
+            </div>
+		</div>
+		</form>
+    </div>
+</div>
+</@override>
+<@extends name="/common/simple.ftl"/>
+

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

@@ -1,172 +1,173 @@
-<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<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/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">
-   <div id=content_bg>
-	<#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">总体报表</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">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">系统报表</li>
-				 </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="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<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="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="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<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!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列(此项可多选)</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<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>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
-						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
-			            </tr>
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;"><#if report.os==1>Windows<#elseif report.os==2>IOS<#elseif report.os==3>Android<#elseif report.os==4>MAC<#elseif report.os==5>WP</#if></td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <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>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<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: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-		</div>
-		</form>
-    </div>
-</div>
-</@override>
+<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	<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/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">
+   <div id=content_bg>
+	<#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">总体报表</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>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+				</ul>
+			</div>
+	   		<div id="third">
+				 <ul style="margin:0px;">
+				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
+				    <li class="size3">系统报表</li>
+				 </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="dateTab" name="dateTab" value="${dateTab!}">
+	 		<div id="selectuls">
+				<ul id="main_advertiserul">
+					<li class="select_box" id="advertiserul_box">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
+				<ul id="main_orderul">
+					<li class="select_box" id="orderul_box">
+						<span id="orderul_span">${selectedorderName!}</span>
+						<ul class="son_ul" id="orderul_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
+				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+				<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="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="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
+	 		</div>
+	
+			<div id="date">
+				<span id="date-one">
+					<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!}"/>
+		   		</span>
+		   		<input id="sign" type="submit" value="查询"/>
+		   		<div id="date-radio">
+		   			<span>显示列(此项可多选)</span>
+					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+					<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>
+		   		
+			<div id="table" style="width:99% !important;">
+				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
+					<thead>
+						<tr class="tr1"  id ='tr11'>
+							<th style="text-align:center; width:10%"></th>
+		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
+		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
+		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
+		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
+		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						</tr>
+						<tr>
+			               	<td style="text-align:center; width:10%"></td>     
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
+			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
+			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+			            </tr>
+					</thead>
+					<tbody>
+					<#if reportList ??>
+		            <#list reportList as report>
+						<tr id="tr22">
+			            	<td id="tdriqi" style="text-align:center;"><#if report.os==1>Windows<#elseif report.os==2>IOS<#elseif report.os==3>Android<#elseif report.os==4>MAC<#elseif report.os==5>WP</#if></td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
+			                <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>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			            </tr>
+					</#list>
+					</#if>
+					</tbody>
+				</table>
+	        </div>
+	        
+			<div id="daochu" style="margin-left:20px;">
+				<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: -10px 38px 0 0;">
+               	<#include "/common/pagination/simple.ftl"/>
+            </div>
+		</div>
+		</form>
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>
 <@extends name="/common/simple.ftl"/>

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

@@ -1,172 +1,173 @@
-<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<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/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">
-   <div id=content_bg>
-	<#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">总体报表</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">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">地域报表</li>
-				 </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="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<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="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="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<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!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列(此项可多选)</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<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>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
-						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
-			            </tr>
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.location!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <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>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<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:  -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-		</div>
-		</form>
-    </div>
-</div>
-</@override>
+<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	<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/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">
+   <div id=content_bg>
+	<#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">总体报表</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>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+				</ul>
+			</div>
+	   		<div id="third">
+				 <ul style="margin:0px;">
+				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
+				    <li class="size3">地域报表</li>
+				 </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="dateTab" name="dateTab" value="${dateTab!}">
+	 		<div id="selectuls">
+				<ul id="main_advertiserul">
+					<li class="select_box" id="advertiserul_box">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
+				<ul id="main_orderul">
+					<li class="select_box" id="orderul_box">
+						<span id="orderul_span">${selectedorderName!}</span>
+						<ul class="son_ul" id="orderul_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
+				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+				<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="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="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
+	 		</div>
+	
+			<div id="date">
+				<span id="date-one">
+					<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!}"/>
+		   		</span>
+		   		<input id="sign" type="submit" value="查询"/>
+		   		<div id="date-radio">
+		   			<span>显示列(此项可多选)</span>
+					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+					<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>
+		   		
+			<div id="table" style="width:99% !important;">
+				<table border="1" style="text-align:center; width:97%;margin-left:20px;" class="tablefig" id="tablefig">
+					<thead>
+						<tr class="tr1"  id ='tr11'>
+							<th style="text-align:center; width:10%"></th>
+		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
+		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
+		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
+		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
+		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						</tr>
+						<tr>
+			               	<td style="text-align:center; width:10%"></td>     
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
+			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
+			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+			            </tr>
+					</thead>
+					<tbody>
+					<#if reportList ??>
+		            <#list reportList as report>
+						<tr id="tr22">
+			            	<td id="tdriqi" style="text-align:center;">${report.location!}</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
+			                <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>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			            </tr>
+					</#list>
+					</#if>
+					</tbody>
+				</table>
+	        </div>
+	        
+			<div id="daochu" style="margin-left:20px;">
+				<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:  -10px 38px 0 0;">
+               	<#include "/common/pagination/simple.ftl"/>
+            </div>
+		</div>
+		</form>
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>
 <@extends name="/common/simple.ftl"/>

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

@@ -1,172 +1,173 @@
-<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
-	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
-	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
-	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
-	<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/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">
-   <div id=content_bg>
-	<#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">总体报表</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">
-				 <ul style="margin:0px;">
-				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
-					<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
-				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
-				    <li class="size3">场景报表</li>
-				 </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="dateTab" name="dateTab" value="${dateTab!}">
-	 		<div id="selectuls">
-				<ul id="main_advertiserul">
-					<li class="select_box" id="advertiserul_box">
-						<span id="advertiserul_span">${selectedadvertiserName!}</span>
-						<ul class="son_ul" id="advertiser_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
-				<ul id="main_orderul">
-					<li class="select_box" id="orderul_box">
-						<span id="orderul_span">${selectedorderName!}</span>
-						<ul class="son_ul" id="orderul_son_ul"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
-				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
-				<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="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="adGroupId" value="${adGroupId!}">
-				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
-	 		</div>
-	
-			<div id="date">
-				<span id="date-one">
-					<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!}"/>
-		   		</span>
-		   		<input id="sign" type="submit" value="查询"/>
-		   		<div id="date-radio">
-		   			<span>显示列(此项可多选)</span>
-					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
-					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
-					<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>
-		   		
-			<div id="table" style="width:99% !important;">
-				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
-					<thead>
-						<tr class="tr1"  id ='tr11'>
-							<th style="text-align:center; width:10%"></th>
-		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
-		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
-		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
-		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
-		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
-						</tr>
-						<tr>
-			               	<td style="text-align:center; width:10%"></td>     
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
-			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
-			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
-			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
-			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
-			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
-			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
-			            </tr>
-					</thead>
-					<tbody>
-					<#if reportList ??>
-		            <#list reportList as report>
-						<tr id="tr22">
-			            	<td id="tdriqi" style="text-align:center;">${report.placeName!}</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
-			                <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>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
-			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
-			            </tr>
-					</#list>
-					</#if>
-					</tbody>
-				</table>
-	        </div>
-	        
-			<div id="daochu" style="margin-left:20px;">
-				<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: -10px 38px 0 0;">
-               	<#include "/common/pagination/simple.ftl"/>
-            </div>
-		</div>
-		</form>
-    </div>
-</div>
-</@override>
+<@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" type="text/css" href="${ctx}/assets/css/regionReport.css">
+	<link rel="stylesheet" type="text/css" href="${ctx}/assets/css/report_size.css">
+	<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css"/>
+	<link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css" />
+	<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/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">
+   <div id=content_bg>
+	<#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">总体报表</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>
+					<li class="report6 re"><a href="${ctx}/back/main/ad/report/advertiser-report/ideaReport" style="text-decoration:none"><span class="baobiao11 ab">创意报表</span></a></li>
+				</ul>
+			</div>
+	   		<div id="third">
+				 <ul style="margin:0px;">
+				 	<li class="size1"><i class="icon-home" style="background-image:none;"></i> <a href="#">首页</a>
+					<span class="divider1"><i class="icon-angle-right"></i></span></li>
+				    <li class="size2"><a href="${ctx}/back/main/ad/report/advertiser-report">数据报表</a></li>
+				    <span class="divider2"><i class="icon-angle-right"></i></span></li>
+				    <li class="size3">场景报表</li>
+				 </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="dateTab" name="dateTab" value="${dateTab!}">
+	 		<div id="selectuls">
+				<ul id="main_advertiserul">
+					<li class="select_box" id="advertiserul_box">
+						<span id="advertiserul_span">${selectedadvertiserName!}</span>
+						<ul class="son_ul" id="advertiser_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedadvertiserId" id="advertiserId" value="${advertiserId!}">
+				<input type="hidden" name="selectedadvertiserName" id="advertiserName" value="${selectedadvertiserName!}">
+				<ul id="main_orderul">
+					<li class="select_box" id="orderul_box">
+						<span id="orderul_span">${selectedorderName!}</span>
+						<ul class="son_ul" id="orderul_son_ul"></ul>
+					</li>
+				</ul>
+				<input type="hidden" name="selectedorderId" id="orderId" value="${orderId!}">
+				<input type="hidden" name="selectedorderName" id="orderName" value="${selectedorderName!}">
+				<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="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="adGroupId" value="${adGroupId!}">
+				<input type="hidden" name="selectedadGroupName" id="adGroupName" value="${selectedadGroupName!}">
+	 		</div>
+	
+			<div id="date">
+				<span id="date-one">
+					<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!}"/>
+		   		</span>
+		   		<input id="sign" type="submit" value="查询"/>
+		   		<div id="date-radio">
+		   			<span>显示列(此项可多选)</span>
+					<input type="checkbox" name="item" value="impression" checked onclick="hideImpression()"/><span>曝光</span>
+					<input type="checkbox" name="item" value="click" checked onclick="hideClick()"/><span>点击</span>
+					<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>
+		   		
+			<div id="table" style="width:99% !important;">
+				<table border="1" style="text-align:center; width:97%;margin-left:20px;"  class="tablefig" id="tablefig">
+					<thead>
+						<tr class="tr1"  id ='tr11'>
+							<th style="text-align:center; width:10%"></th>
+		                    <th style="text-align:center; width:18%" class="hidden-impression" colspan=2>曝光</th>
+		                    <th style="text-align:center; width:18%" class="hidden-click" colspan=2>点击</th>
+		                    <th style="text-align:center; width:18%" class="hidden-visit" colspan=2>到达</th>
+		                    <th style="text-align:center; width:18%" class="hidden-conversion" colspan=2>转化</th>
+		                    <th style="text-align:center; width:18%" class="hidden-consume" colspan=2>花费</th>
+						</tr>
+						<tr>
+			               	<td style="text-align:center; width:10%"></td>     
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光占比</td>
+			                <td style="text-align:center; width:9%" class="hidden-impression">曝光数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击数</td>
+			                <td style="text-align:center; width:9%" class="hidden-click">点击率</td> 
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达数</td>
+			                <td style="text-align:center; width:9%" class="hidden-visit">到达率</td>   
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化数</td>
+			                <td style="text-align:center; width:9%" class="hidden-conversion">转化率</td>  
+			                <td style="text-align:center; width:9%" class="hidden-consume">eCPM</td>
+			                <td style="text-align:center; width:9%" class="hidden-consume">花费</td>
+			            </tr>
+					</thead>
+					<tbody>
+					<#if reportList ??>
+		            <#list reportList as report>
+						<tr id="tr22">
+			            	<td id="tdriqi" style="text-align:center;">${report.placeName!}</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-impression">${report.impressionRate!}%</td>
+			                <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>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-click">${report.clickRate!}%</td>  
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visit!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-visit">${report.visitRate!}%</td> 
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversion!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-conversion">${report.conversionRate!}%</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.eCmp!}</td>
+			                <td id="tdriqi" style="text-align:center;" class="hidden-consume">${report.consume!}</td>
+			            </tr>
+					</#list>
+					</#if>
+					</tbody>
+				</table>
+	        </div>
+	        
+			<div id="daochu" style="margin-left:20px;">
+				<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: -10px 38px 0 0;">
+               	<#include "/common/pagination/simple.ftl"/>
+            </div>
+		</div>
+		</form>
+    </div>
+</div>
+</@override>
 <@extends name="/common/simple.ftl"/>
 <@extends name="/common/simple.ftl"/>