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

修改asn查询条件

Browse Source
This commit is contained in:
zhangwei
2019-01-18 16:33:16 +06:00
parent 25ea439564
commit 216c64b031
3 changed files with 53 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,6 +184,9 @@
<if test="detail != null"> <if test="detail != null">
AND r.detail like concat(concat('%',#{detail,jdbcType=VARCHAR}),'%') AND r.detail like concat(concat('%',#{detail,jdbcType=VARCHAR}),'%')
</if> </if>
<if test="userRegion1 != null">
AND r.user_region1 like concat(concat('%',#{userRegion1,jdbcType=VARCHAR}),'%')
</if>
<!-- 数据范围过滤 --> <!-- 数据范围过滤 -->
${sqlMap.dsf} ${sqlMap.dsf}

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

@@ -143,7 +143,7 @@
<div class="pull-left"> <div class="pull-left">
<div class="input-group"> <%-- <div class="input-group">
<div class="input-group-btn"> <div class="input-group-btn">
<form:select path="seltype" class="selectpicker select2 input-small" > <form:select path="seltype" class="selectpicker select2 input-small" >
@@ -157,7 +157,37 @@
<input id="intype" class="form-control input-medium" type="text" value=""> <input id="intype" class="form-control input-medium" type="text" value="">
</div> </div> --%>
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="organization"/></span>
</div>
<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="asn_no"/></span>
</div>
<input name="asnId" id="asnId" type="text" class="form-control input-medium" value="${cfg.asnId}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="country"/></span>
</div>
<input name="country" id="country" type="text" class="form-control input-medium" value="${cfg.country}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="detail"/></span>
</div>
<input name="detail" id="detail" type="text" class="form-control input-medium" value="${cfg.detail}" />
</div>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button>

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

@@ -11,7 +11,7 @@
}else if("${cfg.destIpAddress}"){ }else if("${cfg.destIpAddress}"){
$("#intype").val("${cfg.destIpAddress}"); $("#intype").val("${cfg.destIpAddress}");
}else if("${cfg.organization}"){ }else if("${cfg.organization}"){
$("#intype").val("${cfg.organization}"); //$("#intype").val("${cfg.organization}");
}else if("${cfg.country}"){ }else if("${cfg.country}"){
$("#intype").val("${cfg.country}"); $("#intype").val("${cfg.country}");
}else if("${cfg.detail}"){ }else if("${cfg.detail}"){
@@ -135,7 +135,7 @@
<form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option> <form:option value="destIpAddress"><spring:message code="IP"></spring:message></form:option>
<%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%> <%-- <form:option value="destPort"><spring:message code="port"></spring:message></form:option> --%>
<form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option> <form:option value="isValid"><spring:message code="valid_identifier"></spring:message></form:option>
<form:option value="organization"><spring:message code="organization"></spring:message></form:option> <%-- <form:option value="organization"><spring:message code="organization"></spring:message></form:option> --%>
<form:option value="country"><spring:message code="country"></spring:message></form:option> <form:option value="country"><spring:message code="country"></spring:message></form:option>
<form:option value="detail"><spring:message code="detail"></spring:message></form:option> <form:option value="detail"><spring:message code="detail"></spring:message></form:option>
</form:select> </form:select>
@@ -153,6 +153,22 @@
</div> </div>
</div> </div>
<div class="pull-left"> <div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="organization"/></span>
</div>
<input name="organization" id="organization" type="text" class="form-control input-medium" value="${cfg.organization}" />
</div>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
<span class="form-control" ><spring:message code="asn_no"/></span>
</div>
<input name="userRegion1" id="userRegion1" type="text" class="form-control input-medium" value="${cfg.userRegion1}" />
</div>
</div>
<div class="pull-left">
<button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </button> <button type="button" class="btn blue" onClick="return page()"> <i class="fa fa-search"></i> <spring:message code="search"/> </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="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"/> <i class="fa fa-angle-double-down"></i></button> <button type="button" class="btn btn-default" id="filter-btn"> <spring:message code="filter"/> <i class="fa fa-angle-double-down"></i></button>