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

Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

Browse Source
This commit is contained in:
段冬梅
2018-12-10 20:23:42 +08:00
parent a09341f8d7 64e85ff933
commit c13038c8eb
6 changed files with 61 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/webapp/WEB-INF/views/cfg/maintenance/ipMultiplexPool/snatform2.jsp
View File

@@ -246,7 +246,7 @@ var resetIndex = function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" >
<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" ctx="${ctx }" cfgId="${_cfg.cfgId}">
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
</div>
@@ -393,7 +393,7 @@ var resetIndex = function(){
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip"/></label>
<div class="col-md-6">
<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }" >
<input class="form-control required ipCheck ipMaskSole" type="text" name="ipCfgs[0].srcIpAddress" value="${ipCfg.srcIpAddress }" ctx="${ctx }" cfgId="${_cfg.cfgId}">
</div>
<div for="ipCfgs[0].srcIpAddress"></div>
</div>

23
src/main/webapp/static/global/plugins/jquery-validation/1.11.0/jquery.validate.method.js
View File

@@ -980,6 +980,7 @@ jQuery.validator.addMethod("areaUnique",function(value,element) {
jQuery.validator.addMethod("ipMaskSole",function(value,element) {
var flag = true;
var ipArray = [];
var value2 = value;
if(value.indexOf("/") == -1){
value = value+"/32";
}
@@ -993,5 +994,27 @@ jQuery.validator.addMethod("ipMaskSole",function(value,element) {
if($.inArray(value,ipArray) != -1){
flag = false;
}
var cfgId = $(element).attr("cfgId");
if((flag == true) && (!cfgId)){
ipArray = [];
ipArray.push(value2);
$(".ipMaskSole").each(function(){
ipArray.push($(this).val());
});
var ctx = $(element).attr("ctx");
var url = ctx+"/maintenance/ipMultiplexPoolCfg/checkAddrPoolIp";
$.ajax({
type:'post',
async:false,
url: url,
data:{"ips":ipArray.join(',')},
success:function(data){
flag = data;
}
});
}
return flag;
});