日志action条件修改

This commit is contained in:
duandongmei
2018-08-18 14:59:49 +08:00
parent 4fd3f5c210
commit e8d7fc7373
31 changed files with 223 additions and 52 deletions

View File

@@ -50,13 +50,25 @@ $(document).ready(function(){
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<%-- <div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<form:option value="16"><spring:message code="action_reject"/></form:option>
<form:option value="1"><spring:message code="action_monit"/></form:option>
</form:select>
</div> --%>
<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"
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>
</c:forEach>
</c:forEach>
</select>
</div>
<div class="pull-left">
<div class="input-group">
<div class="input-group-btn">
@@ -163,8 +175,8 @@ $(document).ready(function(){
<th><spring:message code='entrance'/></th>
<th><spring:message code='behavior_protocol'/></th>
<%-- <th><spring:message code='os_type'/></th>
<th><spring:message code='browser_type'/></th> --%>
<th><spring:message code='os_type'/></th>
<th><spring:message code='browser_type'/></th>
<th><spring:message code='behaviour_type'/></th>
<th><spring:message code='social_app'/></th>
<th><spring:message code='c2s_pkt_num'/></th>
@@ -219,7 +231,7 @@ $(document).ready(function(){
</c:if>
</c:forEach>
</td>
<%-- <td>
<td>
<c:forEach items="${fns:getCodeList('osCode')}" var="dict">
<c:if test="${dict.code eq log.labelOsId}">
<spring:message code="${dict.item}"/>
@@ -232,7 +244,7 @@ $(document).ready(function(){
<spring:message code="${dict.item}"/>
</c:if>
</c:forEach>
</td> --%>
</td>
<td>
<c:forEach items="${fns:getCodeList('behaviorCode')}" var="dict">
<c:if test="${dict.code eq log.labelBehavId}">

View File

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