Browse Source

修改新增自用分组分页的问题

ying.rong 9 years ago
parent
commit
3b07c85798

+ 1 - 0
src/main/java/com/cloudcross/ssp/model/mapper/wifi.sql.xml

@@ -364,6 +364,7 @@
 		<if test="apmac != null">
 		and wifi.apmac = #{apmac}
 		</if>
+		limit #{pager.offset}, #{pager.limit}
 	</select>
 	
 	<select id="queryWifiByCondition" parameterType="java.util.Map" resultType="com.cloudcross.ssp.model.Wifi">

+ 4 - 2
src/main/java/com/cloudcross/ssp/web/operator/main/ap/ApgroupController.java

@@ -106,7 +106,7 @@ public class ApgroupController extends SimpleController{
 	 * @since  1.0.0
 	 */
 	@RequestMapping("/create")
-	public String create(Model model,String name,String apmac,
+	public String create(Model model,String groupId,String name,String apmac,
 			@RequestParam(defaultValue = "1") int page,
 			@RequestParam(defaultValue = "1") int page1){
 		//分页显示所有的分组名(30一页)
@@ -145,7 +145,9 @@ public class ApgroupController extends SimpleController{
 			map.put("pager", pager);
 			wifiList = wifiService.queryWifiByCondition(map,pager);
 		}
-		
+		model.addAttribute("groupId",groupId);
+		model.addAttribute("name",name);
+		model.addAttribute("apmac",apmac);
 		model.addAttribute("pager",pager);
 		model.addAttribute("listGroupName", listGroupName);
 		model.addAttribute("pager1",pager1);

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

@@ -3,6 +3,7 @@
 <link rel="stylesheet" href="${ctx}/assets/css/apmacManager.css"/>
 <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/apApgroup.js"></script>
 </@override>
 <@override name="body">
@@ -29,7 +30,8 @@
  				<form id="groupForm" action="${ctx}/operator/main/ap/apgroup/create" method="post">
 		 			<div class="group_left">
 		 				<input type="hidden" id="page1" name="page1" value="${pager1.page}"/>
-		 				<input type="hidden" id="groupName" name="name" value=""/>
+		 				<input type="hidden" id="groupName" name="name" value="${name!}"/>
+		 				<input type="hidden" id="groupId" name="groupId" value="${groupId!}"/>
 			 			<div class="input-group">
 							<input class="input-text" id="createApgroup" type="text" value="请填写新增分组名称"/>
 							<a id="btn-createApgroup" class="btn3" type="button">提交</a>
@@ -56,7 +58,7 @@
 							<input class="input-text" id="selectMac" type="text" value="请填写MAC地址"/>
 							<a id="btn-selectMac" class="btn3" type="button">提交</a>
 						</div>
-						<table border="1" class="tableFig">
+						<table border="1" class="tableGroup">
 						    <thead>
 						    	<tr class="theadTr">
 							    	<th class="theadTh" style="width:3%;"><div class="checkboxStyleTh"></div></th>

+ 22 - 2
src/main/webapp/assets/css/apmacManager.css

@@ -112,7 +112,7 @@
 	display: inline-block;
 }
 
-.group_bottom .chooseDiv .single_radioDiv input[type="radio"]:checked + label{
+.group_bottom .chooseDiv .single_radioDiv input[type="radio"]:checked + label,.chooseDiv div.lableChange{
 	background-color: #4C637B;
 	color: #fff;
 }
@@ -120,4 +120,24 @@
 .group_bottom #group_btnDiv{
 	float:right;
 	margin: 20px -6px 0 0;
-}
+}
+
+table.tableGroup{
+	width:100%;
+}
+
+table.tableGroup,table.tableGroup th,table.tableGroup td{
+	border:thin solid #b9c5d9;
+}
+
+table.tableGroup th,table.tableGroup th{
+	height:60px;
+	border:none;
+	background-color: #f3f3f3;
+}
+
+table.tableGroup td,table.tableGroup td{
+	height:40px;
+	border:none;
+	border-top:thin solid #b9c5d9;
+}

+ 10 - 0
src/main/webapp/assets/js/operator/apApgroup.js

@@ -56,10 +56,20 @@ var ctx = $("#ctx").val();//获取服务器地址
 	$(".group_left .single_chooseDiv").click(function(){
 		var name = $(this).find("label").text();
 		$("#groupName").val(name);
+		$("#groupId").val($(this).find("label").attr("value"));
+		$(this).addClass("lableChange");
 		$("#groupForm").submit();
 		return false;
 	});
 	
+	$(".group_left .single_chooseDiv").each(function(){
+		if($(this).find("label").attr("value") == $("#groupId").val()){
+			$(this).addClass("lableChange");
+		}else{
+			$(this).removeClass("lableChange");
+		}
+	});
+	
 	$("#btn-selectMac").click(function(){
 		var value = $("#selectMac").val();
 		if(value == "请填写MAC地址" || value == ""){