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

(1)asn 组选择加入搜索

Browse Source 
(2)asn ip列表界面 asn ip组查询条件修复,ip查询条件状态保存修复
(3)DNS ip界面ip搜索条件状态保存修复
This commit is contained in:
wangxin
2018-09-03 14:43:05 +08:00
parent 94e73a2298
commit b812bbac5b
6 changed files with 12 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/nis/web/dao/basics/AsnIpCfgDao.xml
View File

@@ -61,7 +61,7 @@
left join sys_user u on r.auditor_id=u.id
<trim prefix="WHERE" prefixOverrides="AND |OR ">
<if test="page !=null and page.where != null and page.where != ''">
AND ${page.where}
AND ${page.where}
</if>
<if test="cfgId != null">
AND r.CFG_ID=#{cfgId,jdbcType=BIGINT}
@@ -69,8 +69,8 @@
<if test="cfgDesc != null and cfgDesc != ''">
AND r.CFG_DESC like concat(concat('%',#{cfgDesc,jdbcType=VARCHAR}),'%')
</if>
<if test="asnIpGroupName != null and asnIpGroupName != ''">
AND dns.group_name like concat(concat('%',#{asnIpGroupName,jdbcType=VARCHAR}),'%')
<if test="asnIpGroup != null and asnIpGroup != ''">
AND r.asn_Ip_Group =#{asnIpGroup,jdbcType=INTEGER}
</if>
<if test="cfgRegionCode != null">
AND r.CFG_REGION_CODE=#{cfgRegionCode,jdbcType=INTEGER}

2
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormAdd.jsp
View File

@@ -122,7 +122,7 @@ var reSort=function(obj,index){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6">
<select name="asnIpGroup" class="selectpicker show-tick form-control required">
<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<%-- <option value="0" ><spring:message code="default_group"/></option>--%>
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>

2
src/main/webapp/WEB-INF/views/basics/asnIpCfgFormUpdate.jsp
View File

@@ -66,7 +66,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6">
<select name="asnIpGroup" class="selectpicker show-tick form-control required">
<select name="asnIpGroup" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.serviceGroupId}" <c:if test="${_cfg.asnIpGroup==policyGroup.serviceGroupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>

10
src/main/webapp/WEB-INF/views/basics/asnIpCfgList.jsp
View File

@@ -8,11 +8,9 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.srcIpAddress}"){
$("#intype").val("${cfg.srcIpAddress}");
}else if("${cfg.srcPort}"){
$("#intype").val("${cfg.srcPort}");
} else{
}else if("${cfg.destIpAddress}"){
$("#intype").val("${cfg.destIpAddress}");
}else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
}
$("#seltype").change(function(){
@@ -85,7 +83,7 @@
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<form:select path="asnIpGroup" class="selectpicker select2 input-small" >
<form:select path="asnIpGroup" class="selectpicker select2 input-small" data-live-search="true" data-live-search-placeholder="search">
<form:option value=""><spring:message code='asn_ip_group'/></form:option>
<c:forEach items="${policyGroups}" var="policyGroup">
<form:option value="${policyGroup.serviceGroupId}"><spring:message code='${policyGroup.groupName}'/></form:option>

2
src/main/webapp/WEB-INF/views/cfg/asnPolicyCfgForm.jsp
View File

@@ -73,7 +73,7 @@ $(function(){
<div class="form-group">
<label class="control-label col-md-3"><spring:message code="group"/></label>
<div class="col-md-6">
<select name="userRegion1" class="selectpicker show-tick form-control required">
<select name="userRegion1" class="selectpicker show-tick form-control required" data-live-search="true" data-live-search-placeholder="search">
<c:forEach items="${policyGroups }" var="policyGroup">
<option value="${policyGroup.groupId}" <c:if test="${_cfg.userRegion1==policyGroup.groupId }">selected</c:if>><spring:message code="${policyGroup.groupName}"/></option>
</c:forEach>

4
src/main/webapp/WEB-INF/views/cfg/dnsIpCfgList.jsp
View File

@@ -8,8 +8,8 @@
//搜索框提示语初始化
if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.srcIpAddress}"){
$("#intype").val("${cfg.srcIpAddress}");
}else if("${cfg.destIpAddress}"){
$("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.srcPort}"){
$("#intype").val("${cfg.srcPort}");
} else{