1、日志协议protocolCode、osCode、browserCode、behaviorCode字典查询处理

2、searchService条件查询处理
This commit is contained in:
leijun
2018-08-28 14:35:02 +08:00
parent 34b1caa445
commit f05696e7d5
3 changed files with 56 additions and 38 deletions

View File

@@ -5,8 +5,7 @@
<script type="text/javascript">
$(document).ready(function(){
//筛选功能
filterActionInit();
//reset
$("#resetBtn").on("click",function(){
$("select.selectpicker").each(function(){
@@ -20,7 +19,8 @@ $(document).ready(function(){
.attr("value",'');
$("#searchForm")[0].reset();
});
//筛选功能
filterActionInit();
});
</script>
@@ -58,24 +58,19 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<select path="action" class="selectpicker select2 input-small">
<option value=""><spring:message code="action"/></option>
<c:forEach items="${serviceList}" var="service"
<form:select path="action" class="selectpicker select2 input-small">
<%-- <form:option value=""><spring:message code="action"/></form:option>
--%> <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}"
<c:if test="${log.action eq dict.itemCode}">
selected
</c:if>
>
<spring:message code="${dict.itemValue}"/>
</option>
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:if>
</c:forEach>
</c:forEach>
</select>
</div>
</form:select>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
@@ -232,35 +227,35 @@ $(document).ready(function(){
</td>
<td>
<c:forEach items="${fns:getCodeList('protocolCode')}" var="dict">
<c:forEach items="${protocolList}" var="dict">
<c:if test="${dict.code eq log.labelProtoId}">
<spring:message code="${dict.item}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getCodeList('osCode')}" var="dict">
<c:forEach items="${osList}" var="dict">
<c:if test="${dict.code eq log.labelOsId}">
<spring:message code="${dict.item}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getCodeList('browserCode')}" var="dict">
<c:forEach items="${browserList}" var="dict">
<c:if test="${dict.code eq log.labelBsId}">
<spring:message code="${dict.item}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict">
<c:forEach items="${behaviorList}" var="dict">
<c:if test="${dict.code eq log.labelBehavId}">
<spring:message code="${dict.item}"/>
</c:if>
</c:forEach>
</td>
<td>
<c:forEach items="${fns:getCodeList('appCode')}" var="dict">
<c:forEach items="${appList}" var="dict">
<c:if test="${dict.code eq log.labelAppId}">
<spring:message code="${dict.item}"/>
</c:if>

View File

@@ -46,24 +46,18 @@
<input id="isFilterAction" name="isFilterAction" type="hidden" value="${log.isFilterAction }"/>
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<select path="action" class="selectpicker select2 input-small">
<option value=""><spring:message code="action"/></option>
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<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}"
<c:if test="${log.action eq dict.itemCode}">
selected
</c:if>
>
<spring:message code="${dict.itemValue}"/>
</option>
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.action ne 32)}">
<form:option value="${dict.itemCode}"><spring:message code="${dict.itemValue}"/></form:option>
</c:if>
</c:forEach>
</c:forEach>
</select>
</form:select>
</div>
<div class="pull-left">
<div class="input-group">