contip、conturl、picip、picurl功能提交
areainfo界面区域和运营商修改为二选一的
This commit is contained in:
duandongmei
@@ -14,18 +14,13 @@ $(function(){
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="1" class="required"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
<c:if test="${action==2}">disabled</c:if>
|
||||
><spring:message code="yes"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="0" class="required"
|
||||
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
|
||||
<c:if test="${action==2}">disabled</c:if>
|
||||
><spring:message code="no"/>
|
||||
</label>
|
||||
<c:if test="${action==2}">
|
||||
<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
|
||||
</c:if>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
@@ -57,9 +52,9 @@ $(function(){
|
||||
<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="area"/></label>
|
||||
<label class="control-label col-md-3"><spring:message code="area"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="areaCode" class="form-control required" data-live-search="true" data-live-search-placeholder="search" >
|
||||
<select name="areaCode" class="form-control chooseAreaOrIsp" data-live-search="true" data-live-search-placeholder="search" >
|
||||
<option value="" ><spring:message code="select"/></option>
|
||||
<c:forEach items="${areas}" var="area">
|
||||
<option value="${area.itemCode}">${area.itemValue}</option>
|
||||
@@ -94,9 +89,9 @@ $(function(){
|
||||
<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="area"/></label>
|
||||
<label class="control-label col-md-3"><spring:message code="area"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="areaIsp[${status.index}].area" class="selectpicker form-control required" data-live-search="true" data-live-search-placeholder="search" >
|
||||
<select name="areaIsp[${status.index}].area" class="selectpicker form-control" data-live-search="true" data-live-search-placeholder="search" >
|
||||
<option value="" ><spring:message code="select"/></option>
|
||||
<c:forEach items="${areas}" var="area">
|
||||
<option value="${area.itemCode}"
|
||||
@@ -150,7 +145,7 @@ $(function(){
|
||||
|
||||
<select id="_areaCfg.ipType" class="show-tick form-control required">
|
||||
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
|
||||
<option value="${ipTypeC.itemCode}">${ipTypeC.itemValue}</option>
|
||||
<option value="${ipTypeC.itemCode}" <c:if test="${ipTypeC.itemCode==_areaCfg.ipType || (_areaCfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
@@ -164,9 +159,9 @@ $(function(){
|
||||
<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="ip_subnet"/></option>
|
||||
<option value="2"><spring:message code="ip_range"/></option>
|
||||
<option value="3"><spring:message code="ip"/></option>
|
||||
<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==1 }">selected</c:if>><spring:message code="ip_range"/></option>
|
||||
<option value="3" <c:if test="${_areaCfg.ipPattern==3 || _areaCfg.ipPattern==null}">selected</c:if>><spring:message code="ip"/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="_areaCfg.ipPattern"></div>
|
||||
@@ -176,7 +171,7 @@ $(function(){
|
||||
<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 id="_areaCfg.srcIpAddress" class="form-control required" type="text" value="${_areaCfg.srcIpAddress}">
|
||||
<input id="_areaCfg.srcIpAddress" class="form-control required ipCheck" type="text" value="${_areaCfg.srcIpAddress}">
|
||||
</div>
|
||||
<div for="_areaCfg.srcIpAddress"></div>
|
||||
</div>
|
||||
@@ -189,8 +184,8 @@ $(function(){
|
||||
<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>
|
||||
<option value="1" <c:if test="${_areaCfg.portPattern==1 || _areaCfg.portPattern==null}">selected</c:if>><spring:message code="port"/></option>
|
||||
<option value="2" <c:if test="${_areaCfg.portPattern==1}">selected</c:if>><spring:message code="port_mask"/></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="_areaCfg.portPattern"></div>
|
||||
@@ -200,7 +195,7 @@ $(function(){
|
||||
<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 id="_areaCfg.srcPort" class="form-control required" type="text" value="${_areaCfg.srcPort}">
|
||||
<input id="_areaCfg.srcPort" class="form-control required portCheck" type="text" value="${_areaCfg.srcPort}">
|
||||
</div>
|
||||
<div for="_areaCfg.srcPort"></div>
|
||||
</div>
|
||||
@@ -211,7 +206,7 @@ $(function(){
|
||||
<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 id="_areaCfg.destIpAddress" class="form-control required" type="text" value="${_areaCfg.destIpAddress}">
|
||||
<input id="_areaCfg.destIpAddress" class="form-control required ipCheck" type="text" value="${_areaCfg.destIpAddress}">
|
||||
</div>
|
||||
<div for="_areaCfg.destIpAddress"></div>
|
||||
</div>
|
||||
@@ -220,7 +215,7 @@ $(function(){
|
||||
<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 id="_areaCfg.destPort" class="form-control required" type="text" value="${_areaCfg.destPort}">
|
||||
<input id="_areaCfg.destPort" class="form-control required portCheck" type="text" value="${_areaCfg.destPort}">
|
||||
</div>
|
||||
<div for="_areaCfg.destPort"></div>
|
||||
</div>
|
||||
@@ -235,7 +230,7 @@ $(function(){
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="6" <c:if test="${_areaCfg.protocol==6}">selected</c:if>>TCP</option>
|
||||
<option value="17" <c:if test="${_areaCfg.protocol==17}">selected</c:if> >UDP</option>
|
||||
<option value="0" <c:if test="${_areaCfg.protocol==0}">selected</c:if> ><spring:message code="arbitrary"/></option>
|
||||
<option value="0" <c:if test="${_areaCfg.protocol==0 || _areaCfg.protocol==null}">selected</c:if> ><spring:message code="arbitrary"/></option>
|
||||
</select>
|
||||
<input type="hidden" id="_areaCfg.protocolId" value="${_areaCfg.protocolId}">
|
||||
</div>
|
||||
@@ -275,7 +270,7 @@ $(function(){
|
||||
<div class="col-md-6">
|
||||
<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>
|
||||
<option value="${ipType.itemCode}" <c:if test="${areaCfg.ipType==ipType.itemCode || (areaCfg.ipType==null && ipType.itemCode==4)}">selected</c:if> >${ipType.itemValue}</option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
@@ -324,7 +319,7 @@ $(function(){
|
||||
<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}">
|
||||
<input name="areaCfg[${status.index}].srcPort" class="form-control required portCheck" type="text" value="${areaCfg.srcPort}">
|
||||
</div>
|
||||
<div for="areaCfg[${status.index}].srcPort"></div>
|
||||
</div>
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<h3 class="form-section"><spring:message code="block_config"/></h3>
|
||||
<div class="row">
|
||||
<div class="row ipInfo">
|
||||
<div class="row">
|
||||
<div class="col-md-6">
|
||||
<div class="form-group">
|
||||
@@ -9,7 +9,7 @@
|
||||
<div class="col-md-6">
|
||||
<select name="ipType" class="selectpicker show-tick form-control required">
|
||||
<c:forEach items="${fns:getDictList('IP_TYPE')}" var="ipTypeC">
|
||||
<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode}">selected</c:if>>${ipTypeC.itemValue}</option>
|
||||
<option value="${ipTypeC.itemCode}" <c:if test="${_cfg.ipType==ipTypeC.itemCode || (_cfg.ipType==null && ipTypeC.itemCode==4)}">selected</c:if>>${ipTypeC.itemValue}</option>
|
||||
</c:forEach>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
@@ -1,134 +1,67 @@
|
||||
<%@ page contentType="text/html;charset=UTF-8"%>
|
||||
<%@ include file="/WEB-INF/include/taglib.jsp"%>
|
||||
<h3 class="form-section"><spring:message code="block_config"/></h3>
|
||||
<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 class="form-control" type="text" name="cfgDesc" value="${_cfg.cfgDesc}">
|
||||
</div>
|
||||
<div for="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="key_word"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||
</div>
|
||||
<div for="cfgKeywords"></div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row stringInfo">
|
||||
<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="key_word"/></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control required" type="text" name="cfgKeywords" value="${_cfg.cfgKeywords}">
|
||||
</div>
|
||||
<div for="cfgKeywords"></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="whether_hexbinary"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="isHexbin" class="selectpicker select2 form-control required" >
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="0" <c:if test="${_cfg.isHexbin==0 || _cfg.isHexbin==null }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
|
||||
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="isHexbin"></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="expression_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="1" class="required"
|
||||
<c:if test="${_cfg.exprType==1}">checked</c:if>
|
||||
><spring:message code="and"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="0" class="required"
|
||||
<c:if test="${_cfg.exprType==0 || _cfg.exprType==null}">checked</c:if>
|
||||
><spring:message code="null"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="exprType"></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="match_method"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="matchMethod" class="selectpicker select2 form-control required" >
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="0" <c:if test="${_cfg.matchMethod==0 || _cfg.matchMethod==null}">selected</c:if>><spring:message code="substring_match"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
|
||||
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
|
||||
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="matchMethod"></div>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<c:choose>
|
||||
<c:when test="${action ==5}">
|
||||
<input type="hidden" name="isAreaEffective" value="0">
|
||||
<input type="hidden" name="exprType" value="0">
|
||||
<input type="hidden" name="matchMethod" value="0">
|
||||
<input type="hidden" name="isHexbin" value="0">
|
||||
</c:when>
|
||||
<c:otherwise>
|
||||
<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="expression_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="1" class="required"
|
||||
<c:if test="${_cfg.exprType==1}">checked</c:if>
|
||||
><spring:message code="and"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="exprType" value="0" class="required"
|
||||
<c:if test="${_cfg.exprType==0}">checked</c:if>
|
||||
><spring:message code="null"/>
|
||||
</label>
|
||||
</div>
|
||||
<div for="exprType"></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="match_method"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="matchMethod" class="selectpicker select2 form-control required" >
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="0" <c:if test="${_cfg.matchMethod==0 }">selected</c:if>><spring:message code="substring_match"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.matchMethod==1 }">selected</c:if>><spring:message code="right_match"></spring:message></option>
|
||||
<option value="2" <c:if test="${_cfg.matchMethod==2 }">selected</c:if>><spring:message code="left_match"></spring:message></option>
|
||||
<option value="3" <c:if test="${_cfg.matchMethod==3 }">selected</c:if>><spring:message code="exactly_match"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="matchMethod"></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="whether_hexbinary"/></label>
|
||||
<div class="col-md-6">
|
||||
<select name="isHexbin" class="selectpicker select2 form-control required" >
|
||||
<option value=""><spring:message code="select"/></option>
|
||||
<option value="0" <c:if test="${_cfg.isHexbin==0 }">selected</c:if>><spring:message code="case_insensitive_nohex"></spring:message></option>
|
||||
<option value="1" <c:if test="${_cfg.isHexbin==1 }">selected</c:if>><spring:message code="hex_binary"></spring:message></option>
|
||||
<option value="2" <c:if test="${_cfg.isHexbin==2 }">selected</c:if>><spring:message code="case_sensitive_nohex"></spring:message></option>
|
||||
</select>
|
||||
</div>
|
||||
<div for="isHexbin"></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="whether_area_block"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="1" class="required"
|
||||
<c:if test="${_cfg.isAreaEffective==1}">checked</c:if>
|
||||
<c:if test="${action==2}">disabled</c:if>
|
||||
><spring:message code="yes"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="isAreaEffective" value="0" class="required"
|
||||
<c:if test="${_cfg.isAreaEffective==0}">checked</c:if>
|
||||
<c:if test="${action==2}">disabled</c:if>
|
||||
><spring:message code="no"/>
|
||||
</label>
|
||||
<c:if test="${action==2}">
|
||||
<input class="form-control" type="hidden" name="isAreaEffective" value="${_cfg.isAreaEffective}">
|
||||
</c:if>
|
||||
</div>
|
||||
<div for="isAreaEffective"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="row">
|
||||
<%-- <div class="col-md-6">
|
||||
<div class="form-group ">
|
||||
<label class="control-label col-md-3"><spring:message code="area_effect_id"></spring:message></label>
|
||||
<div class="col-md-6">
|
||||
<input class="form-control" type="text" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
<div for="areaEffectiveIds"></div>
|
||||
</div>
|
||||
</div> --%>
|
||||
<div class="hidden areaType col-md-6">
|
||||
<div class="form-group">
|
||||
<label class="control-label col-md-3"><font color="red">*</font><spring:message code="area_control_type"/></label>
|
||||
<div class="col-md-6">
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="areaType" value="1" class="required"><spring:message code="area"/> <spring:message code="isp"/>
|
||||
</label>
|
||||
<label class="radio-inline">
|
||||
<input type="radio" name="areaType" value="0" class="required"><spring:message code="area"/> ip
|
||||
</label>
|
||||
</div>
|
||||
<div for="areaType"></div>
|
||||
<input class="form-control" type="hidden" name="areaEffectiveIds" value="${_cfg.areaEffectiveIds}">
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
</c:otherwise>
|
||||
</c:choose>
|
||||
<!--/row-->
|
||||
Reference in New Issue
Block a user