修改页面问题

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

@@ -1,4 +1,5 @@
 <@override name="head">
+<#assign sec=JspTaglibs["http://www.springframework.org/security/tags"]>
 <title>广告投放系统</title>
 <!--Include Required css file-->
 <link rel="stylesheet" href="${ctx}/assets/css/daterangepicker.css"/>
@@ -17,9 +18,12 @@
 
 <script type="text/javascript">
 $(document).ready(function(){
-	//显示今天时间
-	var date = new Date();	
-	$("#today").text(formatDate(date));
+	//定时器每秒调用一次当前时间()
+	setInterval(function(){
+		var date = new Date();
+		$("#today").text(formatDate(date));
+	},1000);
+	
 	function formatDate(now)   {   
 		var year = now.getFullYear();   
 		var month = now.getMonth()+1;   
@@ -321,26 +325,29 @@ $(document).ready(function(){
 	*根据广告主id创建订单
 	*/
 	$('#right button.btn1').click(function(){
-		var advertiserId = null;
-		//判断是广告主还是代理商
-		if(role == "advertiser"){
-			advertiserId = $("#sessionadvertiserId").val();
-		} else {
-			advertiserId = $('#selectedAdvertiserId2').val();
-		}
-		//如果没有选择广告主,弹出提示
-		if((advertiserId == -1) || (advertiserId == null) || (advertiserId == "")){
-			bootbox.alert('请选择广告主');
-		} else {
-			var _href = $(this).attr('href') + '?advertiserId=' + advertiserId;
-			window.location.assign(_href);
+		if($("#isShowRight").val() == "0"){
+			var advertiserId = null;
+			//判断是广告主还是代理商
+			if(role == "advertiser"){
+				advertiserId = $("#sessionadvertiserId").val();
+			} else {
+				advertiserId = $('#selectedAdvertiserId2').val();
+			}
+			//如果没有选择广告主,弹出提示
+			if((advertiserId == -1) || (advertiserId == null) || (advertiserId == "")){
+				bootbox.alert('请选择广告主');
+			} else {
+				var _href = $(this).attr('href') + '?advertiserId=' + advertiserId;
+				window.location.assign(_href);
+			}
+		}else{
+			bootbox.alert('您没有创建订单的权限！');
 		}
 	});
 	
 	$("ul#advertiser_son_ul2 li").live("click",function(){
 	 	$(this).parents('li').find('span').html($(this).html());
 		$("#selectedAdvertiserId2").val($(this).attr("value"));
-		$("#selectedAdvertiserName2").val($(this).html());
 		$('#advertiser_son_ul2').hide(); //ul隐藏
 	});
 	
@@ -356,19 +363,15 @@ $(document).ready(function(){
 	}else if($("#role").val() == "advertiser"){
 		$("#advertiserul_span").html($("#sessionadvertiserName").val());
 		$("#selectedAdvertiserId").val($("#sessionadvertiserId").val());
-		$("#selectedAdvertiserName").val($("#sessionadvertiserName").val());
 		$("#advertiserul_span2").html($("#sessionadvertiserName").val());
 		$("#selectedAdvertiserId2").val($("#sessionadvertiserId").val());
-		$("#selectedAdvertiserName2").val($("#sessionadvertiserName").val());
 		$("#advertiserul_span3").html($("#sessionadvertiserName").val());
 		$("#selectedAdvertiserId3").val($("#sessionadvertiserId").val());
-		$("#selectedAdvertiserName3").val($("#sessionadvertiserName").val());
 	}
 	
 	$("ul#advertiser_son_ul li").live("click",function(){
 	 	$(this).parents('li').find('span').html($(this).html());
 		$("#selectedAdvertiserId").val($(this).attr("value"));
-		$("#selectedAdvertiserName").val($(this).html());
 		$('#advertiser_son_ul').hide(); //ul隐藏
 		var agentId = $("#agentId").val(); //获取代理商id
 		var advertiserId = $('#selectedAdvertiserId').val();
@@ -391,9 +394,9 @@ $(document).ready(function(){
 			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);
+				$('#accountBalance .dataFrame_data').text(data.balance);
+				$('#exposure .dataFrame_data').text(data.totalImpression);
+				$('#click .dataFrame_data').text(data.totalClick);
 			},
 			error : function (XMLHttpRequest, textStatus, errorThrown) { //url请求出错的回调函数
 				console.info('error');
@@ -404,7 +407,6 @@ $(document).ready(function(){
 	$("ul#advertiser_son_ul3 li").live("click",function(){
 	 	$(this).parents('li').find('span').html($(this).html());
 		$("#selectedAdvertiserId3").val($(this).attr("value"));
-		$("#selectedAdvertiserName3").val($(this).html());
 		$('#advertiser_son_ul3').hide(); //ul隐藏
 		$('#dashboard_chartContent .chart-down .chart-down-left').html("趋势图："+$(this).html());
 		var chooseDate = $('#dateRangePicker').val().split(' to ',2);
@@ -421,14 +423,27 @@ $(document).ready(function(){
 				$("#"+target_sonulId).append('<li class="selectop" value='+ val.value +'>' + val.label + '</li>');
 			});
 		});
-		$("#"+target_spanId).on("click",function(){
-	 		if($("#role").val() == "agent"){
-	 			if($('#'+target_sonulId).height()>210){
-	 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
-	 			};
-	 			$('#'+target_sonulId).show(); //ul显示
-	 		}
-	 	});
+		if($("#isShowRight").val() == "0"){
+			$("#"+target_spanId).on("click",function(){
+		 		if($("#role").val() == "agent"){
+		 			if($('#'+target_sonulId).height()>210){
+		 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
+		 			};
+		 			$('#'+target_sonulId).show(); //ul显示
+		 		}
+		 	});
+		}else{
+			if(target_spanId != "advertiserul_span2"){
+				$("#"+target_spanId).on("click",function(){
+			 		if($("#role").val() == "agent"){
+			 			if($('#'+target_sonulId).height()>210){
+			 				$('#'+target_sonulId).css({"height":"210px","overflow-y":"scroll","overflow-x":"hidden","z-index":"9999" });
+			 			};
+			 			$('#'+target_sonulId).show(); //ul显示
+			 		}
+			 	});
+			}
+		}
 		$("#"+target_boxId).mouseleave(function(){
 	 		$('#'+target_sonulId).hide(); //ul隐藏
 	 	});
@@ -452,12 +467,11 @@ $(document).ready(function(){
 					<span id="today"></span>
 					<ul id="main_advertiserul">
 						<li class="select_box" id="advertiserul_box">
-							<span id="advertiserul_span">${selectedadvertiserName!}</span>
+							<span id="advertiserul_span">全部广告主</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" class="dataFrame">
@@ -488,17 +502,19 @@ $(document).ready(function(){
 					</div>
 				</div>
  			</div>
+ 			<@sec.authorize access="hasAnyRole('ROLE_agent_adgroup,ROLE_MANAGER')">
+ 				<input type="hidden" id="isShowRight" value="0"/>
+ 			</@sec.authorize>
  			<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>
+							<span id="advertiserul_span2">请选择广告主</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 class="btn1" href='${ctx}/advertiser/main/ad/order/create'>创建新的订单</button>
 				</div>
  			</div>
@@ -514,12 +530,11 @@ $(document).ready(function(){
 						<span class="span">选择广告主</span>
 						<ul id="main_advertiserul3">
 							<li class="select_box" id="advertiserul_box3">
-								<span id="advertiserul_span3">${selectedadvertiserName3!}</span>
+								<span id="advertiserul_span3">请选择广告主</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>

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

@@ -1,4 +1,4 @@
-<table border="1" class="tableFig">
+<table border="1" class="tableFig" id="dashboard_table">
 	<thead>
 		<tr>
 			<th>广告主名称</th>

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

@@ -10,21 +10,27 @@
 		
 		<@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>
 		
 		<@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>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_audit,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/audit/audit-banner"><span>审核</span></a></li>
+		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_finance,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/finance/finance-management"><span>财务管理</span></a></li>
+		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_client_account,ROLE_MANAGER')">
 		<li><a href="${ctx}/back/main/client-account"><span>客户账号管理</span></a></li>
+		</@sec.authorize>
 		
 		<@sec.authorize access="hasAnyRole('ROLE_back_authority,ROLE_MANAGER')">
-		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>  			
+		<li><a href="${ctx}/back/main/authority"><span>权限管理</span></a></li>  	
+		</@sec.authorize>		
 	</ul>	
 	<div id="divselect" >
 	        <div id="opa">

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

@@ -482,7 +482,12 @@ body.login-layout:before {
 	border-bottom:1px solid #d5dee8;
 	border-left:1px solid #d5dee8;
 	border-right:1px solid #d5dee8;
-	padding:0 20px 70px; 
+	padding-bottom:70px; 
+}
+
+#dashboard_table{
+	width:97%;
+	margin-left:20px;
 }
 
 #content_choose{
@@ -709,6 +714,7 @@ table.tableFig tr:hover{
 
 #dashboard_pageDiv{
 	float:right;
+	margin-right: 20px;
 }
 
 #pageDiv li.active a,#dashboard_pageDiv li.active a{