修改广告主端首页，更改权限问题

src/main/webapp/WEB-INF/pages/advertiser/main/authority/create.ftl

@@ -238,11 +238,11 @@
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="52"/><span class="input-checkbox-span">投放管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="71" /><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="53" /><span class="input-checkbox-span">创意中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="55" /><span class="input-checkbox-span">代码中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="54" /><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="201"/><span class="input-checkbox-span">投放管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="202" /><span class="input-checkbox-span">数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="203" /><span class="input-checkbox-span">创意中心</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="204" /><span class="input-checkbox-span">代码中心</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="205" /><span class="input-checkbox-span">财务管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">

src/main/webapp/WEB-INF/pages/advertiser/main/authority/edit.ftl

@@ -235,11 +235,11 @@
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
 						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="52"/><span class="input-checkbox-span">投放管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="71" /><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="53" /><span class="input-checkbox-span">创意中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="55" /><span class="input-checkbox-span">代码中心</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="54" /><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="201"/><span class="input-checkbox-span">投放管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="202" /><span class="input-checkbox-span">数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="203" /><span class="input-checkbox-span">创意中心</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="204" /><span class="input-checkbox-span">代码中心</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="205" /><span class="input-checkbox-span">财务管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">

src/main/webapp/WEB-INF/pages/advertiser/main/dashboard.ftl

@@ -1,10 +1,7 @@
 <@override name="head">
 <title>广告投放系统</title>
 <!--Include Required css file-->
-<link rel="stylesheet" href="${ctx}/assets/css/public-head.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/dashboard.css"/>
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
-<link rel="stylesheet" href="${ctx}/assets/css/bootstrap.min.css"/>
 
 <!--Include Required Prerequisites js-->
 <script type="text/javascript" src="${ctx}/assets/js/lib/jquery-1.9.1.min.js"></script>
@@ -22,7 +19,7 @@
 $(document).ready(function(){
 	//显示今天时间
 	var date = new Date();	
-	$("#content-left .up .today").text(formatDate(date));
+	$("#today").text(formatDate(date));
 	function formatDate(now)   {   
 		var year = now.getFullYear();   
 		var month = now.getMonth()+1;   
@@ -63,7 +60,7 @@ $(document).ready(function(){
 	*更改日期的函数，所有更改日期的事件都是调用此函数
 	*/
 	function cb(start, end) { 
-		$('#date-range input').val(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));//将日期显示在input标签里面
+		$('#dateRangePicker').val(start.format('YYYY-MM-DD') + ' to ' + end.format('YYYY-MM-DD'));//将日期显示在input标签里面
 		searchAndDraw(start, end);
 	}
 	/*
@@ -93,26 +90,12 @@ $(document).ready(function(){
 	*		仅仅设置语言为cn, 最大选择日期问今天
 	*		绑定一个确定按钮点击事件,回调函数,执行cb函数,更改日期,其实不用改,只不过是为了查询数据和绘制图表
 	*/
-	$('#date-range-picker').dateRangePicker({  
+	$('#dateRangePicker').dateRangePicker({  
 		language:'cn',
-		endDate:new Date(),
+		endDate:new Date()
 	}).bind('datepicker-apply', function(evt, obj) {
 		cb(moment(obj.date1), moment(obj.date2));
 	});
-
-	/*
-	*下拉框广告主改变,调用searchAndDraw重新查询数据绘制图形
-	*/
-	$('#selectedAdvertiserId3').change(function() {
-		var opt = '#selectedAdvertiserId3 option[value=' + $(this).val() + ']';
-		var txt = '趋势图：' + $(opt).html();
-		console.log(txt);
-		$('#chartContent .chart-down .chart-down-left').html(txt);
-		var chooseDate = $('#date-range-picker').val().split(' to ',2);
-		var start = moment(chooseDate[0]);//转换为moment格式
-		var end = moment(chooseDate[1]);//转换为moment格式
-		searchAndDraw(start, end);
-	});
 	
 	/*
     *发送ajax请求，查询数据
@@ -230,9 +213,9 @@ $(document).ready(function(){
 	/*
 	*快速设置为(今天 昨天 过去7天 过去30天)
 	*/
-	$('#chartContent  .chart-up .right span.time').click(function(e){ //今天 昨天 过去七天 过去三十天触发函数
+	$('#dashboard_chartContent .chart-up .right span.time').click(function(e){ //今天 昨天 过去七天 过去三十天触发函数
         e.preventDefault;
-		$('#chartContent  .chart-up .right span').css('color','#344c67');
+		$('#dashboard_chartContent .chart-up .right span').css('color','#344c67');
 		$(this).css('color','#36aeea');
         var ind = $(this).index();
         switch (ind){
@@ -254,7 +237,7 @@ $(document).ready(function(){
 	/*
 	*四条折线(消费,曝光数,点击数,点击率),点击切换
 	*/
-	$('#chartContent form input[type="radio"]').click(function(){
+	$('#dashboard_chartContent #right_radio input[type="radio"]').click(function(){
 		var n = $(this).val();
 		var data = flow[n];
 		consume = tipLabel[n];
@@ -263,7 +246,7 @@ $(document).ready(function(){
 		if(n == 1){	txt = '曝光数（次）'; }
 		if(n == 2){	txt = '点击数（次）'; }
 		if(n == 3){	txt = '点击率（%）'; }
-		$('#chartContent .chart-down .chart-down-right').html(txt);
+		$('#dashboard_chartContent .chart-down .chart-down-right').html(txt);
 		drawDiagram(labels,data,consume);
 	});
 	
@@ -310,15 +293,15 @@ $(document).ready(function(){
 	$("#diagramHead span:first-child").click(function(){
 		$("#sheetContent").css("display","none");
 		$("#diagramHead span:first-child").css("border-bottom","1px solid #ffffff");
-		$("#chartContent").css("display","block");
+		$("#dashboard_chartContent").css("display","block");
 		$("#diagramHead span:last-child").css("border-bottom","1px solid #d5dee8");
 	});
 	$("#diagramHead span:last-child").click(function(){
-		$("#chartContent").css("display","none");
+		$("#dashboard_chartContent").css("display","none");
 		$("#diagramHead span:first-child").css("border-bottom","1px solid #d5dee8");
 		$("#sheetContent").css("display","block");
 		$("#diagramHead span:last-child").css("border-bottom","1px solid #ffffff");
-		var chooseDate = $('#date-range-picker').val().split(' to ',2);
+		var chooseDate = $('#dateRangePicker').val().split(' to ',2);
 		var start = chooseDate[0];//转换为moment格式
 		var end = chooseDate[1];//转换为moment格式
 		var advertiserId = $('#selectedAdvertiserId3').val();
@@ -334,46 +317,10 @@ $(document).ready(function(){
 		});
 	});
 		
-	/*
-	*根据广告主选择账户余额
-	*	选择一个广告主,发送ajax请求,获取数据
-	*/
-	$('#selectedAdvertiserId').change(function() {
-		var agentId = $("#agentId").val(); //获取代理商id
-		var advertiserId = $('#selectedAdvertiserId').val();
-		var param = {};
-		if(advertiserId == -1) {
-			param = {
-				'agentId':agentId
-			};
-		} else {
-			param = {
-				'advertiserId':advertiserId
-			};
-		}
-		//发送ajax请求
-		$.ajax({
-			type : 'post',	//请求方式，post
-			data : param,	//请求参数，param
-			url : '/ssp_web/advertiser/main/dashboard/findCompareAjax',	//请求url
-			async : false,	//是否设置为异步请求
-			cache : false,	//是否缓存
-			dataType : 'json',	//数据类型为json
-			success : function(data){ //请求成功回调函数处理，参数为返回回来的json数组
-				$('#accountBalance .data-down').text(data.balance);
-				$('#exposure .data-down').text(data.totalImpression);
-				$('#click .data-down').text(data.totalClick);
-			},
-			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
-				console.info('error');
-			}
-		});
-	});
-		
 	/*
 	*根据广告主id创建订单
 	*/
-	$('#content-right button').click(function(){
+	$('#right button.btn1').click(function(){
 		var advertiserId = null;
 		//判断是广告主还是代理商
 		if(role == "advertiser"){
@@ -399,7 +346,10 @@ $(document).ready(function(){
 	
 	//获取广告主的值
 	if($("#role").val() == "agent"){
-		var _url = "${ctx}/widget/selector/provide/advertiser?parentId="+agentId; //请求地址
+		$("#advertiser_son_ul").hide();
+		$("#advertiser_son_ul2").hide();
+		$("#advertiser_son_ul3").hide();
+		var _url = "${ctx}/widget/selector/provide/advertiser?parentId="+$("#agentId").val(); //请求地址
 		getSelectData("advertiserul_span","advertiser_son_ul","advertiserul_box","全部广告主",_url);
 		getSelectData("advertiserul_span2","advertiser_son_ul2","advertiserul_box2","请选择广告主",_url);
 		getSelectData("advertiserul_span3","advertiser_son_ul3","advertiserul_box3","请选择广告主",_url);
@@ -456,15 +406,14 @@ $(document).ready(function(){
 		$("#selectedAdvertiserId3").val($(this).attr("value"));
 		$("#selectedAdvertiserName3").val($(this).html());
 		$('#advertiser_son_ul3').hide(); //ul隐藏
-		$('#chartContent .chart-down .chart-down-left').html("趋势图："+$(this).html());
-		var chooseDate = $('#date-range-picker').val().split(' to ',2);
+		$('#dashboard_chartContent .chart-down .chart-down-left').html("趋势图："+$(this).html());
+		var chooseDate = $('#dateRangePicker').val().split(' to ',2);
 		var start = moment(chooseDate[0]);//转换为moment格式
 		var end = moment(chooseDate[1]);//转换为moment格式
 		searchAndDraw(start, end);
 	});
 	
 	function getSelectData(target_spanId,target_sonulId,target_boxId,defaultName,url){
-		$("#"+target_spanId).hide();
 		$("#"+target_sonulId).append("<li value='-1' style='width:130px;'>"+defaultName+"</li>");
 		$.getJSON( url, function(data) {
 			var data_1 = data.advertiserList;
@@ -490,118 +439,118 @@ $(document).ready(function(){
 
 <@override name="body">
 <#include "public-head.ftl">
-<div id= "pagecontent">
-	<div id="quickNav">
-		<i class="icon-home"></i>&nbsp;<a href="${ctx}/advertiser/main/dashboard">首页</a>
-	</div>
+<div id="pagecontent">
 	<div id="content">
-		<div id="content-left">
-			<div class="up">
-				<span class="today"></span>
-				<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="selectedAdvertiserId" value="${advertiserId!}">
-				<input type="hidden" name="selectedadvertiserName" id="selectedadvertiserName" value="${selectedadvertiserName!}">
-			</div>
-			<div class="down">
-				<div id="exposure">
-					<div class="data-up">
-						<span>曝光数</span>
-						<!-- <span>45%</span> -->
-						<#if compareMap.impressionStatus == 'up'>
-						<i class="icon-arrow-up"></i>
-						<#else>
-						<i class="icon-arrow-down"></i>
-						</#if>
-					</div>
-					<div class="data-down">${compareMap.totalImpression!}</div>
+		<div id="navDiv">
+			<ul id="navDiv_ul">
+				<li><i class="icon-home"></i>首页</li>
+			</ul>  
+ 		</div>
+ 		<div id="dashboard_top_advertiser">
+ 			<div id="left">
+ 				<div class="up">
+					<span id="today"></span>
+					<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="selectedAdvertiserId" value="${advertiserId!}">
+					<input type="hidden" name="selectedadvertiserName" id="selectedadvertiserName" value="${selectedadvertiserName!}">
 				</div>
-				<div id="click">
-					<div class="data-up">
-						<span>点击数</span>
-						<!-- <span>33%</span> -->
-						<#if compareMap.clickStatus == 'up'>
-						<i class="icon-arrow-up"></i>
-						<#else>
-						<i class="icon-arrow-down"></i>
-						</#if>
+				<div class="down">
+					<div id="exposure" class="dataFrame">
+					   	<div class="dataFrame_name">
+					   		<span>曝光数</span>
+					   		<#if compareMap.impressionStatus == 'up'>
+							<i class="icon-arrow-up"></i>
+							<#else>
+							<i class="icon-arrow-down"></i>
+							</#if>
+					   	</div>
+					   	<div class="dataFrame_data">${compareMap.totalImpression!}</div>
+					</div>
+					<div id="click" class="dataFrame">
+					   	<div class="dataFrame_name">
+					   		<span>点击数</span>
+					   		<#if compareMap.impressionStatus == 'up'>
+							<i class="icon-arrow-up"></i>
+							<#else>
+							<i class="icon-arrow-down"></i>
+							</#if>
+					   	</div>
+					   	<div class="dataFrame_data">${compareMap.totalClick!}</div>
+					</div>
+					<div id="accountBalance" class="dataFrame">
+					   	<div class="dataFrame_name"><span>账户余额</span></div>
+					   	<div class="dataFrame_data">${compareMap.balance!}</div>
 					</div>
-					<div class="data-down">${compareMap.totalClick!}</div>
-				</div>
-				<div id="accountBalance">
-					<div class="data-up"><span>账户余额</span></div>
-					<div class="data-down">${compareMap.balance!}</div>
 				</div>
-			</div>
-		</div>
-		<div id="content-right">
-			<div class="up">
-				<span>创建新的订单</span>
-			</div>
-			<div class="down">
-				<ul id="main_advertiserul2">
-					<li class="select_box" id="advertiserul_box2">
-						<span id="advertiserul_span2">${selectedadvertiserName2!}</span>
-						<ul class="son_ul" id="advertiser_son_ul2"></ul>
-					</li>
-				</ul>
-				<input type="hidden" name="selectedAdvertiserId2" id="selectedAdvertiserId2" value="${advertiserId2!}">
-				<input type="hidden" name="selectedadvertiserName2" id="advertiserName2" value="${selectedadvertiserName2!}">
-				<button href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
-			</div>
-		</div>
-	</div>
-	<div id="diagram">
-		<div id="diagramHead">
-			<span>图像模式</span>
-			<span>列表模式</span>
-		</div>
-		<div id="chartContent">
-			<div class="chart-up">
-				<div class="pull-down">
-					<span class="span">选择广告主</span>
-					<ul id="main_advertiserul3">
-						<li class="select_box" id="advertiserul_box3">
-							<span id="advertiserul_span3">${selectedadvertiserName3!}</span>
-							<ul class="son_ul" id="advertiser_son_ul3"></ul>
+ 			</div>
+ 			<div id="right">
+ 				<div class="up"><span>创建新的订单</span></div>
+				<div class="down">
+					<ul id="main_advertiserul2">
+						<li class="select_box" id="advertiserul_box2">
+							<span id="advertiserul_span2">${selectedadvertiserName2!}</span>
+							<ul class="son_ul" id="advertiser_son_ul2"></ul>
 						</li>
 					</ul>
-					<input type="hidden" name="selectedAdvertiserId3" id="selectedAdvertiserId3" value="${advertiserId3!}">
-					<input type="hidden" name="selectedadvertiserName3" id="advertiserName3" value="${selectedadvertiserName3!}">
+					<input type="hidden" name="selectedAdvertiserId2" id="selectedAdvertiserId2" value="${advertiserId2!}">
+					<input type="hidden" name="selectedadvertiserName2" id="advertiserName2" value="${selectedadvertiserName2!}">
+					<button class="btn1" href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
 				</div>
-				<div class="time-period">
-					<span class="span">时间周期选择</span>
-					<div id="date-range" class="pull-right">
-						<i class="icon-calendar" style="background:none;"></i> 
-						<input readonly='readonly' id="date-range-picker" value="">
+ 			</div>
+ 		</div>
+ 		<div id="dashboard_diagram">
+			<div id="diagramHead">
+				<span>图像模式</span>
+				<span>列表模式</span>
+			</div>
+			<div id="dashboard_chartContent">
+				<div class="chart-up">
+					<div class="pull-down">
+						<span class="span">选择广告主</span>
+						<ul id="main_advertiserul3">
+							<li class="select_box" id="advertiserul_box3">
+								<span id="advertiserul_span3">${selectedadvertiserName3!}</span>
+								<ul class="son_ul" id="advertiser_son_ul3"></ul>
+							</li>
+						</ul>
+						<input type="hidden" name="selectedAdvertiserId3" id="selectedAdvertiserId3" value="${advertiserId3!}">
+						<input type="hidden" name="selectedadvertiserName3" id="advertiserName3" value="${selectedadvertiserName3!}">
+					</div>
+					<div class="time-period">
+						<span class="span">时间周期选择</span>
+						<span id="calendar_span">
+						<i class="icon-calendar"></i>   
+							<input type="text" name="dateRangePicker" id="dateRangePicker" value="${dateRangePicker!}"/>
+						</span>
+					</div>
+					<div class="right">
+							<span class='time'>今天</span>
+							<span class='time'>昨天</span>
+							<span class='time'>最近7天</span>
+							<span class='time'>最近30天</span>
+						<div id="right_radio">
+							<span><input type="radio" name="item" checked="checked" value="0"/>消费数</span>
+							<span><input type="radio" name="item" value="1"/>曝光数</span>
+							<span><input type="radio" name="item" value="2"/>点击数</span>
+							<span><input type="radio" name="item" value="3"/>点击率</span>
+						</div>
 					</div>
 				</div>
-				<div class="right">
-					<span class='time'>今天</span>
-					<span class='time'>昨天</span>
-					<span class='time'>最近7天</span>
-					<span class='time'>最近30天</span>
-					<form>
-						<input type="radio" name="item" checked="checked" value="0" /><span>消费数</span>
-						<input type="radio" name="item" value="1" /><span>曝光数</span>
-						<input type="radio" name="item" value="2" /><span>点击数</span>
-						<input type="radio" name="item" value="3" /><span>点击率</span>
-					</form>
+				<div class="chart-down">
+					<div class="chart-down-left">趋势图：请选择广告主</div>
+					<div class="chart-down-right">消费 (元)</div>
+					<div id="chart" style="width:99.8%;"></div>
 				</div>
 			</div>
-			<div class="chart-down">
-				<div class="chart-down-left">趋势图：请选择广告主</div>
-				<div class="chart-down-right">消费 (元)</div>
-				<div id="chart"></div>
+			<div id="sheetContent">
+	
 			</div>
 		</div>
-		<div id="sheetContent">
-
-		</div>
 	</div>
 </div>
 

src/main/webapp/WEB-INF/pages/advertiser/main/dashboard/list.ftl

@@ -1,4 +1,4 @@
-<table class="table">
+<table border="1" class="tableFig">
 	<thead>
 		<tr>
 			<th>广告主名称</th>
@@ -32,9 +32,6 @@
 		</#if>           
     </tbody>
 </table>
-
-<div id="footBar">
-	<div id="paged">
-       <#include "/common/pagination/simple.ftl"/>
-    </div>
+<div id="dashboard_pageDiv">
+	<#include "/common/pagination/simple.ftl"/>
 </div>

src/main/webapp/WEB-INF/pages/advertiser/main/public-head.ftl

@@ -1,32 +1,51 @@
-<div id="top">	
-    <div id="logoa">
-	<img class="logo1" src="${ctx}/assets/images/datacross.png">		
-	<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
-	<img class="logo3" src="${ctx}/assets/images/wificross.png">	
+<#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
+<div id="headDiv">	
+	<div id="logoa">
+		<img class="logo1" src="${ctx}/assets/images/datacross.png">		
+		<img class="logo2" src="${ctx}/assets/images/cut-off-rule.png">		
+		<img class="logo3" src="${ctx}/assets/images/wificross.png">	
 	</div>	
-	<ul class="nav">
+	<ul id="menu">
 		<li><a href="${ctx}/advertiser/main/dashboard"><span>首页</span></a></li>
+		
 		<#if role == "agent">
-		<li><a href="${ctx}/advertiser/main/ad/advertiser/list"><span>投放管理</span></a></li>
+		<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/ad/advertiser/list"><span>投放管理</span></a></li>
+		</@sec.authorize>
 		<#elseif role == "advertiser">
-		<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${userSession.advertiserId}"><span>订单管理</span></a></li>
+		<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/ad/order/list?advertiserId=${userSession.advertiserId}"><span>订单管理</span></a></li>
+		</@sec.authorize>
 		</#if>
-		<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report"><span>数据报表</span></a></li>
-		<li><a href="${ctx}/advertiser/main/ad/banner-template"><span>创意中心</span></a></li>
-		<li><a href="${ctx}/advertiser/main/code-site/list"><span>代码中心</span></a></li>
-		<li><a href="${ctx}/advertiser/main/ad/adv-balance/list"><span>财务管理</span></a></li>	
-		<li><a href="${ctx}/advertiser/main/authority/list"><span>账号管理</span></a></li>  			
+		
+		<@sec.authorize access="hasAnyRole('ROLE_agent_rpt,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/ad/report/advertiser-report"><span>数据报表</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_agent_banner,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/ad/banner-template"><span>创意中心</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_agent_code,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/code-site/list"><span>代码中心</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_agent_finance,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/ad/adv-balance/list"><span>财务管理</span></a></li>
+		</@sec.authorize>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_agent_authority,ROLE_MANAGER')">
+			<li><a href="${ctx}/advertiser/main/authority/list"><span>账号管理</span></a></li>
+		</@sec.authorize>  			
 	</ul>	
-	<div id="divselect" >
-            <div id="opa">    	
-			<cite><li style=" text-overflow:ellipsis;padding-top:4px;">${userSession.description}</li><li>${userSession.accountName}</li></cite>
-            </div>
+	<div id="divselect">
+		<div id="currentOpa">
+			<cite><li>${userSession.description}</li><li>${userSession.accountName}</li></cite>
+		</div>
 		<ul>
-			<ul>
 			<li><a href="${ctx}/advertiser/main/authority/loginperson" selectid="1">修改个人信息</a></li>
 			<li><a href="${ctx}/logout" selectid="2">退出登录</a></li>       
 		</ul>
-		</ul>
 		<input type="hidden" value="${ctx!}" id="ctx"/>
 		<input type="hidden" id="role" value="${role!}"/>
 		<input type="hidden" id="agentId" value="${userSession.agentId!}"/>
@@ -37,29 +56,30 @@
 </div>	
 <script type="text/javascript">
 	$(function(){
+	
 		var path = window.location.pathname;
 		if(path.indexOf("dashboard") != -1){
-			$("#top .nav li a:first").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:first").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		if((path.indexOf("ad/advertiser") != -1)
 				||(path.indexOf("ad/order") != -1)
 				||(path.indexOf("ad/target") != -1)){
-			$("#top .nav li a:eq(1)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:eq(1)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("report") != -1){
-			$("#top .nav li a:eq(2)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:eq(2)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("banner-template") != -1){
-			$("#top .nav li a:eq(3)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:eq(3)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("code-site") != -1){
-			$("#top .nav li a:eq(4)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
-		};
-		if(path.indexOf("authority") != -1){
-			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:eq(4)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("adv-balance") != -1){
-			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/advertiser/images/tophover_bg.jpg)");
+			$("#menu a:eq(5)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
+		};
+		if(path.indexOf("authority") != -1){
+			$("#menu a:eq(6)").css("background-image","url(${ctx}/assets/images/tophover_bg.jpg)");
 		};
 		
 	});

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

@@ -184,11 +184,11 @@
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="71" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="61" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="62" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="63" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="101" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="102" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="103" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="104" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="105" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">

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

@@ -181,11 +181,11 @@
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
 						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" value="71" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
-						<input class="input-checkbox" type="checkbox" value="61" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
-						<input class="input-checkbox" type="checkbox" value="62" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
-						<input class="input-checkbox" type="checkbox" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" value="63" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" value="101" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">需求方报表</span>
+						<input class="input-checkbox" type="checkbox" value="102" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">媒体数据报表</span>
+						<input class="input-checkbox" type="checkbox" value="103" /><span class="lbl" style="position:absolute;left:319px;"></span><span class="input-checkbox-span">审核</span>
+						<input class="input-checkbox" type="checkbox" value="104" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" value="105" /><span class="lbl" style="position:absolute;left:477px;"></span><span class="input-checkbox-span">客户账号管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1">

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

@@ -6,12 +6,24 @@
 	</div>	
 	<ul class="nav">
 		<li><a href="${ctx}/back/main/dashboard"><span>首页</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_advertiser_report,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/ad/report/advertiser-report"><span>需求方报表</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_operator_reprot,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/ad/operator/operator-report"><span>媒体数据报表</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_audit,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/audit/audit-banner"><span>审核</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_finance,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/finance/finance-management"><span>财务管理</span></a></li>
-		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>	
-		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>  			
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_client_account,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>
+		
+		<@sec.authorize access="hasAnyRole('ROLE_back_authority,ROLE_MANAGER')">
+		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>  			
 	</ul>	
 	<div id="divselect" >
 	        <div id="opa">
@@ -48,10 +60,10 @@
 			$("#top .nav li a:eq(4)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("client-account") != -1){
-			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
+			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 		if(path.indexOf("authority") != -1){
-			$("#top .nav li a:eq(5)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
+			$("#top .nav li a:eq(6)").css("background-image","url(${ctx}/assets/back/images/tophover_bg.jpg)");
 		};
 	});
 </script>

src/main/webapp/WEB-INF/pages/common/simple.ftl

@@ -8,25 +8,17 @@
 		<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
 		<link rel="shortcut icon" href="${ctx}/favorite.ico" >
 		<!-- basic styles -->
-		<link href="${ctx}/assets/back/css/bootstrap.min.css" rel="stylesheet" />
-		<link href="${ctx}/assets/back/css/bootstrap-responsive.min.css" rel="stylesheet" />
-		<link rel="stylesheet" href="${ctx}/assets/back/css/font-awesome.min.css" />
+		<link href="${ctx}/assets/css/bootstrap.min.css" rel="stylesheet" />
+		<link rel="stylesheet" href="${ctx}/assets/css/font-awesome.min.css" />
 		
-		<!-- page specific plugin styles -->
-   		<link rel="stylesheet" href="${ctx}/assets/back/css/datepicker.css"/>
-    	<link rel="stylesheet" href="${ctx}/assets/back/css/daterangepicker.css" />
 		<!--[if IE 7]>
-		  <link rel="stylesheet" href="${ctx}/assets/back/css/font-awesome-ie7.min.css" />
+		  <link rel="stylesheet" href="${ctx}/assets/css/font-awesome-ie7.min.css" />
 		<![endif]-->
 		<!-- page specific plugin styles -->
-		
-		<!-- ace styles -->
-		<link rel="stylesheet" href="${ctx}/assets/back/css/ace.min.css" />
-		<link rel="stylesheet" href="${ctx}/assets/back/css/ace-responsive.min.css" />
-		<!--[if lt IE 9]>
-		  <link rel="stylesheet" href="${ctx}/assets/back/css/ace-ie.min.css" />
-		<![endif]-->
+		 <link rel="stylesheet" href="${ctx}/assets/css/common_style.css"/>
 		<@block name="head"></@block>
+		
+		
 	</head>
 	<body>
 		<@block name="body"></@block>

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

@@ -184,11 +184,11 @@
 					
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="70" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">广告位管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="71" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="72" /><span class="lbl" style="position:absolute;left:295px;"></span><span class="input-checkbox-span">素材审核</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="74" /><span class="lbl" style="position:absolute;left:476px;"></span><span class="input-checkbox-span">热点管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="151" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">广告位管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="152" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="153" /><span class="lbl" style="position:absolute;left:295px;"></span><span class="input-checkbox-span">素材审核</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="154" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="155" /><span class="lbl" style="position:absolute;left:476px;"></span><span class="input-checkbox-span">热点管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1" style="margin-top:10px;">

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

@@ -180,11 +180,11 @@
 					<div id="checkboxs" class="control-group" style="margin-bottom:10px;">
 						<label class="control-label1" for="form-field-4"><span class="lbl1">*</span>权限：</label>
 						<input id="input-authority" type="hidden" name="authority" value="${authority}" />
-						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="70" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">广告位管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="71" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">数据报表</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="72" /><span class="lbl" style="position:absolute;left:295px;"></span><span class="input-checkbox-span">素材审核</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="73" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
-						<input class="input-checkbox" type="checkbox" name="authority" value="74" /><span class="lbl" style="position:absolute;left:476px;"></span><span class="input-checkbox-span">热点管理</span>
+						<input class="input-checkbox" id="input-checkbox1" type="checkbox" name="authority" value="151" /><span class="lbl" style="position:absolute;left:100px;"></span><span class="input-checkbox-span">广告位管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="152" /><span class="lbl" style="position:absolute;left:203px;"></span><span class="input-checkbox-span">数据报表</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="153" /><span class="lbl" style="position:absolute;left:295px;"></span><span class="input-checkbox-span">素材审核</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="154" /><span class="lbl" style="position:absolute;left:385px;"></span><span class="input-checkbox-span">财务管理</span>
+						<input class="input-checkbox" type="checkbox" name="authority" value="155" /><span class="lbl" style="position:absolute;left:476px;"></span><span class="input-checkbox-span">热点管理</span>
 					</div>
 					
 					<div id="btn-class" class="form-actions1" style="margin-top:10px;">

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

@@ -7,30 +7,30 @@
 	</div>	
 	<ul class="nav">
 		<li><a href="${ctx}/operator/main/dashboard"><span>首页</span></a></li>
-		<@sec.authorize access="hasAnyRole('ROLE_authority_advertiser,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_zone,ROLE_MANAGER')">
 		<li><a href="${ctx}/operator/main/ad/zone"><span>广告位管理</span></a></li>
 		</@sec.authorize>
 	
-		<@sec.authorize access="hasAnyRole('ROLE_authority_report,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_rpt,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/ad/report/advertiser-report"><span>数据报表</span></a></li>
 		</@sec.authorize>
 	
-		<@sec.authorize access="hasAnyRole('ROLE_authority_banner_audit,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_audit,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/banner-audit"><span>素材审核</span></a></li>
 		</@sec.authorize>
 	
-		<@sec.authorize access="hasAnyRole('ROLE_authority_finance,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_finance,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/financial/financial-management/list"><span>财务管理</span></a></li>
 		</@sec.authorize>
 		
 		
-		<@sec.authorize access="hasAnyRole('ROLE_authority_ap,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_ap,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/ap/apmac/list"><span>热点管理</span></a></li>	
 		</@sec.authorize>	 
 	
 	
 	
-		<@sec.authorize access="hasAnyRole('ROLE_authority,ROLE_MANAGER')">
+		<@sec.authorize access="hasAnyRole('ROLE_operator_authority,ROLE_MANAGER')">
 			<li><a href="${ctx}/operator/main/authority/list"><span>权限管理</span></a></li>	 
 		</@sec.authorize>  	
 		

src/main/webapp/assets/css/bootstrap.min.css

@@ -1526,7 +1526,7 @@ table td[class*="span"],table th[class*="span"],.row-fluid table td[class*="span
 	*margin-right:.3em;
 	line-height:14px;
 	vertical-align:text-top;
-	background-image:url("../images/glyphicons-halflings.png");
+	/*background-image:url("../images/glyphicons-halflings.png");*/
 	background-position:14px 14px;
 	background-repeat:no-repeat
 }

src/main/webapp/assets/css/common_style.css

@@ -0,0 +1,717 @@
+/************public-head CSS**************/
+/* 设置页面的元素 内边距和外边距为0， 和字体的样式 */
+*{
+	padding: 0px;
+	margin: 0px;
+	font-family: "microsoft yahei";
+	font-size:14px;
+}
+body{
+	width:100%;	
+	background-color:#f5f5f5;
+}
+
+a:hover{
+	text-decoration:none;
+}
+
+ul{
+	margin:0px;
+}
+
+li{
+	list-style: none;
+}
+
+/* 登陆页面 */
+body.login-layout {
+   background:#fff
+}
+body.login-layout:before {
+   display:none
+}
+.login-container {
+   width:375px;
+   margin:120px auto 0 auto
+}
+.login-layout #main-content {
+   margin-left:0;
+   min-height:100%
+}
+.login-layout input[type="text"],.login-layout input[type="password"],.login-layout input[type="datetime"],.login-layout input[type="datetime-local"],.login-layout input[type="date"],.login-layout input[type="month"],.login-layout input[type="time"],.login-layout input[type="week"],.login-layout input[type="number"],.login-layout input[type="email"],.login-layout input[type="url"],.login-layout input[type="search"],.login-layout input[type="tel"],.login-layout input[type="color"] {
+   line-height:32px;
+   height:32px;
+   max-height:32px;
+   margin-bottom:4px
+}
+.login-layout label {
+   margin-bottom:11px
+}
+.login-layout .widget-box {
+   visibility:hidden;
+   position:absolute;
+   overflow:hidden;
+   width:100%;
+   -moz-transform:scale(0,1) translate(-150px);
+   -webkit-transform:scale(0,1) translate(-150px);
+   -o-transform:scale(0,1) translate(-150px);
+   -ms-transform:scale(0,1) translate(-150px);
+   transform:scale(0,1) translate(-150px)
+}
+.login-layout .widget-box.visible {
+   -moz-transform:scale(1,1) translate(0);
+   -webkit-transform:scale(1,1) translate(0);
+   -o-transform:scale(1,1) translate(0);
+   -ms-transform:scale(1,1) translate(0);
+   transform:scale(1,1) translate(0);
+   visibility:visible;
+   -moz-transition:all .3s ease;
+   -ms-transition:all .3s ease;
+   transition:all .3s ease;
+   -o-transition:none;
+   -webkit-transition:none;
+   margin:30px 0 0 30px;
+}
+.login-layout .widget-box {
+   border-bottom:0;
+   box-shadow:none;
+   padding:6px;
+   background-color:#fff
+}
+.login-layout .widget-box .widget-main {
+   background:#fff
+}
+.login-layout .widget-box .widget-main form {
+   margin:0
+}
+.login-layout .widget-box .widget-body .toolbar>div>a {
+   font-size:15px;
+   font-weight:400;
+}
+#login-box .forgot-password-link {
+   color:#FE9
+}
+#login-box .user-signup-link {
+   margin-left: 0;
+   color:#fff;
+   text-shadow: 0 -1px 0 rgba(0,0,0,0.25)!important;
+}
+/* 设置头部背景宽度高度和最小宽度 */
+#headDiv{
+	background-image:url(../images/home_page_background.jpg);
+	position:absolute;
+	top:0px;	
+    width:100%;
+    height: 100px;
+    min-width: 1300px;
+}
+/* 设置logo的位置和浮动 */
+#headDiv .logo{
+	margin-left:26px;
+	margin-top:22px;
+	margin-bottom:18px;
+	float:left;
+}
+/* 设置ul的位置和浮动 */
+#headDiv #menu{
+	margin-left:35px;
+	float:left;
+}
+/* 设置li文字水平垂直居中 */
+#headDiv #menu li{
+	float:left;
+	text-align: center;
+	line-height:78px;
+}
+/* 设置a链接为块，高度宽度样式 */
+#headDiv #menu li a{
+	display: block;
+	height:78px;
+	width: 89px;
+	outline:none;
+	color:#ffffff;	
+	text-decoration:none;
+	cursor:pointer;
+}
+
+/* 设置链接访问之后的样式 */
+#headDiv #menu li a:visited{
+	background-color:#344c68;
+}
+/* 设置链接hover时的背景和鼠标样式 */
+#headDiv #menu li a:hover,#headDiv #menu li a.menu_change{
+	background-image:url(../images/tophover_bg.jpg);	
+}
+/**设置LOGO位置**/
+#logoa{
+	margin-top:13px;
+	margin-left:30px;
+	with:auto;
+	display:inline-block;
+	float:left;
+}
+.logo1{
+	margin-right:20px;
+}
+.logo3{
+	margin:3px 30px 0 20px;
+}
+/*******设置个人信息栏的样式*********/
+/* 设置信息栏的位置背景色，透明 */
+#divselect {
+	position:relative;
+  	float:right;
+  	margin-top:15px;
+  	margin-right:1.5%;
+	width: 240px;
+	height:50px;
+	border-radius: 5px;	
+	z-index:2;	
+}
+#currentOpa{
+	opacity:0.5;
+	filter:alpha(Opacity=50);-moz-opacity:0.5;opacity: 0.5;/*设置50%半透明;*/
+	background-color:#000000;
+	border-radius: 5px;	
+	background-image: url(../images/ren.png);
+	background-repeat:no-repeat;
+	background-position:6% 50%;
+}
+/* 设置个人邮箱的位置背景 */
+#divselect cite {
+	height: 50px;
+	display: block;
+	color: #fff;
+	cursor: pointer;
+	padding-left:50px;	
+	background: url(../images/triangle.png) no-repeat 90% 52%;	
+	padding-top:5px;
+}
+#divselect cite li{
+	 width:150px;
+	 white-space:nowrap;
+	 overflow:hidden; 
+	 text-overflow:ellipsis;
+	 font-size: 12px;
+}
+#divselect cite li:first{
+	 	 
+}
+/* 设置个人信息下拉框 */
+#divselect ul {
+	margin-left:0px;
+	width: 240px;
+	display:none;
+	
+}
+#divselect ul li {
+	background-color:#344c67;
+	text-align: center;
+	border-bottom:solid #5c728a 1px;
+	border-radius: 3px;
+	width: 240px;
+}
+
+#divselect ul li a {
+	display: block;
+	height: 30px;
+	line-height:30px;
+	color: #fff;
+	font-size: 12px;
+}
+#divselect ul li a:hover {
+	background-color: #5b728a;
+	border-radius: 3px;
+}
+
+/* 设置页面内容的位置宽度高度背景色和圆角 */
+#pagecontent{
+	position:relative;	
+	margin-left: auto;
+	margin-right: auto;
+	margin-top:78px; 
+	width:97%;
+	height:auto;
+	background-color:#ffffff;
+	border-radius:5px;
+	min-width: 1300px;
+	border:1px solid #e5e5e5;
+	border-top:none;
+} 
+
+#content{
+	padding:20px;
+}
+/* 切换页面 */
+#selectBar a{
+	float:left;	
+	width: 78px;
+	border-bottom: 2px solid #f4f5f7;
+	color: #4c637b;
+	text-align:center;
+	padding-bottom:10px;
+	text-decoration: none;
+}
+
+#selectBar a:hover{
+	border-bottom: 2px solid #36aeea;
+	color: #36aeea;
+}
+
+#selectBar a.selectBar_all{
+	border-bottom: 2px solid #36aeea;
+}
+
+#navDiv,#dashboard_top_advertiser,#myform,#dashboard_diagram{
+	clear:both;
+}
+
+#navDiv ul#navDiv_ul li{
+	float:left;
+}
+
+#dashboard_top_advertiser{
+	width:100%;
+	padding-top:20px;
+}
+
+#dashboard_top_advertiser #left{
+	float:left;
+	width:60%;
+	height:200px;
+}
+
+#dashboard_top_advertiser #right{
+	float:left;
+	width:38.3%;
+	height:200px;
+	margin-left:20px;
+}
+
+#dashboard_top_advertiser .up{
+	height:50px;
+	line-height:50px;
+	width:100%;
+	border:1px solid #d5dee8;
+	border-bottom:none;
+}
+#dashboard_top_advertiser .up span{
+	height:34px;
+	line-height:34px;
+	padding-left:20px;
+}
+
+#dashboard_top_advertiser .down{
+	width:100%;
+	height:140px;
+	line-height:140px;
+	border:1px solid #d5dee8;
+}
+
+#dashboard_top_advertiser #left .up ul#main_advertiserul{
+	float:right;
+	margin:8px 20px 0 0;
+}
+
+#dashboard_chartContent .chart-up .son_ul{
+	margin-top:35px;
+}
+
+#dashboard_top_advertiser #left .dataFrame{
+	float:left;
+	width:30%;
+	height:118px;
+	border:1px solid #d5dee8;
+	margin:10px 8px;
+	border-radius:5px;
+}
+
+#dashboard_top_advertiser #left .dataFrame:hover{
+	background-color:#36aeea;
+	color:#fff;
+}
+
+#dashboard_top_advertiser #left .down #exposure{
+	margin-left:19px;
+}
+
+#dashboard_top_advertiser #left .dataFrame .dataFrame_name{
+	height:35px;
+	line-height:35px;
+	border-bottom:1px solid #d5dee8;
+	padding:0 20px;
+}
+
+#dashboard_top_advertiser #left .dataFrame .dataFrame_name i{
+	float:right;
+}
+
+#dashboard_top_advertiser #left .dataFrame .dataFrame_data{
+	width:100%;
+	height:82px;
+	text-align:center;
+	line-height:82px;
+}
+
+#dashboard_top_advertiser #right .down ul#main_advertiserul2{
+	margin:54px 20px 0 20px;
+}
+
+.btn1{
+	height:34px;
+	line-height:34px;
+	width:150px;
+	border-radius:5px;
+	font-size:12px;
+	color:#ffffff;
+	border:none;
+    background-color:#36aeea;
+}
+
+#diagramHead{
+	width:303px;
+	margin:auto;
+	height:34px;
+	border-bottom:1px solid #d5dee8;
+	padding-top:15px;
+}
+
+#diagramHead span{
+	float:left;
+	width:150px;
+	height:34px;
+	line-height:34px;
+	text-align:center;
+	cursor:pointer;
+	background-color: white;
+	
+}
+#diagramHead span:first-child{
+	border-left:1px solid #d5dee8;
+	border-top:1px solid #d5dee8;
+	border-bottom:1px solid #ffffff;
+	position: absolute;
+}
+#diagramHead span:last-child{
+	border:1px solid #d5dee8;
+	border-bottom:none;
+	position: absolute;
+	margin-left:150px;
+}
+
+#dashboard_chartContent{
+	width:100%;
+	height:500px;
+}
+
+#dashboard_chartContent .chart-up{
+	height:66px;
+	border:1px solid #d5dee8;
+}
+
+#dashboard_chartContent .chart-up .pull-down,#dashboard_chartContent .chart-up .time-period{
+	height:50px;
+	margin-top:20px important!;
+	float:left;
+	line-height:66px;
+}
+
+#dashboard_chartContent .chart-up .pull-down ul#main_advertiserul3{
+	margin-top:16px;
+}
+
+#dashboard_chartContent .chart-up .pull-down span{
+	float:left;
+	width:80px;
+}
+
+#dashboard_chartContent .chart-up .time-period span{
+	width:95px;
+}
+
+#dashboard_chartContent .chart-up .right{
+	margin:10px 20px 0 0;
+	float:right;
+	line-height:25px;
+}
+
+#dashboard_chartContent .chart-up .right span.time{
+	margin-left:12px;
+	color:#344c67;
+	cursor:pointer;
+}
+
+#dashboard_chartContent .chart-up .right span.time:nth-child(2){
+	color:#36aeea;
+}
+
+#dashboard_chartContent .chart-up .right #right_radio span{
+	margin-left:12px;
+}
+
+#dashboard_chartContent .chart-up .right #right_radio input[type='radio']{
+	margin-top:-4px;
+}
+
+#dashboard_chartContent .chart-down{
+	position:relative;
+	border-bottom:1px solid #d5dee8;
+	border-left:1px solid #d5dee8;
+	border-right:1px solid #d5dee8;
+	border-top:none;
+	padding-top:20px;
+	width:99.9%;
+}
+
+/*瓒嬪娍鍥撅細GM*/
+#dashboard_chartContent .chart-down-left{
+	margin-left:20px;
+	margin-bottom:10px;
+}
+/*娑堣垂 (鍏�*/
+#dashboard_chartContent .chart-down-right{
+	position:absolute;
+	top:20px;
+	right:20px;
+}
+
+/* 浠ヤ笅鏄〃鏍肩殑璁剧疆 */
+#sheetContent{
+	display:none;
+	border-top:1px solid #d5dee8;
+	border-bottom:1px solid #d5dee8;
+	border-left:1px solid #d5dee8;
+	border-right:1px solid #d5dee8;
+	padding:0 20px 70px; 
+}
+
+#content_choose{
+	width:100%;
+	height:35px;
+	line-height:35px;
+	margin:10px 0;
+}
+
+#content_choose ul,#content_choose span#dateChoose_span,#dashboard_top_advertiser ul,#dashboard_chartContent .chart-up .pull-down ul{
+	float:left;
+}
+
+#content_choose ul{
+	margin-right:20px;
+	z-index:9999;
+}
+
+#content_choose ul .select_box, #dashboard_top_advertiser ul .select_box,#dashboard_chartContent .chart-up .pull-down ul .select_box{
+	width:150px;
+	height:35px;
+	background:#F3F3F3 url(../images/triangle.png) no-repeat 130px;
+	border:none;
+	border-radius:5px!important;
+	cursor: pointer;
+}
+
+#dashboard_top_advertiser #left ul .select_box span{
+	margin-left:0px;
+	display:block; 
+	line-height:35px; 
+	height:35px;
+	overflow:hidden;
+	font-size:12px;
+}
+
+#content_choose ul .select_box span,#dashboard_top_advertiser #right ul .select_box span,#dashboard_chartContent .chart-up .pull-down ul .select_box span{
+	display:block; 
+	line-height:35px; 
+	height:35px;
+	overflow:hidden;
+	margin-left:20px;
+	font-size:12px;
+}
+	
+#content_choose ul .son_ul, #dashboard_top_advertiser ul .son_ul,#dashboard_chartContent .chart-up .pull-down ul .son_ul{
+	width:150px;
+	color:white;
+	background-color:#151E2B!important;
+	border-radius:5px!important;
+	position: absolute;
+	z-index:9;
+}
+
+#content_choose ul .son_ul li, #dashboard_top_advertiser ul .son_ul li,#dashboard_chartContent .chart-up .pull-down ul .son_ul li{
+	padding-left:20px; 
+	height:35px;
+	line-height:35px; 
+	border-radius:5px!important;
+	font-size:12px;
+}
+
+#content_choose ul .son_ul li:hover, #dashboard_top_advertiser ul .son_ul li:hover,#dashboard_chartContent .chart-up .pull-down ul .son_ul li:hover{
+	background-color:#26303A!important;
+}
+
+#content_choose span#dateChoose_span{
+	margin:0 5px 0 -5px;
+}
+
+#content_choose span#dateChoose_span a{
+	margin:5px;
+	cursor: pointer;
+	color:#36aeea;
+}
+
+#content_choose span#dateChoose_span a.dateChange{
+	color:#344c67;
+}
+
+span#calendar_span i{
+	position: absolute;
+	margin-left:5px;
+}
+
+span#calendar_span input[type="text"]{
+	padding-left:20px;
+	font-size: 12px;
+    margin-top: 6px;
+    padding: 0 0 0 25px;
+    width:165px;
+}
+
+#btn_formSubmit{
+	font-size:12px; 
+	background:#36aeea none repeat scroll 0 0;
+	border-radius: 5px;
+	border:1px solid ;
+	color: #fff;
+	cursor: pointer;
+	height: 22px;
+    line-height: 22px;
+    margin: 6px 0 0 10px;
+	position: absolute;
+	width:90px;
+}
+
+#content_dataFrame{
+	height:150px;
+}
+
+#content_dataFrame .dataFrame_style,#content_dataFrame .dataFrame_last_style{
+	float:left;
+	width:19.2%;
+	height:150px;
+	color: #4c637b;
+	font-size: 17px;
+	cursor: pointer;
+	border:1px solid #d5dee8;
+	border-radius:5px;
+}
+
+#content_dataFrame .dataFrame_change{
+	color: #ffffff;
+	background-color:#36aeea;
+}
+
+#content_dataFrame .dataFrame_style{
+	margin-right:10px;
+}
+
+#content_dataFrame .dataFrame_name{
+	height:46px;
+	line-height:46px;
+	border-bottom:1px solid #d5dee8;
+	padding-left:20px;
+}
+
+#content_dataFrame .dataFrame_data{
+	height:103px;
+	line-height:103px;
+	text-align: center;
+	font-size: 23px;
+	font-weight:bold;
+}
+
+#chartDivs{
+	margin-top:20px;
+	width: 99.8%;
+	z-index:9999;
+	border:1px solid #d4d9df;
+	overflow:visible;
+	height:auto;
+}
+
+#chartDivs div.linechart{
+	min-width: 84%;
+	height: 325px;
+	margin: 0 auto;
+}
+#hourrpt {
+    height: 0;
+    overflow: hidden;
+    width: 90%;
+}
+
+table.tableFig{
+	margin-top:20px;
+	width:100%;
+}
+
+table.tableFig,table.tableFig th,table.tableFig td{
+	border:thin solid #b9c5d9;
+}
+
+table.tableFig th{
+	height:80px;
+	border:none;
+	background-color: #F2F6FA;
+}
+
+table.tableFig td{
+	height:60px;
+	border:none;
+	border-top:thin solid #b9c5d9;
+}
+
+table.tableFig td.tbodyTd{
+	text-align: center;
+}
+
+table.tableFig tr:hover{
+	background-color: #F2F6FA;
+}
+
+#exportReport{
+	margin-top:20px;
+}
+
+#exportReport .btn_export{
+	display:block;
+	border-radius:5px 5px 5px 5px;
+	border:none;
+	line-height:34px;
+	width:170px;
+	height:34px;
+	color:white;
+	background:#68ba31;
+	text-align:center;
+	cursor: pointer;
+	text-decoration: none;
+}
+
+#exportReport .btn_export:hover{  
+	background:#4c637b;
+	text-decoration: none;
+	color:white;
+}
+
+#pageDiv{
+	float:right;
+	margin-top: -55px;
+}
+
+#dashboard_pageDiv{
+	float:right;
+}
+
+#pageDiv li.active a,#dashboard_pageDiv li.active a{
+	color:#ffffff;
+	background-color:#0170C9!important;
+}

src/main/webapp/assets/css/zbchj.css

@@ -15,10 +15,6 @@
  	margin-top:60px;
 	margin-left:54px; 
 }
-span{
-	color:#4c637b;
-	
-}
 .nav li a span{
 	color:#ffffff;
 }