ipCfgList.jsp冲突解决

This commit is contained in:
wangxin
2018-03-07 09:47:20 +08:00
parent 9e32bbdb23
commit 6ecec91f22

View File

@@ -23,9 +23,12 @@
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="refresh"></spring:message></button>
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}'"><spring:message code="add"></spring:message></button>
<button type="button" class="btn btn-default" onclick="location='${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="refresh"></spring:message></button>
<c:if test="${audit==0}">
<button type="button" class="btn btn-primary"
onClick="javascript:window.location='${ctx}/cfg/ip/form?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}'"><spring:message code="add"></spring:message></button>
</c:if>
</div>
<h3 class="page-title">
@@ -50,7 +53,8 @@
</div>
<div class="portlet-body">
<div class="row" >
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}" method="post" class="form-search">
<form:form id="searchForm" modelAttribute="ipCfg" action="${ctx}/cfg/ip/list?serviceId=${serviceId}&action=${action}&cfgName=${cfgName}&audit=${audit}" method="post" class="form-search">
<input id="audit" name="audit" type="hidden" value="${audit}"/>
<input id="pageNo" name="pageNo" type="hidden" value="${page.pageNo}"/>
<input id="pageSize" name="pageSize" type="hidden" value="${page.pageSize}"/>
<div class="col-md-12">
@@ -108,8 +112,8 @@
<!-- <th>编译id</th> -->
<th><spring:message code="whether_area_block"/></th>
<th><spring:message code="type"/></th>
<th><spring:message code="label"/></th>
<th><spring:message code="attribute"/></th>
<th><spring:message code="label"/></th>
<!-- <th>区域生效id</th> -->
<th><spring:message code="valid_identifier"/></th>
<th><spring:message code="is_audit"/></th>
@@ -136,8 +140,15 @@
<td>${ipCfg.dstIpMask }</td>
<td>${ipCfg.dstPort }</td>
<td>${ipCfg.dstPortMask }</td>
<td>${ipCfg.direction }</td>
<td>${ipCfg.protocol }</td>
<td>
<c:if test="${ipCfg.direction==0}"><spring:message code="twoway"/></c:if>
<c:if test="${ipCfg.direction==1}"><spring:message code="oneway"/></c:if>
</td>
<td>
<c:if test="${ipCfg.protocol==6}"><spring:message code="TCP"/></c:if>
<c:if test="${ipCfg.protocol==17}"><spring:message code="UDP"/></c:if>
<c:if test="${ipCfg.protocol==0}"><spring:message code="arbitrary"/></c:if>
</td>
<%-- <td>${ipCfg.protocolId }</td> --%>
<td>
<c:if test="${1 eq ipCfg.action }"><spring:message code="block"/></c:if>