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

Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop

Browse Source
This commit is contained in:
duandongmei
2018-08-18 20:41:38 +08:00
parent 2b55c19c54 cbeaaadb00
commit 56cb6f1df2
2 changed files with 25 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/views/log/manipulation/dkBehaviorList.jsp
View File

@@ -29,7 +29,15 @@ $(document).ready(function(){
<div class="page-content"> <div class="page-content">
<h3 class="page-title"> <h3 class="page-title">
<spring:message code="dk_behavior"/> <c:if test="${log.functionId == 407}">
<spring:message code="basic_protocol"/>
</c:if>
<c:if test="${log.functionId == 408}">
<spring:message code="encrypted_tunnel_behavior"/>
</c:if>
<c:if test="${log.functionId == 63}">
<spring:message code="app_policy_config"/>
</c:if>
<small><spring:message code="date_list"/></small> <small><spring:message code="date_list"/></small>
</h3> </h3>

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

@@ -48,15 +48,24 @@
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small"> <select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option> <option value=""><spring:message code="action"/></option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="dict"> <c:forEach items="${serviceList}" var="service"
<c:if test="${(dict.itemValue eq 'action_monit') or (dict.itemValue eq 'action_reject')}"> varStatus="satus">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option> <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)}"> --%>
<option value="${dict.itemCode}"
<c:if test="${log.action eq dict.itemCode}">
selected
</c:if>
>
<spring:message code="${dict.itemValue}"/>
</option>
</c:if> </c:if>
</c:forEach> </c:forEach>
</form:select> </c:forEach>
</div> </select>
</div>
<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">