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

1.由配置跳转日志查询默认时间修改为前五分钟 2.报表Action检索条件修改

Browse Source
This commit is contained in:
zhangwq
2018-12-10 11:09:04 +08:00
parent c8c3a51f37
commit bf3bf9dc7b
3 changed files with 36 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/webapp/WEB-INF/views/report/list.jsp
View File

@@ -373,21 +373,21 @@ white-space:nowrap;
</head>
<body>
<div class="page-content">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<%-- <div class="theme-panel hidden-xs hidden-sm">
<c:forEach items="${serviceList}" var="service" varStatus="status">
<c:if test="${(service.action ne 128) && (service.serviceId ne 37) && (service.serviceId ne 149)}" >
<div data-service="${service.serviceId}" class="service btn">
<spring:message code="total"/>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
<spring:message code="${action.itemValue}"/>
<c:if test="${action.itemCode eq service.action}">
<spring:message code="${service.actionCode}"/>
</c:if>
</c:forEach>
<span>0</span>
</div>
</c:if>
</c:forEach>
</div> --%>
</div> --%>
<h3 class="page-title">
<spring:message code="${bean.cfgName}"/>
<small><spring:message code="report_list"/></small>
@@ -415,7 +415,7 @@ white-space:nowrap;
<c:forEach items="${serviceList}" var="service" >
<c:forEach items="${fns:getDictList('SERVICE_ACTION') }" var="dict">
<c:if test="${(dict.itemCode eq service.action) && (service.action ne 128) && (service.serviceId ne 37)&& (service.serviceId ne 149) }">
<form:option value="${service.serviceId}"><spring:message code="${dict.itemValue}"/></form:option>
<form:option value="${service.serviceId}"><spring:message code="${service.actionCode}"/></form:option>
</c:if>
</c:forEach>
</c:forEach>