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

(1)实时报表动作替换为serviceId

Browse Source 
(2)配置日志总量统计查询条件action替换为serviceId
(3)配置列表日志总量列加入serviceId
(4)配置日志总量跳转到日志列表action替换为serviceId
(5)配置日志相关js提取到pzLog。js中
This commit is contained in:
wangxin
2018-09-30 10:54:30 +08:00
parent e69191219a
commit 025182e551
51 changed files with 235 additions and 240 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,8 +92,8 @@ $(document).ready(function() {
});
function getXlsxFileName() {
var cfgName = $("[name=cfgName2]").val() + "_";
if ("${bean.action}") {
var action = $("[name=action]").find('[value=' + "${bean.action}" + ']').text() + "_";
if ("${bean.serviceId}") {
var action = $("[name=serviceId]").find('[value=' + "${bean.serviceId}" + ']').text() + "_";
} else {
var action = "";
}
@@ -142,9 +142,16 @@ var reportDate=0;
var ajaxServiceLogTotal=function(){
var services=[];
var objs=[];
var serviceIndex=0;
$(".service").each(function(){
if(serviceIndex%2==0){
$(this).addClass("btn-primary");
}else{
$(this).addClass("btn-default");
}
objs.push($(this));
services.push($(this).data("service"));
serviceIndex++;
});
var timeout=$.validator.messages.timeout;
var failed=$.validator.messages.failed;
@@ -195,7 +202,7 @@ var ajaxReport=function(url,target){
cache:false,
url:'${ctx}'+url,// /report/ajaxNtcTagReport
data:{
"action":$('[name="action"]').val(),
"serviceId":$('[name="serviceId"]').val(),
"reportType":$('[name="reportType"]').val(),
"reportTime":$('[name="reportTime"]').val(),
"functionId":$('[name="functionId"]').val()
@@ -355,15 +362,13 @@ function customColumnClick(){
<body>
<div class="page-content">
<div class="theme-panel hidden-xs hidden-sm">
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action">
<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action"> --%>
<c:forEach items="${serviceList}" var="service" varStatus="status">
<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
<c:if test="${service.serviceId ne 5}">
<c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96)}" >
<div data-service="${service.serviceId}" class="service btn
<c:if test="${status.index%2==0}">btn-primary</c:if>
<c:if test="${status.index%2!=0}">btn-default</c:if>">
<spring:message code="${action.itemValue}"/>
<div data-service="${service.serviceId}" class="service btn">
<spring:message code="${service.serviceName}"/>
<spring:message code="log_total"/>
<span>0</span>
</div>
@@ -371,18 +376,16 @@ function customColumnClick(){
</c:if>
<c:if test="${service.serviceId eq 5}">
<c:if test="${(service.action ne 128) && (service.action ne 96)}" >
<div data-service="${service.serviceId}" class="service btn
<c:if test="${status.index%2==0}">btn-primary</c:if>
<c:if test="${status.index%2!=0}">btn-default</c:if>">
<spring:message code="${action.itemValue}"/>
<div data-service="${service.serviceId}" class="service btn">
<spring:message code="${service.serviceName}"/>
<spring:message code="log_total"/>
<span>0</span>
</div>
</c:if>
</c:if>
</c:if>
<%-- </c:if> --%>
</c:forEach>
</c:forEach>
<%-- </c:forEach> --%>
</div>
<h3 class="page-title">
<spring:message code="${bean.cfgName}"/>
@@ -398,7 +401,7 @@ function customColumnClick(){
<input name="cfgName" type="hidden" value="${bean.cfgName}"/>
<input name="cfgName2" type="hidden" value="<spring:message code="${bean.cfgName}"/>"/>
<input name="action2" type="hidden" value="<spring:message code="${bean.action}"/>"/>
<input name="serviceId2" type="hidden" value="<spring:message code="${bean.serviceId}"/>"/>
<input id="reportBusinessType" name="reportBusinessType" type="hidden" value="${bean.reportBusinessType}"/>
<!-- 筛选按钮展开状态-->
@@ -406,24 +409,24 @@ function customColumnClick(){
<!-- 搜索内容与操作按钮栏 -->
<div class="col-md-12">
<div class="pull-left">
<form:select path="action" class="selectpicker select2 input-small">
<form:select path="serviceId" class="selectpicker select2 input-small">
<form:option value=""><spring:message code="action"/></form:option>
<c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" >
<%-- <c:forEach items="${fns:getDictList('SERVICE_ACTION')}" var="action" > --%>
<c:forEach items="${serviceList}" var="service" >
<c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}">
<%-- <c:if test="${service.functionId eq bean.functionId and action.itemCode eq service.action}"> --%>
<c:if test="${service.serviceId ne 5}">
<c:if test="${(service.action ne 128) && (service.action ne 32) && (service.action ne 96) }" >
<form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
<form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
</c:if>
</c:if>
<c:if test="${service.serviceId eq 5}">
<c:if test="${(service.action ne 128) && (service.action ne 96) }" >
<form:option value="${action.itemCode}" ><spring:message code="${action.itemValue}"/></form:option>
<form:option value="${service.serviceId}" ><spring:message code="${service.serviceName}"/></form:option>
</c:if>
</c:if>
</c:if>
<%-- </c:if> --%>
</c:forEach>
</c:forEach>
<%-- </c:forEach> --%>
</form:select>
</div>
<div class="pull-left">