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

16号之前的版本asn还是为单独业务，检索条件区分asn的block和monitor

Browse Source
This commit is contained in:
duandongmei
2019-01-25 17:46:49 +06:00
parent a2dc1dd6f5
commit 736c4cda04
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/WEB-INF/views/log/ntc/ipList.jsp
View File

@@ -99,8 +99,12 @@
<c:forEach items="${serviceList}" var="service"
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) && (service.serviceId ne 37)&& (service.serviceId ne 149) }">
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32) && (service.action ne 96) }">
<form:option value="${service.serviceId}">
<c:if test="${(service.serviceId eq 37) || (service.serviceId eq 149) }">ASN </c:if>
<spring:message code="${dict.itemValue}"></spring:message>
</form:option>
</c:if>
</c:forEach>
</c:forEach>

5
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -603,11 +603,14 @@ white-space:nowrap;
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${serviceList}" var="service" >
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149) }">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) }">
<c:choose>
<c:when test="${(service.serviceId eq 40) || (service.serviceId eq 152)}">
<form:option value="${service.serviceId}"><spring:message code="keywords"/> <spring:message code="${dict.itemValue}"/></form:option>
</c:when>
<c:when test="${(service.serviceId eq 37) || (service.serviceId eq 149)}">
<form:option value="${service.serviceId}">ASN <spring:message code="${dict.itemValue}"/></form:option>
</c:when>
<c:otherwise>
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
</c:otherwise>