gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

用户管理-用户类型vpn调整

Browse Source 
vpn服务器ip添加业务字典数据类型
ip校验、cgi服务国际化添加
This commit is contained in:
leijun
2018-12-05 10:03:45 +08:00
parent 53555aa73a
commit dd1862abce
14 changed files with 123 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
src/main/webapp/WEB-INF/views/basics/serviceDictForm.jsp
View File

@@ -104,6 +104,11 @@ label.errorShow {
return flagLeafChange;
},"<spring:message code='leafChange'/>");
jQuery.validator.addMethod("ipchecks",function(value,element){
var tel=/^(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|[1-9])\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)\.(0|1\d{2}|2[0-4]\d|25[0-5]|[1-9]\d|\d)$/;
return this.optional(element) || (tel.test(value));
},"<spring:message code='ip_check'/>");
$("#name").focus();
validateForm=$("#inputForm").validate({
rules: {
@@ -166,6 +171,10 @@ label.errorShow {
<spring:message code="label"/>
<c:set var="title" value="label"></c:set>
</c:if>
<c:if test="${itType==5 }">
<spring:message code="vpn_ip"/>
<c:set var="title" value="vpnIp"></c:set>
</c:if>
</h3>
<div class="row">
@@ -191,7 +200,7 @@ label.errorShow {
<form:form id="inputForm" modelAttribute="serviceDictInfo" action="${ctx}/basics/serviceDictInfo/saveOrUpdate?itType=${itType}" method="post" class="form-horizontal">
<form:hidden path="serviceDictId"/>
<sys:message content="${message}"/>
<div class="form-group">
<div class="form-group <c:if test="${itType==5 }"> hidden </c:if> " >
<label class="col-md-3 control-label"><spring:message code="superior_config"/>:</label>
<div class="col-md-4">
<c:if test="${itType==1 }">
@@ -203,13 +212,16 @@ label.errorShow {
<c:if test="${itType==3 }">
<c:set var="fatherName"><spring:message code="label"/></c:set>
</c:if>
<c:if test="${itType==5 }">
<c:set var="fatherName"><spring:message code="vpn_ip"/></c:set>
</c:if>
<sys:treeselect id="serviceDictInfo" name="parent.serviceDictId" value="${serviceDictInfo.parent.serviceDictId}" labelName="parent.itemValue"
labelValue="${serviceDictInfo.parent.serviceDictId eq '0'?fatherName:fns:getServiceDictInfoById(serviceDictInfo.parent.serviceDictId).itemValue}"
title="${title }" url="/basics/serviceDictInfo/treeData?itType=${itType}" cssClass="required form-control"/>
<label class="errorShow" style="display: none;"><spring:message code="isLevelNoSure"/></label>
</div>
</div>
<div class="form-group">
<div class="form-group <c:if test="${itType==5 }"> hidden </c:if>">
<label class="col-md-3 control-label radio-lable"><font color="red">*</font> <spring:message code="item_type"/>:</label>
<div class="col-md-4">
<select id="itemTypeCheckChild" name="itemType" class="form-control childrenType typeSame">
@@ -230,12 +242,24 @@ label.errorShow {
</div>
</div> --%>
<div class="form-group">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="config_content"/>:</label>
<label class="col-md-3 control-label"><font color="red">*</font>
<c:if test="${itType==5 }">
<spring:message code="vpn_ip"/>:
</c:if>
<c:if test="${itType!=5 }">
<spring:message code="config_content"/>:
</c:if>
</label>
<div class="col-md-4">
<form:input path="itemValue" htmlEscape="false" maxlength="64" class="form-control required noBlankSpace"/>
<c:if test="${itType==5 }">
<input class="form-control required ipchecks " id="itemValue" type="text" name="itemValue" value="${serviceDictInfo.itemValue}">
</c:if>
<c:if test="${itType!=5 }">
<form:input path="itemValue" htmlEscape="false" maxlength="64" class="form-control required "/>
</c:if>
</div>
</div>
<div class="form-group">
<div class="form-group <c:if test="${itType==5 }"> hidden </c:if>">
<label class="col-md-3 control-label"><font color="red">*</font><spring:message code="is_leaf"/>:</label>
<div class="col-md-4">
<form:select path="isLeaf" class="form-control leafChange">

49
src/main/webapp/WEB-INF/views/basics/serviceDictList.jsp
View File

@@ -7,9 +7,6 @@
<script src="${ctxStatic}/global/plugins/treeTable/jquery.treeTable.min.js" type="text/javascript"></script>
<script src="${ctxStatic}/pages/scripts/dict.js" type="text/javascript"></script>
<script type="text/javascript">
function reset(){
$("#searchForm").reset();
}
/**
处理全选、全取消
**/
@@ -77,8 +74,9 @@
//reset
$("#resetBtn").on("click",function(){
$(".Wdate").attr("value",'');
$("#searchForm")[0].reset();
$("#itemType").val("");
$("#searchForm")[0].reset();
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text().trim());
});
//筛选功能初始化
@@ -89,14 +87,7 @@
});
$("#seltype").change(function(){
$("#intype").val("");
var reg = /[A-Za-z]/;
if (reg.test($(".page-title").text())){
$("#intype").attr("placeholder","<spring:message code='input'/>"+" "+$(this).find("option:selected").text());
} else {
$("#intype").attr("placeholder","<spring:message code='input'/>"+$(this).find("option:selected").text());
}
$("#intype").attr("name",$(this).find("option:selected").val());
$("#intype").attr("placeholder","<spring:message code='input'/> "+$(this).find("option:selected").text().trim());
});
$("#treeTable").treeTable({expandLevel : 3}).show();
@@ -163,19 +154,23 @@
<div class="input-group-btn">
<select id="seltype" class="selectpicker select2 input-small" >
<%-- <option value="itemCode"><spring:message code="item_code"></spring:message></option> --%>
<option value="itemValue"><spring:message code="config_content"></spring:message></option>
<option value="itemValue">
<c:if test="${itType!=5 }">
<spring:message code="config_content"></spring:message>
</c:if>
<c:if test="${itType==5 }">
<spring:message code="vpn_ip"></spring:message>
</c:if>
</option>
</select>
</div>
<input id="intype" class="form-control input-medium" placeholder="<spring:message code='config_content'></spring:message>" type="text" maxlength="60">
<input id="intype" class="form-control input-medium" placeholder="<c:if test="${itType!=5 }"><spring:message code='input'/> <spring:message code='config_content'></spring:message></c:if><c:if test="${itType==5 }"><spring:message code='input'/> <spring:message code='vpn_ip'/></c:if>" type="text" maxlength="60">
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>
<button type="button" class="btn btn-default" onClick="resetx()" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="resetBtn"> <i class="fa fa-refresh"></i> <spring:message code="reset"/> </button>
<button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"></spring:message> <i class="fa fa-angle-double-down"></i></button>
</div>
@@ -279,10 +274,17 @@
<th><input type="checkbox" class="ckboxs" id="selAll" onclick="selectAll()"></th>
<!-- <th>序号</th> -->
<%-- <th><spring:message code="item_code"/></th> --%>
<th><spring:message code="config_content"/></th>
<c:if test="${itType==5 }">
<th><spring:message code="vpn_ip"/></th>
</c:if>
<c:if test="${itType!=5 }">
<th><spring:message code="config_content"/></th>
</c:if>
<th><spring:message code="desc"/></th>
<c:if test="${itType!=5 }">
<th><spring:message code="item_type"/></th>
<th><spring:message code="is_leaf"/></th>
</c:if>
<th><spring:message code="creator"/></th>
<th class="sort-column create_time"><spring:message code="create_time"/>
</th><th><spring:message code="editor"/></th>
@@ -296,10 +298,17 @@
<td><input type="checkbox" class="ckbox" name="check" value="${serviceDictInfo.serviceDictId}"></td>
<%-- <td>${serviceDictInfo.showSequence}</td> --%>
<%-- <td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemCode}</a></td> --%>
<td nowrap><i class="icon-icon-tablet"></i><a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a></td>
<td nowrap><i class="icon-icon-tablet"></i>
<c:if test="${itType!=5 }">
<a href="${ctx}/basics/serviceDictInfo/form?serviceDictId=${serviceDictInfo.serviceDictId}&doAction=0">${serviceDictInfo.itemValue}</a>
</c:if>
<c:if test="${itType==5 }">${serviceDictInfo.itemValue}</c:if>
</td>
<td title="${serviceDictInfo.itemDesc}">${fns:abbr(serviceDictInfo.itemDesc,15)}</td>
<c:if test="${itType!=5 }">
<td><spring:message code='${fns:getDictLabel("SERVICE_DICT_ITM_TYPE",serviceDictInfo.itemType,"0")}'/></td>
<td><spring:message code='${fns:getDictLabel("INT_YES_NO",serviceDictInfo.isLeaf,"0")}'/></td>
</c:if>
<td><c:if test="${serviceDictInfo.serviceDictCreator != null}">
${fns:getUserById(serviceDictInfo.serviceDictCreator.id).name}
</c:if></td>