Browse Source

修改自用分组页面的问题

ying.rong 9 years ago
parent
commit
533fd7ce7b

+ 6 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other.ftl

@@ -0,0 +1,6 @@
+<#setting number_format="0">
+<div class="dataTables_paginate paging_bootstrap pagination">
+	<ul>
+		<#include "simple_other/pager_nav.ftl"/>
+	</ul>
+</div>

+ 6 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other/_next.ftl

@@ -0,0 +1,6 @@
+<#if (pager1.page < pager1.totalPage)>
+	<li class="next"><a ${href(pager1.page+1)}><i class="icon-double-angle-right"></i></a></li> 
+<#else>
+	<li class="next disabled"><a><i class="icon-double-angle-right"></i></a></li>
+</#if>
+<li ><span>共${pager1.totalPage!}页</span></li>

+ 15 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other/_page.ftl

@@ -0,0 +1,15 @@
+<#macro page page>
+	<#if (page == pager1.page)>    <#-->如果是当前页 <-->
+	    <li class="active"><a>${pager1.page}</a></li>
+	<#else>
+		<li><a ${href(page)}>${page}</a></li>
+	</#if>
+</#macro>
+    
+<#function link page>
+	<#return "#${page}"/>
+</#function>
+
+<#function href page>
+	<#return "href=\"${link(page)}\"" />
+</#function>

+ 1 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other/_points.ftl

@@ -0,0 +1 @@
+<li><a><i>...</i></a></li> 

+ 9 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other/_prev.ftl

@@ -0,0 +1,9 @@
+<#if pager1.page<=1>
+	<li class="prev disabled">
+		<a><i class="icon-double-angle-left"></i></a>
+	</li>
+<#else>
+	<li class="prev">
+		<a ${href(pager1.page-1)}><i class="icon-double-angle-left"></i></a>
+	</li>
+</#if>

+ 33 - 0
src/main/webapp/WEB-INF/pages/common/pagination/simple_other/pager_nav.ftl

@@ -0,0 +1,33 @@
+<#include "_page.ftl" />
+<#include "_prev.ftl" />
+<#if (pager1.totalPage < 1)>
+<#elseif (pager1.totalPage == 1)>
+	<@page page=1/>
+<#elseif (pager1.totalPage < 5)>
+	<#list 1..(pager1.totalPage) as pages>
+		<@page page=pages/>
+	</#list>
+<#else>
+	<#if (pager1.page <= 3)>
+	     <#list 1..(pager1.page+1) as pages>
+             <@page page=pages/>
+         </#list>
+         <#include "_points.ftl" />
+	     <@page page=pager1.totalPage/>
+	<#elseif  (pager1.page > 3 && pager1.page <(pager1.totalPage-2))>
+		 <@page page=1/>
+		 <#include "_points.ftl" />
+	 	 <#list (pager1.page-1)..(pager1.page+1) as pages>
+             <@page page=pages/>
+         </#list>
+	 	 <#include "_points.ftl" />
+	 	 <@page page=pager1.totalPage/>
+	<#elseif  (pager1.page >= pager1.totalPage-2)>
+		 	 <@page page=1/>
+		 	 <#include "_points.ftl" />
+		 	 <#list (pager1.page-1)..pager1.totalPage as pages>
+	             <@page page=pages/>
+	         </#list>
+	     </#if>
+ </#if>   
+<#include "_next.ftl" />

+ 5 - 4
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/create.ftl

@@ -26,9 +26,10 @@
 				</ul>  
  			</div>
  			<div id="groupDivs">
- 				<form id="groupForm" action="${ctx}/operator/main/ap/apgroup/queryGroupName" method="post">
+ 				<form id="groupForm" action="${ctx}/operator/main/ap/apgroup/create" method="post">
 		 			<div class="group_left">
-		 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
+		 				<input type="hidden" id="page1" name="page1" value="${pager1.page}"/>
+		 				<input type="hidden" id="groupName" name="name" value=""/>
 			 			<div class="input-group">
 							<input class="input-text" id="createApgroup" type="text" value="请填写新增分组名称"/>
 							<a id="btn-createApgroup" class="btn3" type="button">提交</a>
@@ -43,11 +44,11 @@
 							</#if>
 						</div>
 						<div class="groupPage">
-							<#include "/common/pagination/simple.ftl"/>
+							<#include "/common/pagination/simple_other.ftl"/>
 						</div>
 					</div>
 					<div class="group_right">
-						<input type="hidden" id="page1" name="page1" value="${pager1.page}"/>
+						<input type="hidden" id="page" name="page" value="${pager.page}"/>
 						<label class="group_label">当前分组名称:</label>
 						<div class="input-group">
 							<label class="input-label">分组MAC地址信息:</label>

+ 2 - 32
src/main/webapp/WEB-INF/pages/operator/main/ap/apgroup/edit.ftl

@@ -5,7 +5,7 @@
 <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/apApmacForDownList.js"></script>
-<script type="text/javascript" src="${ctx}/assets/js/operator/apApmac.js"></script>
+<script type="text/javascript" src="${ctx}/assets/js/operator/apApgroup.js"></script>
 </@override>
 <@override name="body">
 <div id=content_bg>
@@ -27,6 +27,7 @@
 				</ul>  
  			</div>
  			<form id="myform" action="${ctx}/operator/main/ap/apgroup/edit" method="post">
+ 				<input type="hidden" id="page" name="page" value="${pager.page}"/>
 				<div id="content_choose">
 					<ul id="main_cnul">
 						<li class="select_box" id="cnul_box">
@@ -87,37 +88,6 @@
 				<div class="group_bottom">
 					<label class="group_label">请选择分组</label>
 					<div class="chooseDiv">
-						<div class="single_radioDiv">
-							<input type="radio" id="aa1" value="1" name="name"/><label for="aa1">bb</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa2" value="2" name="name"/><label for="aa2">bb</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa3" value="3" name="name"/><label for="aa3">aa</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa4" value="4" name="name"/><label for="aa4">bb</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa5" value="5" name="name"/><label for="aa5">aa</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa6" value="6" name="name"/><label for="aa6">bb</label>
-						</div>
-						
-						<div class="single_radioDiv">
-							<input type="radio" id="aa7" value="7" name="name"/><label for="aa7">aa</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa8" value="8" name="name"/><label for="aa8">bb</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa9" value="9" name="name"/><label for="aa9">aa</label>
-						</div>
-						<div class="single_radioDiv">
-							<input type="radio" id="aa10" value="10" name="name"/><label for="aa10">bb</label>
-						</div>
 						<#if listGroupName ??>
 						<#list listGroupName as groupName>
 						<div class="single_radioDiv">

+ 13 - 3
src/main/webapp/assets/css/apmacManager.css

@@ -62,12 +62,18 @@
     height: 41px;
     line-height: 41px;
     text-align: center;
+    cursor: pointer;
+}
+
+.chooseDiv .single_chooseDiv label{
+	cursor: pointer;
 }
 
 .chooseDiv .single_chooseDiv img{
 	float:right;
 	margin-top:7px;
 	cursor: pointer;
+	z-index:9999;
 }
 
 #content_choose .input-group #btn_formSubmit{
@@ -86,12 +92,12 @@
 
 .group_bottom .chooseDiv .single_radioDiv{
 	float:left;
-	width: 9.93%;
+	width: 9.99%;
     height: 41px;
     line-height: 41px;
     text-align: center;
-    border-bottom:thin solid #b9c5d9;
-	border-right:thin solid #b9c5d9;
+   
+	cursor: pointer;
 }
 
 .group_bottom .chooseDiv .single_radioDiv input[type="radio"]{
@@ -100,6 +106,10 @@
 
 .group_bottom .chooseDiv .single_radioDiv input[type="radio"] + label{
 	cursor: pointer;
+	width: 100%;
+	border-bottom:thin solid #b9c5d9;
+	border-right:thin solid #b9c5d9;
+	display: inline-block;
 }
 
 .group_bottom .chooseDiv .single_radioDiv input[type="radio"]:checked + label{

+ 3 - 3
src/main/webapp/assets/js/common/table.js

@@ -4,8 +4,8 @@ $(document).ready(function(){
 	$(".checkboxStyleTd").click(function(){
 	    $(this).toggleClass("checkboxStyle_change");
 	    $(this).parent().parent().toggleClass("trChange");
-	    var checkboxs = $("table.tableFig tbody").find("td .checkboxStyleTd").length;
-	    var checkbox_change = $("table.tableFig tbody").find("td .checkboxStyle_change").length;
+	    var checkboxs = $("table tbody").find("td .checkboxStyleTd").length;
+	    var checkbox_change = $("table tbody").find("td .checkboxStyle_change").length;
 	    if(checkbox_change == checkboxs){
 	    	$(".checkboxStyleTh").addClass("checkboxStyle_change");
 	    }else{
@@ -42,7 +42,7 @@ $(document).ready(function(){
 	});
 	
 	// 分页中超链接跳转
-	$('#pagecontent .pagination ul li a[href]').click(function(){
+	$('#myform .pagination ul li a[href]').click(function(){
 		var _page = $(this).attr('href').substr(1);
 		$('#myform').find('input:hidden[name="page"]').val(_page);
 		refreshData();

+ 23 - 3
src/main/webapp/assets/js/operator/apApgroup.js

@@ -16,7 +16,8 @@ var ctx = $("#ctx").val();//获取服务器地址
 		}
 	});
 	if($("#selectMac").val() == "" || $("#selectApmacList").val() == ""){
-		$(this).val("请填写MAC地址");
+		$("#selectMac").val("请填写MAC地址");
+		$("#selectApmacList").val("请填写MAC地址");
 	}
 	$("#selectMac,#selectApmacList").blur(function(){
 		if($(this).val()==""){
@@ -48,9 +49,17 @@ var ctx = $("#ctx").val();//获取服务器地址
 		var id = $(this).parent("div.single_chooseDiv").find("label").attr("value");
 		$.post(ctx+"/operator/main/ap/apgroup/delete",{id:id},function(data){
 			$("#groupForm").submit();
+			return false;
 		});
 	});
 	
+	$(".group_left .single_chooseDiv").click(function(){
+		var name = $(this).find("label").text();
+		$("#groupName").val(name);
+		$("#groupForm").submit();
+		return false;
+	});
+	
 	$("#btn-selectMac").click(function(){
 		var value = $("#selectMac").val();
 		if(value == "请填写MAC地址" || value == ""){
@@ -58,17 +67,28 @@ var ctx = $("#ctx").val();//获取服务器地址
 			return false;
 		}else{
 			$("#groupForm").submit();
+			return false;
 		}
 	});
 	
+	// 分页中超链接跳转
+	$('#groupDivs .pagination ul li a[href]').click(function(){
+		var _page = $(this).attr('href').substr(1);
+		$('#groupForm').find('input:hidden[name="page1"]').val(_page);
+		$("#groupForm").submit();
+		return false;
+	});
+	
 	/***************************    自用分组分类    ***************************/
 	
 	$("#btn_formSubmit").click(function(){
-		$("#groupForm").submit();
+		$("#myform").submit();
+		return false;
 	});
 	
 	$("#btn-submit").click(function(){
-		$("#groupForm").submit();
+		$("#myform").submit();
+		return false;
 	});
 	
 });