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

解决冲突

Browse Source
This commit is contained in:
zhanghongqing
2018-08-02 14:51:06 +08:00
parent 4819b2f6f7
commit f424fa108b
1 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -184,8 +184,11 @@
<a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a> <a href="javascript:void(0)" name="viewLogInfo"><i class="icon-book-open"></i></a>
</td> </td>
<td> <td>
<c:if test="${_log.action eq 16 }"><spring:message code="action_reject"/></c:if> <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict">
<c:if test="${_log.action eq 1 }"><spring:message code="action_monit"/></c:if> <c:if test="${dict.itemCode eq _log.action}">
<spring:message code="${dict.itemValue}"/>
</c:if>
</c:forEach>
</td> </td>
<td>${_log.foundTime }</td> <td>${_log.foundTime }</td>
<td>${_log.entranceId }</td> <td>${_log.entranceId }</td>