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

bgp增加cfgId查询

Browse Source 
p2p日志界面 action只有一个的的时候不显示检索条件
This commit is contained in:
leijun
2018-08-22 14:34:08 +08:00
parent c75eee3dd0
commit 5a5bf7c0f8
2 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/cfg/other/bgpList.jsp
View File

@@ -9,6 +9,8 @@
//搜索框提示语初始化 //搜索框提示语初始化
if("${cfg.cfgDesc}"){ if("${cfg.cfgDesc}"){
$("#intype").val("${cfg.cfgDesc}"); $("#intype").val("${cfg.cfgDesc}");
}else if("${cfg.compileId}"){
$("#intype").val("${cfg.compileId}");
}else{ }else{
$("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text()); $("#intype").attr("placeholder","<spring:message code='input'/> "+$("#seltype").find("option:selected").text());
} }
@@ -132,6 +134,7 @@
<form:select path="seltype" class="selectpicker select2 input-small" > <form:select path="seltype" class="selectpicker select2 input-small" >
<form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option> <form:option value="cfgDesc"><spring:message code="config_describe"></spring:message></form:option>
<form:option value="compileId"><spring:message code="cfg_id"></spring:message></form:option>
<%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option> <%-- <form:option value="voipIp.srcIpAddress"><spring:message code="client_ip"/></form:option>
<form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option> <form:option value="voipIp.srcPort"><spring:message code="client_port"/></form:option>
<form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option> <form:option value="voipAccount.cfgKeywords"><spring:message code="key_word"/></form:option>
@@ -306,6 +309,7 @@
<thead> <thead>
<tr> <tr>
<th><input type="checkbox" class="i-checks" id="checkAll"></th> <th><input type="checkbox" class="i-checks" id="checkAll"></th>
<th style="display: none"><spring:message code="cfg_id"/></th>
<th class="cfgDesc"><spring:message code="config_describe"/></th> <th class="cfgDesc"><spring:message code="config_describe"/></th>
<th><spring:message code="block_type"/></th> <th><spring:message code="block_type"/></th>
<th><spring:message code="do_log"/></th> <th><spring:message code="do_log"/></th>
@@ -332,6 +336,7 @@
<span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span> <span id="open${status.index}" class="" compileId="${indexCfg.compileId}" cfgId="${indexCfg.cfgId}"> ▷ </span><span style="display: none" id="close${status.index}" > ▼ </span>
<input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}"> <input type="checkbox" class="i-checks child-checks" id="${indexCfg.cfgId}" value="${indexCfg.isAudit}">
</td> </td>
<td>${indexCfg.compileId }</td>
<td>${indexCfg.cfgDesc }</td> <td>${indexCfg.cfgDesc }</td>
<td> <td>
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">

22
src/main/webapp/WEB-INF/views/log/ntc/p2pList.jsp
View File

@@ -6,6 +6,7 @@
P2P<spring:message code="log"></spring:message> P2P<spring:message code="log"></spring:message>
</title> </title>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
//reset //reset
$("#resetBtn").on("click",function(){ $("#resetBtn").on("click",function(){
@@ -48,15 +49,24 @@
<!-- 搜索内容与操作按钮栏 --> <!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12"> <div class="col-md-12">
<div class="pull-left"> <div class="pull-left">
<select path="action" class="selectpicker select2 input-small"> <select id="action" path="action" class="selectpicker select2 input-small">
<option value=""><spring:message code="action"/></option> <c:set var="actionIndex" value="0"></c:set>
<c:forEach items="${serviceList}" var="service" <c:forEach items="${serviceList}" var="service" varStatus="satus">
varStatus="satus">
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict"> <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)}"> --%> <c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">
<c:set var="actionIndex" value="${actionIndex+1}"></c:set>
</c:if>
</c:forEach>
</c:forEach>
<c:if test="${ (actionIndex > 1) || (actionIndex == 0) }">
<option value=""><spring:message code="action"/></option>
</c:if>
<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)}">
<option value="${dict.itemCode}" <option value="${dict.itemCode}"
<c:if test="${log.action eq dict.itemCode}"> <c:if test="${log.action eq dict.itemCode}">
selected selected="selected"
</c:if> </c:if>
> >
<spring:message code="${dict.itemValue}"/> <spring:message code="${dict.itemValue}"/>