用户管理模块

1、数据新增事务回滚提交处理 2、页面必填样式错位优化 3、cgi接口相关国际化添加 app协议导出字段调整
2018-11-30 05:07:43 +08:00
parent 740b73aa22
commit 3c48635d0c
11 changed files with 237 additions and 125 deletions
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/list.jsp
@@ -61,9 +61,10 @@
 						html+="<table class='table table-bordered table-condensed text-nowrap' style='width: 100%;'>";
 	      			  	html+="<thead>";
 	      			  	html+="<th><spring:message code="user_name"/></th><th><spring:message code="vpn_ip"/></th><th><spring:message code="create_time"/></th><th><spring:message code="last_login"/></th><th><spring:message code="num_logins"/></th>";
-	      			  	html+="<th><spring:message code="outgoing_unicast_packets"/></th><th><spring:message code="outgoing_unicast_total_size"/></th><th><spring:message code="outgoing_broadcast_packets"/></th>";
-	      			  	html+="<th><spring:message code="outgoing_broadcast_total_size"/></th><th><spring:message code="incoming_unicast_packets"/></th><th><spring:message code="incoming_unicast_total_size"/></th>";
-	      			  	html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>";
+	      			  	html+="<th><spring:message code="outgoing_unicast_packets"/></th><th><spring:message code="outgoing_unicast_total_size"/></th>";
+	      			  	/* html+="<th><spring:message code="outgoing_broadcast_packets"/></th><th><spring:message code="outgoing_broadcast_total_size"/></th>"; */
+	      			  	html+="<th><spring:message code="incoming_unicast_packets"/></th><th><spring:message code="incoming_unicast_total_size"/></th>";
+	      			  	/* html+="<th><spring:message code="incoming_broadcast_packets"/></th><th><spring:message code="incoming_broadcast_total_size"/></th>"; */
 	      			  	html+="</thead>";
 	      			   	html+="<tbody>";
 		      			   	for(i=0;i<data.length;i++){
@@ -83,18 +84,18 @@
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Unicast_Total_Size==null?"":data[i].Outgoing_Unicast_Total_Size);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
+		      					/* html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Packets==null?"":data[i].Outgoing_Broadcast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Outgoing_Broadcast_Total_Size==null?"":data[i].Outgoing_Broadcast_Total_Size);
-		      					html+="</td>";
+		      					html+="</td>"; */
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Packets==null?"":data[i].Incoming_Unicast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Unicast_Total_Size==null?"":data[i].Incoming_Unicast_Total_Size);
 		      					html+="</td>";
-		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
+		      					/* html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Packets==null?"":data[i].Incoming_Broadcast_Packets);
 		      					html+="</td>";
 		      					html+="<td class='taskStatus'>"+(data[i].Incoming_Broadcast_Total_Size==null?"":data[i].Incoming_Broadcast_Total_Size);
-		      					html+="</td>";
+		      					html+="</td>"; */
 		      			   		html+="</tr>";
 		      			   	}
 		      				html+="</tbody>";
--- a/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/maintenance/userManage/userForm.jsp
@@ -14,14 +14,15 @@
 						    return this.optional(element) || (tel.test(value));
 						}, "用户名仅支持英文大小写、数字");	
 						$("#no").focus();
-						$("#inputForm")
+						
+	$("#inputForm")
 								.validate(
 										{
 											rules : {
 												userName : {
 													remote : "${ctx}/maintenance/userManage/checkLoginName?oldUserName="
 															+ encodeURIComponent('${user.userName}'),
-													userCheck:true		
+													userCheck : true
 												},
 											},
 											messages : {
@@ -32,31 +33,23 @@
 													equalTo : "<spring:message code='equal_password'/>"
 												}
 											},
+											errorPlacement : function(error,element) {
+												/* $("#messageBox").text("<spring:message code='enter_error'/>");
+												if (element.is(":checkbox")|| element.is(":radio")|| element.parent().is(".input-append")) {
+													error.appendTo(element.parent().parent());
+												} else {
+													error.insertAfter(element);
+												} */
+												$(element).parents(".form-group").find("div[for='"+ element.attr("name")+ "']").append(error);
+											},
 											submitHandler : function(form) {
 												loading('onloading...');
 												form.submit();
 											},
-											errorContainer : "#messageBox",
-											errorPlacement : function(error,
-													element) {
-												$("#messageBox")
-														.text(
-																"<spring:message code='enter_error'/>");
-												if (element.is(":checkbox")
-														|| element.is(":radio")
-														|| element
-																.parent()
-																.is(
-																		".input-append")) {
-													error.appendTo(element
-															.parent().parent());
-												} else {
-													error.insertAfter(element);
-												}
-											}
+											errorContainer : "#messageBox"
 										});
-						
-			});
+
+					});
 </script>
 </head>
 <body>
@@ -93,6 +86,7 @@
 									</c:set>
 									<label class="control-label col-md-3"><spring:message
 											code="vpn_ip" /></label>
+									<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<sys:treeselect id="serverIp" name="serverIp"
 											value="${user.serverIp}" labelName="user.serverIp"
@@ -102,13 +96,13 @@
 											url="/maintenance/userManage/treeData?isLeafShow=false&cfgType=3&specific=true" extId="0"
 											checked="true"   cssClass="form-control required" />
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
-									<div for="user.serverIp"></div>
+									 <div for="user.serverIp"></div>
 								</div>
 								
 								<div class="form-group hidden">
 									<label class="col-md-3 control-label"><spring:message
 											code="user_name" /></label>
+											<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<select name="userType" data-live-search="true" class="selectpicker form-control required">
 											<c:forEach items="${fns:getDictList('USER_TYPE')}" var="userTypes">
@@ -116,12 +110,12 @@
 											</c:forEach>
 										</select>
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
 								</div>
 								
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="user_name" /></label>
+											<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<input id="oldUserName" name="oldUserName" type="hidden"
 											value="${user.userName}">
@@ -133,35 +127,37 @@
 											<form:input path="userName" htmlEscape="false" maxlength="50"
 												class="required   form-control" />
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
+									<div for="userName"></div>
 								</div>

 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="password" /></label>
+									<c:if test="${empty user.id}">
+										<span class="help-inline"><font color="red">*</font> </span>
+									</c:if>
 									<div class="col-md-4">
 										<input id="userPwd" name="userPwd" type="password" value=""
 											maxlength="50" minlength="3"
 											class="${empty user.id?'required':''} form-control" />
 									</div>
-									<c:if test="${empty user.id}">
-										<span class="help-inline"><font color="red">*</font> </span>
-									</c:if>
 									<c:if test="${not empty user.id}">
 										<span class="help-inline"><spring:message
 												code="nochange_blank" /></span>
 									</c:if>
+									<div for="userPwd"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message
 											code="confirm_password"></spring:message></label>
+									<span class="help-inline"><font color="red">*</font> </span>
 									<div class="col-md-4">
 										<input id="newUserPwd" name="newUserPwd" type="password"
 											value="" maxlength="50" minlength="3" equalTo="#userPwd"
 											class="form-control" />
 										<c:if test="${empty user.id}"></c:if>
 									</div>
-									<span class="help-inline"><font color="red">*</font> </span>
+									<div for="newUserPwd"></div>
 								</div>
 								<div class="form-group">
 									<label class="col-md-3 control-label"><spring:message