Browse Source

修改广告位管理首页的问题

ying.rong 9 years ago
parent
commit
4418d65017

+ 2 - 2
src/main/java/com/cloudcross/ssp/web/operator/main/ad/ZoneController.java

@@ -95,14 +95,14 @@ public  class ZoneController extends SimpleController {
 		//获取当前账号的id
 		Account account = getLoginUser();
 		paramMap.put("operatorId", account.getOperatorId());
-
+		model.addAllAttributes(paramMap);
 		int totalRow = zoneService.countByParams(paramMap);
 		Pager pager = new Pager();
 		pager.setPage(page);
 		pager.setTotalRow(totalRow);
+		
 		List<Zone> zoneList = zoneService.findByParams(paramMap, pager);					
 		List<Size> sizeList = sizeService.findAllSize();											
-		model.addAllAttributes(paramMap);
 		model.addAttribute("pager", pager);
 		model.addAttribute("zoneList", zoneList);
 		model.addAttribute("sizeList", sizeList);

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

@@ -39,12 +39,12 @@
 		 		<div id="content_choose">	
 					<ul id="main_zoneListUl">
 						<li class="select_box" id="zoneListUl_box">
-							<span id="zoneListUl_span">${selectedZoneName!}</span>
+							<span id="zoneListUl_span">${zoneName!}</span>
 							<ul class="son_ul" id="son_zoneListUl"></ul>
 						</li>
 					</ul>
 					<input type="hidden" name="selectedZoneId" id="selectedZoneId" value="${selectedZoneId!}">
-					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${selectedZoneName!}">
+					<input type="hidden" name="selectedZoneName" id="selectedZoneName" value="${zoneName!}">
 					<span id="dateChoose_span">
 						<a value="today">今天</a> |
 						<a id="yesterday" value="yesterday">昨天</a> |

+ 3 - 3
src/main/webapp/WEB-INF/pages/operator/main/ad/zone/list.ftl

@@ -28,11 +28,11 @@
 					<div id="listButtons">
 						<a class="btn3" href='${ctx}/operator/main/ad/zone/edit/${zone.id}'>编辑</a>
 						<#if zone.device==2>
-						<a class="btn3" href="${ctx}/operator/main/code-class/list" value="${zone.id!}">取代码</a>
+						<a id="btn-getcode2" class="btn3" value="${zone.id!}">取代码</a>
 						<#else>
-						<a class="btn3" href="${ctx}/operator/main/code-class/list" value="${zone.id!}">取代码</a>
+						<a id="btn-getcode" class="btn3" value="${zone.id!}">取代码</a>
 						</#if>
-						<a class="btn3"  href='${ctx}/operator/main/ad/report/advertiser-report?selectedZoneId=${zone.id!}'>查看报表</a>
+						<a class="btn3" href='${ctx}/operator/main/ad/report/advertiser-report?selectedZoneId=${zone.id!}'>查看报表</a>
 						<#if zone.status==0>
 				    	<a id="btn-disable" value="${zone.id!}" class="btn3">停用</a>	
 						<#elseif zone.status=1>

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

@@ -1,47 +0,0 @@
-<@override name="head">
-<title>素材审核</title>
-<script type="text/javascript" src="${ctx}/assets/js/lib/bootstrap.min.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/lib/bootbox.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/common/table.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/operator/auditBanner.js"></script>
-</@override> 
-<@override name="body">
-<div id=content_bg>
-	<#include "/operator/main/public-head.ftl">
-	<div id= "pagecontent">
-		<div id="content">
-		    <div id="navDiv">
-				<ul id="navDiv_ul">
-					<li><i class="icon-home"></i></li>
-					<li><a href="${ctx}/operator/main/dashboard">首页</a></li>
-					<li><i class="icon-angle-right"></i></li>
-				    <li class="navDiv_currentLi">素材审核</li>
-				</ul>  
- 			</div>
- 			<form id="myform" action="${ctx}/operator/main/banner-audit/list" method="post">
- 				<input type="hidden" id="status" name="checked" value="${checked!}"/>
-	 			<div id="selectBar_status" class="selectBar">
-		 			<span>状态:</span>
-					<a value="">全部</a>
-					<a value="1">审核通过</a>
-					<a value="2">审核未通过</a>
-					<a value="0">未审核</a>
-				</div>
-				<div id="navButtons">
-					<div id="button">					
-						<a class="btn2" id="all-btn-pass">批量通过</a>
-						<a class="btn2" id="all-btn-unpass">批量不通过</a>
-					</div>
-					<div id="searchValueDiv">
-						<input type="hidden" id="page" name="page" value="${pager.page}"/>
-						<input id="searchValue" type="text" name="searchValue" value="${searchValue!}" tabindex="1"/>
-						<input id="serachData_img" type="submit" value=""/>
-					</div>
-				</div>
-				<#include "banner-audit.ftl">
-			</form>
-		</div>
-	</div>
-</div>
-</@override>
-<@extends name="/common/simple.ftl"/>

+ 1 - 1
src/main/webapp/assets/js/operator/auditBanner.js

@@ -4,7 +4,7 @@ $(document).ready(function(){
 	/***************************    素材审核列表页    ***************************/
 
  	//状态全部、开启、停用
- 	if($("#status").val() == 0 || $("#status").val() == ""){
+ 	if($("#status").val() == ""){
  		$("#selectBar_status a:first").addClass("selectBar_change");
 	}
  	$("#selectBar_status a").each(function(){

+ 47 - 2
src/main/webapp/assets/js/operator/zone.js

@@ -95,6 +95,51 @@ $(document).ready(function(){
 		batchOpear($(this),url);
 	});
 	
+	//取代码
+	$("#btn-getcode,#btn-getcode2").click(function(){
+		var zoneId = $(this).attr("value");
+		var url = ctx+"/operator/main/ad/zone/getCode?zoneId="+zoneId;
+		$.getJSON(url, function(data) {
+			var data_1 = data;
+			$('.bootbox-body').text(data_1);
+		});
+		bootbox.dialog({
+			message:"代码为:",
+			title: "该广告位的代码",
+			locale: 'zh_CN',
+			buttons: {
+				success: {
+					label: "复制",
+					className: "btn-success",
+					callback: function() {
+						var _content = $('.bootbox-body').text();
+					}
+				},
+				main: {
+					label: "关闭",
+					className: "btn-primary",
+					callback: function() {
+					}
+				}
+			}
+		});
+		//以下代码实现复制功能,利用ZeroClipboard插件实现
+		var client = new ZeroClipboard($('.modal-footer .btn-success'));
+		client.on('ready', function(event) {
+			// console.log( 'movie is loaded' );
+			client.on('copy', function(event) {
+				event.clipboardData.setData('text/plain', $('.bootbox-body').text());
+			});
+			client.on('aftercopy', function(event) {
+				console.log('Copied text to clipboard: ' + event.data['text/plain']);
+			});
+		});
+		client.on('error', function(event) {
+			// console.log( 'ZeroClipboard error of type "' + event.name + '": ' + event.message );
+			ZeroClipboard.destroy();
+		});
+	});
+	
 	/***************************    创建,编辑广告主    ***************************/
 	
 	//初始化加载上传控件
@@ -292,8 +337,8 @@ function exportExcel_list(){
 	if(searchValue == "请输入关键字"){
 		searchValue = "";
 	}
-	var param = "?industryId="+$("#industryId").val()+"&status="+$("#status").val()+"&searchValue="+searchValue;
-	$("#exportExcel").attr("href",$("#ctx").val()+"/advertiser/main/ad/advertiser/exportDataReportExcel"+param);
+	var param = "?width="+$("#width").val()+"&height="+$("#height").val()+"&device="+$("#device").val()+"&position="+$("#position").val()+"&status="+$("#status").val()+"&searchValue="+searchValue;
+	$("#exportExcel").attr("href",$("#ctx").val()+"/operator/main/ad/zone/exportDataReportExcel"+param);
 	return false;
 }