Browse Source

热点管理修改,用户场景定义字体修改,客户账号复选框显示问题修改(back,operator)

bao.zhang 9 years ago
parent
commit
5666facbe1

+ 1 - 1
src/main/webapp/WEB-INF/pages/back/main/ap/ap_head.ftl

@@ -26,7 +26,7 @@
  
  
  <div id="selectBar">
  <div id="selectBar">
 				<a  href="${ctx}/back/main/ap/apmac/list">热点管理</a>
 				<a  href="${ctx}/back/main/ap/apmac/list">热点管理</a>
-				<a href="${ctx}/back/main/ap/place/create">新增数聚场景</a>
+				<a href="${ctx}/back/main/ap/place/unclassfiedPlaceName">新增数聚场景</a>
 				<a href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
 				<a href="${ctx}/back/main/ap/place/place-sort">用户场景定义</a>
 				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
 				<a href="${ctx}/back/main/ap/apmac/relationship">场景对应关系</a>
 </div>
 </div>

+ 12 - 12
src/main/webapp/WEB-INF/pages/back/main/ap/place/place-sort.ftl

@@ -20,34 +20,34 @@
     <#include "/back/main/ap/ap_head.ftl">
     <#include "/back/main/ap/ap_head.ftl">
 		<div id="handler">
 		<div id="handler">
 			<ul>
 			<ul>
-				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
+				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/back/main/dashboard">首页</a>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/operator/main/ap/apmac/list">热点详情</a></li>
+				<li class="size2"><a href="${ctx}/back/main/ap/apmac/list">热点管理</a></li>
 				<span class="divider2"><i class="icon-angle-right"></i></span>
 				<span class="divider2"><i class="icon-angle-right"></i></span>
 				<li class="size3">用户场景定义</li>
 				<li class="size3">用户场景定义</li>
 			</ul>  
 			</ul>  
 		</div>
 		</div>
 		<div id="content">
 		<div id="content">
 			<div id="user_classify">		
 			<div id="user_classify">		
-				<div id="user_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;border:1px solid #d5dee8;color:#4c637b;">	
+				<div id="user_fronttitle" style="width:97.4%;padding-left:20px;height:40px;line-height:40px;font-weight:bold;border:1px solid #d5dee8;color:#4c637b;">	
 				用户场景分类
 				用户场景分类
 				</div>
 				</div>
 				<div id="user_bottom" style="width:99%;">	
 				<div id="user_bottom" style="width:99%;">	
 				     <div id="user_bottom_left" style="float:left;width:50%;height:600px;border-left:1px solid #d5dee8;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
 				     <div id="user_bottom_left" style="float:left;width:50%;height:600px;border-left:1px solid #d5dee8;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
 					     	
 					     	
-					     	<div id="user_bottom_lefttext" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none;font-weight:bold;font-size:20px;padding:20px 0px 0px 20px;">	
+					     	<div id="user_bottom_lefttext" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
 						     	待分类媒体场景
 						     	待分类媒体场景
 							</div>
 							</div>
 							
 							
 							<div id="user_bottom_leftsearch" style="float:right;width:45%;border:none;">	
 							<div id="user_bottom_leftsearch" style="float:right;width:45%;border:none;">	
 						     	<input type="text"  id="userplace_search_text"  onkeydown="if(event.keyCode==13){return false;}" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
 						     	<input type="text"  id="userplace_search_text"  onkeydown="if(event.keyCode==13){return false;}" style="width:170px;height:20px;margin:20px 0px 0px 20px;border:1px solid #d5dee8;">
-						     	<button type="submit" id="userplace_search" style="width:50px;height:30px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">搜索</button>
+						     	<button type="submit" id="userplace_search" style="width:50px;height:22px;font-size:14px;margin:20px 0px 0px 5px;border-radius:5px;color:#ffffff;border:1px solid #d5dee8;background-color:#36aeea;">搜索</button>
 							</div>
 							</div>
 							
 							
 							<div id="user_datalist" style="margin-top:75px;">	
 							<div id="user_datalist" style="margin-top:75px;">	
 						     	<#if placeOperatorList ??>
 						     	<#if placeOperatorList ??>
 								<#list placeOperatorList as placeoperator>
 								<#list placeOperatorList as placeoperator>
-								<li id="${placeoperator.id!}" class="placoperator_name" style="margin-top:20px;margin-left:20px;font-weight:bold;cursor:pointer;font-size:20px;color:#4c637b;">
+								<li id="${placeoperator.id!}" class="placoperator_name" style="margin-top:6px;margin-left:20px; cursor:pointer;font-size:14px;color:#4c637b;">
 								<input type="checkbox" class="unclassify" id="${placeoperator.name!}&${placeoperator.id!}" style="float:left;">&nbsp;&nbsp;${placeoperator.name!}</li>
 								<input type="checkbox" class="unclassify" id="${placeoperator.name!}&${placeoperator.id!}" style="float:left;">&nbsp;&nbsp;${placeoperator.name!}</li>
 								</#list>
 								</#list>
 								</#if>
 								</#if>
@@ -61,20 +61,20 @@
 					 </div>
 					 </div>
 					 
 					 
 					<div id="user_bottom_right1" style="float:left;width:24.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
 					<div id="user_bottom_right1" style="float:left;width:24.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-						 <div id="user_bottom_right1text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none;font-weight:bold;font-size:20px;padding:20px 0px 0px 20px;">	
+						 <div id="user_bottom_right1text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
 						        已选择媒体分类
 						        已选择媒体分类
 						 </div> 
 						 </div> 
-						 <div id="user_bottom_right1detail" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none;font-weight:bold;font-size:20px;padding:20px 0px 0px 20px;">	
+						 <div id="user_bottom_right1detail" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
 						        
 						        
 						 </div>  
 						 </div>  
 						 
 						 
 					</div>
 					</div>
 					<div id="user_bottom_right2" style="float:right;width:23.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
 					<div id="user_bottom_right2" style="float:right;width:23.7%;height:600px;border-bottom:1px solid #d5dee8;border-right:1px solid #d5dee8;">	
-						 <div id="user_bottom_right2text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none;font-weight:bold;font-size:20px;padding:20px 0px 0px 20px;">	
+						 <div id="user_bottom_right2text" style="float:left;width:50%;height:30px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
 						        数聚媒体场景
 						        数聚媒体场景
 						 </div> 
 						 </div> 
 						  
 						  
-						 <div id="user_bottom_right2detail" style=" margin-top:15px;overflow:scroll;float:left;width:93%;height:400px;line-height:30px;color:#4c637b;border:none;font-weight:bold;font-size:20px;padding:20px 0px 0px 20px;">	
+						 <div id="user_bottom_right2detail" style=" margin-top:15px;overflow:scroll;float:left;width:93%;height:400px;line-height:30px;color:#4c637b;border:none; font-size:14px;padding:20px 0px 0px 20px;">	
 						 </div> 
 						 </div> 
 						 
 						 
 						 <button class="user_bottom_right2submit" style="width:100px;height:30px;border:none;background-color:#36aeea;color:#ffffff;margin-bottom:-1046px;margin-left:20px;border-radius:5px;">提交</button>
 						 <button class="user_bottom_right2submit" style="width:100px;height:30px;border:none;background-color:#36aeea;color:#ffffff;margin-bottom:-1046px;margin-left:20px;border-radius:5px;">提交</button>
@@ -134,7 +134,7 @@ $(".user_bottom_right2submit").click(function(){
 		$.getJSON(url, function(data) {
 		$.getJSON(url, function(data) {
 				var data_1 = data;
 				var data_1 = data;
 				$.each( data_1, function( key, val ) {
 				$.each( data_1, function( key, val ) {
-	 				$("#user_bottom_right2detail").append('<li style="font-size:20px;font-weight:bold;color:#4c637b;margin-top:20px;" id='+val.id+'><input name="media_place"  type="radio" style="float:left;" id='+val.id+'>&nbsp;&nbsp;'+val.name+'</li>');
+	 				$("#user_bottom_right2detail").append('<li style="font-size:14px; color:#4c637b;margin-top:20px;" id='+val.id+'><input name="media_place"  type="radio" style="float:left;" id='+val.id+'>&nbsp;&nbsp;'+val.name+'</li>');
 	 			});
 	 			});
 		})	
 		})	
 //点击复选框在右边显示或隐藏未分类场景
 //点击复选框在右边显示或隐藏未分类场景
@@ -143,7 +143,7 @@ $(".user_bottom_right2submit").click(function(){
 		//alert(input_status);
 		//alert(input_status);
 		if(input_status=="checked"){
 		if(input_status=="checked"){
 			var n = $(this).attr("id").split("&");
 			var n = $(this).attr("id").split("&");
-			$("#user_bottom_right1detail").append('<li style="padding-left:20px;margin-top:20px;font-size:20px;font-weight:bold;color:#4c637b;" id=checked'+n[1]+'>'+n[0]+'</li>');
+			$("#user_bottom_right1detail").append('<li style="padding-left:2px;margin-top:5px;font-size:14px; color:#4c637b;" id=checked'+n[1]+'>'+n[0]+'</li>');
 		}else{
 		}else{
 			var n = $(this).attr("id").split("&");
 			var n = $(this).attr("id").split("&");
 			var id_checked = "#checked"+n[1];
 			var id_checked = "#checked"+n[1];

+ 2 - 2
src/main/webapp/WEB-INF/pages/back/main/client-account/createcorrelation.ftl

@@ -118,7 +118,7 @@
 			  			<ul id="main_operatorListUl">
 			  			<ul id="main_operatorListUl">
 						<li class="select_box" id="operatorListUl_box" style="margin-right: 85px;">
 						<li class="select_box" id="operatorListUl_box" style="margin-right: 85px;">
 							<span id="operatorListUl_span">${operatorName!}</span>
 							<span id="operatorListUl_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_operatorListUl"></ul>
+							<ul class="son_ul" id="son_operatorListUl" style="z-index: 9999;position:absolute;margin: 0 0 0 157px;"></ul>
 						</li>
 						</li>
 						</ul>
 						</ul>
 						
 						
@@ -128,7 +128,7 @@
 			  			<ul id="main_agent">
 			  			<ul id="main_agent">
 						<li class="select_box" id="agent_box" style="margin-right: 85px;">
 						<li class="select_box" id="agent_box" style="margin-right: 85px;">
 							<span id="agent_span">${operatorName!}</span>
 							<span id="agent_span">${operatorName!}</span>
-							<ul class="son_ul" id="son_agent"></ul>
+							<ul class="son_ul" id="son_agent" style="z-index: 9999;position:absolute;margin: 0 0 0 490px;"></ul>
 						</li>
 						</li>
 						</ul>
 						</ul>
 						
 						

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

@@ -162,7 +162,7 @@
 						<thead>
 						<thead>
 							<tr>
 							<tr>
 								<th width="5%">
 								<th width="5%">
-									<label><input type="checkbox" class="input_checkbox"><span class="lbl"></span></label>
+									<label><input type="checkbox" style=" opacity: 1;" class="input_checkbox"><span class="lbl"></span></label>
 								</th>
 								</th>
 								<th width="5%">ID</th>
 								<th width="5%">ID</th>
 								<th width="10%">账号</th>
 								<th width="10%">账号</th>
@@ -181,7 +181,7 @@
 						<#list clientAccountsList as account>
 						<#list clientAccountsList as account>
 							<tr class="">
 							<tr class="">
 								<td class="center">
 								<td class="center">
-									<label><input  autocomplete="off" type="checkbox" name="id" value="#{account.id}"><span class="lbl"></span></label>
+									<label><input  autocomplete="off" style=" opacity: 1;" type="checkbox" name="id" value="#{account.id}"><span class="lbl"></span></label>
 								</td>
 								</td>
 								<td class="breakword">${account.id!}</td>
 								<td class="breakword">${account.id!}</td>
 								<td class="breakword">${account.accountName!}</td>
 								<td class="breakword">${account.accountName!}</td>

+ 43 - 0
src/main/webapp/WEB-INF/pages/operator/main/ap/ap_head.ftl

@@ -0,0 +1,43 @@
+ <style>
+#selectBar{
+	width:100%;
+	height:30px;
+	 padding: 20px 0 0 44px;
+}
+#selectBar a{
+	float:left;	
+	width: 110px;
+	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_change{
+	border-bottom: 2px solid #36aeea;
+}
+</style>
+ 
+ <div id="selectBar">
+				<a  href="${ctx}/operator/main/ap/apmac/list">热点管理</a>
+				<a href="${ctx}/operator/main/ap/apmac/relationship">场景对应关系</a>
+</div>
+<script type="text/javascript">
+	$(function(){
+		var path = window.location.pathname;
+		if(path.indexOf("list") != -1){
+			$("#selectBar a:first").css("border-bottom","2px solid #36aeea");
+		};
+		if(path.indexOf("relationship") != -1){
+			$("#selectBar a:eq(1)").css("border-bottom","2px solid #36aeea");
+		};
+		
+	});
+</script>
+

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

@@ -110,20 +110,19 @@
 <div id=content_bg>
 <div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
 	<#include "/operator/main/public-head.ftl">
     <div id= "pagecontent">
     <div id= "pagecontent">
-		<div id="handler">
+    
+    <#include "/operator/main/ap/ap_head.ftl">
+		<div id="handler" style=" margin-left: 18px;">
 			<ul>
 			<ul>
 				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
 				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2">热点管理</li>
+				<li class="size2" style="margin: 0 0 0 10px;">热点管理</li>
 			</ul>  
 			</ul>  
 		</div>
 		</div>
 		<div id="content">
 		<div id="content">
-			<div id="diagramHead">
-				<span>热点详情</span>
-				<span>场景对应关系</span>
-			</div>
+			
 			<div id="hotDetails">
 			<div id="hotDetails">
-				<form id="wifiForm" action="${ctx}/operator/main/ap/apmac/list" method="post">
+				<form style="margin: -32px 0 20px;" id="wifiForm" action="${ctx}/operator/main/ap/apmac/list" method="post">
 				  	<div id="buttons">
 				  	<div id="buttons">
 				  		<div id="btn-create" class="btn1">新建热点详情</div>      
 				  		<div id="btn-create" class="btn1">新建热点详情</div>      
 				        <div id="all-btn-enable" class="btn1">批量开启</div>  
 				        <div id="all-btn-enable" class="btn1">批量开启</div>  

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

@@ -51,20 +51,18 @@
 <div id=content_bg>
 <div id=content_bg>
 	<#include "/operator/main/public-head.ftl">
 	<#include "/operator/main/public-head.ftl">
     <div id= "pagecontent">
     <div id= "pagecontent">
-		<div id="handler">
+     <#include "/operator/main/ap/ap_head.ftl">
+		<div id="handler" style=" margin-left: 23px;">
 			<ul>
 			<ul>
 				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
 				<li class="size1"><i class="icon-home" style="background-image:none;margin-top:3px;"></i> <a href="${ctx}/operator/main/dashboard">首页</a>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
 				<span class="divider1"><i class="icon-angle-right"></i></span></li>
-				<li class="size2"><a href="${ctx}/operator/main/ap/apmac/list">热点管理</a></li>
+				<li class="size2" style="margin: 0 0 0 10px;"><a href="${ctx}/operator/main/ap/apmac/list">热点管理</a></li>
 				<span class="divider2" style="margin:0 0 0 10px;"><i class="icon-angle-right"></i></span>
 				<span class="divider2" style="margin:0 0 0 10px;"><i class="icon-angle-right"></i></span>
 				<li class="size3">场景对应关系</li>
 				<li class="size3">场景对应关系</li>
 			</ul>  
 			</ul>  
 		</div>
 		</div>
 		<div id="content">
 		<div id="content">
-			<div id="diagramHead">
-				<span>热点详情</span>
-				<span>场景对应关系</span>
-			</div>
+			
 			<div id="relationship">
 			<div id="relationship">
 				<form id="wifiForm" action="${ctx}/operator/main/ap/apmac/relationship" method="post">
 				<form id="wifiForm" action="${ctx}/operator/main/ap/apmac/relationship" method="post">
 				  	<div id="buttons">
 				  	<div id="buttons">
@@ -74,7 +72,7 @@
 							<input id="serachData_img" type="submit" value="" />
 							<input id="serachData_img" type="submit" value="" />
 						</div>
 						</div>
 				    </div>
 				    </div>
-					<div id="account-table" style="margin-top:0px;">
+					<div id="account-table" style=" margin-top: -59px;">
 						<table border="1" id="tablefig" style="width:30%;margin-left:1px;">
 						<table border="1" id="tablefig" style="width:30%;margin-left:1px;">
 							<thead>
 							<thead>
 								<tr>
 								<tr>