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

voip 区域信息增加，voipAccount修改为字符串类型配置

Browse Source 
区域信息单选切换移至common.js
This commit is contained in:
duandongmei
2018-05-29 18:31:43 +08:00
parent 3ff6acb8c8
commit 787510e168
18 changed files with 1586 additions and 308 deletions
Download Patch File Download Diff File Expand all files Collapse all files

245
src/main/webapp/WEB-INF/include/form/areaInfo.jsp
View File

@@ -1,80 +1,10 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
<script type="text/javascript">
<script type="text/javascript">
$(function(){
$(".glyphicon-plus").on("click",function(){
var obj=$(this).parents(".form-section").next(".container-fluid").clone();
var len=$(this).parents("div").find(".container-fluid:visible").size();
if($(this).parent().parent().parent().attr("id")=="areaIp"){
obj.find("[id^='_areaCfg']").each(function(){
var name=$(this).attr("id").replace("_areaCfg.","");
$(this).removeAttr("id");
$(this).attr("name","areaCfg["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='_areaCfg']").attr("for","areaCfg["+len+"]."+name);
$(this).selectpicker("refresh");
});
obj.removeClass("hidden");
switchIpType(obj.find("select[name$='ipType']"));
obj.find("select[name$='ipType']").on("change",function(){
switchIpType($(this));
});
obj.appendTo("#areaIp");
$("#areaIsp").find(".container-fluid").each(function(){
if(!$(this).hasClass("hidden")) $(this).remove();
});
}else if($(this).parent().parent().parent().attr("id")=="areaIsp"){
obj.find("[name^='areaCode']").each(function(){
$(this).attr("name","areaIsp["+len+"].area");
$(this).parents(".form-group").find("div[for^='areaCode']").attr("for","areaIsp["+len+"].area");
$(this).selectpicker("refresh");
});
obj.find("[name^='ispCode']").each(function(){
$(this).attr("name","areaIsp["+len+"].isp");
$(this).selectpicker("refresh");
});
obj.removeClass("hidden");
obj.appendTo("#areaIsp");
$("#areaIp").find(".container-fluid").each(function(){
if(!$(this).hasClass("hidden")) $(this).remove();
});
}
});
});
function delAreaIp(obj){
var thisObj=$(obj);
thisObj.parents(".container-fluid").remove();
var len=$("#areaIp").find(".container-fluid:visible").size();
//调整角标
if(len>0){
len--;
$("#areaIp").find(".container-fluid:visible").each(function(){
$(this).find("[name^='areaCfg']").each(function(){
var name=$(this).attr("name");
name=name.substring(name.lastIndexOf(".")+1,name.length);
$(this).attr("name","areaCfg["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='areaCfg']").attr("for","areaCfg["+len+"]."+name);
});
len--;
});
}
}
function delAreaIsp(obj){
var thisObj=$(obj);
thisObj.parents(".container-fluid").remove();
var len=$("#areaIsp").find(".container-fluid:visible").size();
if(len>0){
len--;
$("#areaIsp").find(".container-fluid:visible").each(function(){
$(this).find("[name^='areaIsp']").each(function(){
var name=$(this).attr("name");
name=name.substring(name.lastIndexOf(".")+1,name.length);
$(this).attr("name","areaIsp["+len+"]."+name);
$(this).parents(".form-group").find("div[for^='areaIsp']").attr("for","areaIsp["+len+"]."+name);
});
len--;
});
}
}
</script>
<div class="row">
<div class="col-md-6">
@@ -118,7 +48,7 @@ function delAreaIsp(obj){
</div>
<div class="hidden" id="areaIsp">
<h4 class="form-section"><spring:message code="area"/> <spring:message code="isp"/><small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
<div class="container-fluid hidden">
<div class="container-fluid hidden row">
<div class="row">
<div class="pull-right">
<span class="glyphicon glyphicon-remove pull-right" title="remove" onClick="delAreaIsp(this);"/>
@@ -200,7 +130,7 @@ function delAreaIsp(obj){
</div>
<div class="hidden" id="areaIp">
<h4 class="form-section"><spring:message code="area"/> ip<small><span class="glyphicon glyphicon-plus" title="add"></span></small></h4>
<div class="container-fluid hidden">
<div class="container-fluid hidden row">
<div class="row">
<input type="hidden" id="_areaCfg.isAreaEffective" value="${_areaCfg.isAreaEffective}">
<input type="hidden" id="_areaCfg.cfgRegionCode" value="${_areaCfg.cfgRegionCode}">
@@ -212,22 +142,14 @@ function delAreaIsp(obj){
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input id="_areaCfg.cfgDesc" class="form-control" type="text" value="">
</div>
<div for="_areaCfg.cfgDesc"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
<div class="col-md-6">
<select id="_areaCfg.ipType" class="show-tick form-control required">
<option value="4">V4</option>
<option value="6">V6</option>
<select name="_areaCfg.ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}">${ipType.itemValue}</option>
</c:forEach>
</select>
</div>
<div for="_areaCfg.ipType"></div>
@@ -240,7 +162,7 @@ function delAreaIsp(obj){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.ipPattern" class="show-tick form-control required">
<option value="1"><spring:message code="subnet"/></option>
<option value="1"><spring:message code="ip_subnet"/></option>
<option value="2"><spring:message code="ip_range"/></option>
<option value="3"><spring:message code="ip"/></option>
</select>
@@ -249,20 +171,6 @@ function delAreaIsp(obj){
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.portPattern" class="show-tick form-control required">
<option value="1"><spring:message code="port"/></option>
<option value="2"><spring:message code="port_range"/></option>
</select>
</div>
<div for="_areaCfg.portPattern"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
<div class="col-md-6">
@@ -271,6 +179,21 @@ function delAreaIsp(obj){
<div for="_areaCfg.srcIpAddress"></div>
</div>
</div>
</div>
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="port_pattern"/></label>
<div class="col-md-6">
<select id="_areaCfg.portPattern" class="show-tick form-control required">
<option value="1"><spring:message code="port"/></option>
<option value="2"><spring:message code="port_mask"/></option>
</select>
</div>
<div for="_areaCfg.portPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
@@ -281,7 +204,7 @@ function delAreaIsp(obj){
</div>
</div>
</div>
<div class="row">
<div class="row hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
@@ -301,7 +224,7 @@ function delAreaIsp(obj){
</div>
</div>
</div>
<div class="row">
<div class="row hidden">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
@@ -323,8 +246,9 @@ function delAreaIsp(obj){
<div class="col-md-6">
<select id="_areaCfg.direction" class="show-tick form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${_areaCfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_areaCfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
<option value="0" <c:if test="${_areaCfg.direction==0 || _areaCfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${_areaCfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${_areaCfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
</select>
</div>
<div for="_areaCfg.direction"></div>
@@ -334,7 +258,7 @@ function delAreaIsp(obj){
</div>
<input type="hidden" name="areaCfgIds" value="${areaCfgIds}">
<c:forEach items="${areaCfgs}" var ="areaCfg" varStatus="status">
<div class="container-fluid">
<div class="container-fluid row">
<div class="row">
<input type="hidden" name="areaCfg[${status.index}].isAreaEffective" value="${areaCfg.isAreaEffective}">
<input name="areaCfg[${status.index}].cfgId" type="hidden" value="${areaCfg.cfgId}">
@@ -343,22 +267,14 @@ function delAreaIsp(obj){
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="config_describe"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].cfgDesc" class="form-control" type="text" value="${areaCfg.cfgDesc}">
</div>
<div for="areaCfg[${status.index}].cfgDesc"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_type"/></label>
<div class="col-md-6">
<select name="areaCfg[${status.index}].ipType" class="selectpicker show-tick form-control required">
<option value="4" <c:if test="${areaCfg.ipType==4}">selected</c:if>>V4</option>
<option value="6" <c:if test="${areaCfg.ipType==6}">selected</c:if>>V6</option>
<select name="areaCfg[${status.index}].ipType" class="selectpicker show-tick form-control required">
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipType">
<option value="${ipType.itemCode}" <c:if test="${areaCfg.ipType==ipType.itemCode}">selected</c:if> >${ipType.itemValue}</option>
</c:forEach>
</select>
</div>
<div for="areaCfg[${status.index}].ipType"></div>
@@ -366,86 +282,73 @@ function delAreaIsp(obj){
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="ip_pattern"/></label>
<div class="col-md-6">
<select name="areaCfg[${status.index}].ipPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${areaCfg.ipPattern==1}">selected</c:if> ><spring:message code="ip_subnet"/></option>
<option value="2" <c:if test="${areaCfg.ipPattern==2}">selected</c:if>><spring:message code="ip_range"/></option>
<option value="3" <c:if test="${areaCfg.ipPattern==3 || areaCfg.ipPattern==null}">selected</c:if>>IP</option>
</select>
</div>
<div for="areaCfg[${status.index}].ipPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_ip"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].srcIp" class="form-control required ipCheck" type="text" value="${areaCfg.srcIp}">
<input name="areaCfg[${status.index}].srcIpAddress" class="form-control required ipCheck" type="text" value="${areaCfg.srcIpAddress}">
</div>
<div for="areaCfg[${status.index}].srcIp"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_address_mask"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].srcIpMask" class="form-control required ipMask" type="text" value="${areaCfg.srcIpMask}">
</div>
<div for="areaCfg[${status.index}].srcIpMask"></div>
<div for="areaCfg[${status.index}].srcIpAddress"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].srcPort" class="form-control required" type="text" value="${areaCfg.srcPort}">
</div>
<div for="areaCfg[${status.index}].srcPort"></div>
</div>
</div>
<div class="row hidden" >
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port_mask"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].srcPortMask" class="form-control required" type="text" value="${areaCfg.srcPortMask}">
<select name="areaCfg[${status.index}].portPattern" class="selectpicker show-tick form-control required">
<option value="1" <c:if test="${areaCfg.portPattern==1}">selected</c:if> ><spring:message code="port"/></option>
<option value="2" <c:if test="${areaCfg.portPattern==2}">selected</c:if>><spring:message code="port_mask"/></option>
</select>
</div>
<div for="areaCfg[${status.index}].srcPortMask"></div>
<div for="areaCfg[${status.index}].portPattern"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="client_port"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].srcPort" class="form-control required checkPort" type="text" value="${areaCfg.srcPort}">
</div>
<div for="areaCfg[${status.index}].srcPort"></div>
</div>
</div>
</div>
<div class="row">
<div class="row hidden">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_ip"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].dstIp" class="form-control required ipCheck" type="text" value="${areaCfg.dstIp}">
<input name="areaCfg[${status.index}].destIpAddress" class="form-control required ipCheck" type="text" value="${areaCfg.destIpAddress}">
</div>
<div for="areaCfg[${status.index}].dstIp"></div>
<div for="areaCfg[${status.index}].destIpAddress"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_address_mask"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].dstIpMask" class="form-control required ipMask" type="text" value="${areaCfg.dstIpMask}">
</div>
<div for="areaCfg[${status.index}].dstIpMask"></div>
</div>
</div>
</div>
<div class="row">
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].dstPort" class="form-control required" type="text" value="${areaCfg.dstPort}">
<input name="areaCfg[${status.index}].destPort" class="form-control required portCheck" type="text" value="${areaCfg.destPort}">
</div>
<div for="areaCfg[${status.index}].dstPort"></div>
</div>
</div>
<div class="col-md-6">
<div class="form-group">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="server_port_mask"/></label>
<div class="col-md-6">
<input name="areaCfg[${status.index}].dstPortMask" class="form-control required" type="text" value="${areaCfg.dstPortMask}">
</div>
<div for="areaCfg[${status.index}].dstPortMask"></div>
<div for="areaCfg[${status.index}].destPort"></div>
</div>
</div>
</div>
<div class="row">
<div class="row hidden" >
<div class="col-md-6">
<div class="form-group ">
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="protocol"/></label>
@@ -466,9 +369,9 @@ function delAreaIsp(obj){
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="direction"/></label>
<div class="col-md-6">
<select name="areaCfg[${status.index}].direction" class="selectpicker show-tick form-control required" >
<option value=""><spring:message code="select"/></option>
<option value="0" <c:if test="${areaCfg.direction==0}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${areaCfg.direction==1}">selected</c:if>><spring:message code="oneway"/></option>
<option value="0" <c:if test="${areaCfg.direction==0 || areaCfg.direction==null}">selected</c:if>><spring:message code="twoway"/></option>
<option value="1" <c:if test="${areaCfg.direction==1 }">selected</c:if>><spring:message code="ingress"/></option>
<option value="2" <c:if test="${areaCfg.direction==2 }">selected</c:if>><spring:message code="degress"/></option>
</select>
</div>
<div for="areaCfg[${status.index}].direction"></div>