Merge branch 'develop' of http://10.0.6.99/gwall/gwall.git into develop
This commit is contained in:
@@ -96,6 +96,7 @@
|
||||
<script src="${pageContext.request.contextPath}/static/global/scripts/jquery.tagsinput.js" type="text/javascript"></script>
|
||||
<script src="${pageContext.request.contextPath}/static/global/scripts/app.js" type="text/javascript"></script>
|
||||
<script src="${pageContext.request.contextPath}/static/global/scripts/ipRegion.js" type="text/javascript"></script>
|
||||
<script src="${pageContext.request.contextPath}/static/global/scripts/pzLog.js" type="text/javascript"></script>
|
||||
<!-- 文件导入 -->
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/bootstrap-fileupload.js" type="text/javascript"></script>
|
||||
<script src="${pageContext.request.contextPath}/static/global/plugins/bootstrap-fileupload/js/jquery.cookie.min.js" type="text/javascript"></script>
|
||||
|
||||
@@ -383,7 +383,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -445,7 +445,7 @@
|
||||
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${cfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${cfg.editorName }</td>
|
||||
|
||||
@@ -421,7 +421,7 @@
|
||||
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td> --%>
|
||||
<%-- <td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${cfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${cfg.editorName }</td>
|
||||
|
||||
@@ -461,7 +461,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -448,7 +448,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -439,7 +439,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -143,7 +143,7 @@
|
||||
<form:select id="actionSelect" path="action" class="selectpicker select2 input-small" >
|
||||
<form:option value=""><spring:message code="select"/></form:option>
|
||||
<c:forEach items="${serviceList}" var="service">
|
||||
<form:option value="${service.action }"><spring:message code="${service.serviceName}"/> <spring:message code="action_${service.actionCode }"/></form:option>
|
||||
<form:option value="${service.action }"><spring:message code="${service.serviceName}"/></form:option>
|
||||
</c:forEach>
|
||||
</form:select>
|
||||
<form:select path="isValid" class="selectpicker select2 input-small" >
|
||||
@@ -441,7 +441,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -445,7 +445,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -446,7 +446,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -446,7 +446,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -712,7 +712,7 @@
|
||||
</c:choose>
|
||||
</td>
|
||||
<c:if test="${action ne 128}">
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
</c:if>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
|
||||
@@ -343,7 +343,7 @@
|
||||
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>
|
||||
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
|
||||
<c:if test="${cfg.isAreaEffective==1}">
|
||||
|
||||
@@ -346,7 +346,7 @@
|
||||
<c:when test="${cfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${cfg.isAudit}" functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}" serviceId="${cfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>
|
||||
<c:if test="${cfg.isAreaEffective==0}"><spring:message code="all"/></c:if>
|
||||
<c:if test="${cfg.isAreaEffective==1}">
|
||||
|
||||
@@ -450,7 +450,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -602,7 +602,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -443,7 +443,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td>
|
||||
<td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -444,7 +444,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -443,7 +443,7 @@
|
||||
<c:when test="${indexCfg.isAudit eq '3'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:when>
|
||||
</c:choose>
|
||||
</td>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}"><div class="loading-total"></div></td> --%>
|
||||
<%-- <td audit="${indexCfg.isAudit}" functionId="${indexCfg.functionId}" compileId="${indexCfg.compileId}" action="${indexCfg.action}" serviceId="${indexCfg.serviceId}"><div class="loading-total"></div></td> --%>
|
||||
<td>${indexCfg.creatorName }</td>
|
||||
<td><fmt:formatDate value="${indexCfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
|
||||
<td>${indexCfg.editorName }</td>
|
||||
|
||||
@@ -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">
|
||||
|
||||
@@ -345,8 +345,6 @@ $(function(){
|
||||
$("input[name$='exprType']:checked").each(function(){
|
||||
//setDefaultMatchMethod(this);
|
||||
});
|
||||
//获取配置日志总数
|
||||
getTotalLog();
|
||||
$(".action").on("change", function() {
|
||||
$("#serviceId").val($(this).attr("serviceId"));
|
||||
$("#protocolId").val($(this).attr("protocolId"));
|
||||
@@ -1346,120 +1344,6 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
|
||||
|
||||
});
|
||||
}
|
||||
var getTotalLog=function(){
|
||||
/*
|
||||
td需要配置属性有,audit,functionId,compileId,action
|
||||
*/
|
||||
var data={};
|
||||
//data.date=new Date();
|
||||
data.compileIds=[];
|
||||
data.actions=[];
|
||||
data.objs=[];
|
||||
$("td[compileId]").each(function(){
|
||||
var audit=$(this).attr("audit");
|
||||
var compileId=$(this).attr("compileId");
|
||||
var action=$(this).attr("action");
|
||||
var functionId=$(this).attr("functionId");
|
||||
if(audit&&compileId&&action&&functionId){
|
||||
if(audit == 1){
|
||||
var has=false;
|
||||
for(var i=0;i<data.actions.length;i++){
|
||||
if(data.actions[i]==$(this).attr("action")){
|
||||
has=true;
|
||||
}
|
||||
}
|
||||
if(!has){
|
||||
data.actions.push($(this).attr("action"));
|
||||
}
|
||||
//$(this).attr("date",data.date.getTime());
|
||||
data.compileIds.push($(this).attr("compileId"));
|
||||
data.functionId=$(this).attr("functionId");
|
||||
data.objs.push($(this));
|
||||
}else{
|
||||
$(this).html("0");
|
||||
}
|
||||
}else{
|
||||
$(this).html("0");
|
||||
}
|
||||
});
|
||||
if(data.compileIds.length>0){
|
||||
GetLogTotal(data);
|
||||
}
|
||||
|
||||
}
|
||||
var GetLogTotal=function(_data){
|
||||
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
|
||||
var timeStamp;
|
||||
if(_data.date){
|
||||
timeStamp=_data.date.valueOf();
|
||||
}/*else{
|
||||
timeStamp=(new Date()).valueOf();
|
||||
}*/
|
||||
var totalTrs=$(_data.objs);
|
||||
var timeout=$.validator.messages.timeout;
|
||||
var failed=$.validator.messages.failed;
|
||||
var request=$.ajax({
|
||||
type:'post',
|
||||
timeout:10000,//超时时间设置,查询接口时间过长超时
|
||||
url:pathName+'/report/ajaxGetLogTotal',
|
||||
data:{"endTime":timeStamp,"actions":_data.actions.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
|
||||
dataType:'json',
|
||||
async:true,
|
||||
success:function(data,textStatus){//处理返回结果
|
||||
if(textStatus=="success"){
|
||||
totalTrs.each(function(){
|
||||
var hasLog=false;
|
||||
for(var i=0;i<data.length;i++){
|
||||
if($(this).attr("compileId")==data[i].compileId){
|
||||
$(this).attr("id",i+"logTotal");
|
||||
$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
|
||||
hasLog=true;
|
||||
}
|
||||
}
|
||||
if(!hasLog){
|
||||
$(this).html("0");
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
complete:function(XMLHttpRequest,status){//超时设置
|
||||
if(status=="timeout"){
|
||||
totalTrs.each(function(){
|
||||
$(this).html(timeout);
|
||||
})
|
||||
}else if(status !="success"){
|
||||
totalTrs.each(function(){
|
||||
$(this).html(failed);
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var toLogSearch = function(index){
|
||||
// 保存配置界面URL
|
||||
$("#searchForm").each(function(){
|
||||
var cfgUrl = $(this).attr("action");
|
||||
sessionStorage.removeItem('cfgUrl');
|
||||
sessionStorage.setItem('cfgUrl',cfgUrl);
|
||||
});
|
||||
|
||||
var td = document.getElementById(index+"logTotal");
|
||||
$("td[compileId]").each(function(){
|
||||
if($(this).attr("id") == index+"logTotal"){
|
||||
// 获取检索日志参数
|
||||
var action=$(this).attr("action");
|
||||
var compileId=$(this).attr("compileId");
|
||||
var functionId=$(this).attr("functionId");
|
||||
var date=$(this).attr("date");
|
||||
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
|
||||
|
||||
window.location.href = pathName+"/toLogSearch?action="+action+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
|
||||
//删除区域IP
|
||||
function delAreaIp(obj){
|
||||
|
||||
121
src/main/webapp/static/global/scripts/pzLog.js
Normal file
121
src/main/webapp/static/global/scripts/pzLog.js
Normal file
@@ -0,0 +1,121 @@
|
||||
/**
|
||||
* 处理配置日志总量以及跳转日志界面
|
||||
*/
|
||||
$(function(){
|
||||
//获取配置日志总数
|
||||
getTotalLog();
|
||||
});
|
||||
var getTotalLog=function(){
|
||||
/*
|
||||
td需要配置属性有,audit,functionId,compileId,action
|
||||
*/
|
||||
var data={};
|
||||
//data.date=new Date();
|
||||
data.compileIds=[];
|
||||
data.serviceIds=[];
|
||||
data.objs=[];
|
||||
$("td[compileId]").each(function(){
|
||||
var audit=$(this).attr("audit");
|
||||
var compileId=$(this).attr("compileId");
|
||||
var serviceId=$(this).attr("serviceId");
|
||||
var functionId=$(this).attr("functionId");
|
||||
if(audit&&compileId&&functionId&&serviceId){
|
||||
if(audit == 1){
|
||||
var has=false;
|
||||
for(var i=0;i<data.serviceIds.length;i++){
|
||||
if(data.serviceIds[i]==$(this).attr("serviceId")){
|
||||
has=true;
|
||||
}
|
||||
}
|
||||
if(!has){
|
||||
data.serviceIds.push($(this).attr("serviceId"));
|
||||
}
|
||||
//$(this).attr("date",data.date.getTime());
|
||||
data.compileIds.push($(this).attr("compileId"));
|
||||
data.functionId=$(this).attr("functionId");
|
||||
data.objs.push($(this));
|
||||
}else{
|
||||
$(this).html("0");
|
||||
}
|
||||
}else{
|
||||
$(this).html("0");
|
||||
}
|
||||
});
|
||||
if(data.compileIds.length>0){
|
||||
GetLogTotal(data);
|
||||
}
|
||||
|
||||
}
|
||||
var GetLogTotal=function(_data){
|
||||
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
|
||||
var timeStamp;
|
||||
if(_data.date){
|
||||
timeStamp=_data.date.valueOf();
|
||||
}/*else{
|
||||
timeStamp=(new Date()).valueOf();
|
||||
}*/
|
||||
var totalTrs=$(_data.objs);
|
||||
var timeout=$.validator.messages.timeout;
|
||||
var failed=$.validator.messages.failed;
|
||||
var request=$.ajax({
|
||||
type:'post',
|
||||
timeout:10000,//超时时间设置,查询接口时间过长超时
|
||||
url:pathName+'/report/ajaxGetLogTotal',
|
||||
data:{"endTime":timeStamp,"serviceIds":_data.serviceIds.join(','),"functionId":_data.functionId,"compileIds":_data.compileIds.join(',')},
|
||||
dataType:'json',
|
||||
async:true,
|
||||
success:function(data,textStatus){//处理返回结果
|
||||
if(textStatus=="success"){
|
||||
totalTrs.each(function(){
|
||||
var hasLog=false;
|
||||
for(var i=0;i<data.length;i++){
|
||||
if($(this).attr("compileId")==data[i].compileId){
|
||||
$(this).attr("id",i+"logTotal");
|
||||
$(this).html("<a href='javascript:;' onclick='toLogSearch("+i+")'>"+data[i].sum+"<a>");
|
||||
hasLog=true;
|
||||
}
|
||||
}
|
||||
if(!hasLog){
|
||||
$(this).html("0");
|
||||
}
|
||||
})
|
||||
}
|
||||
},
|
||||
complete:function(XMLHttpRequest,status){//超时设置
|
||||
if(status=="timeout"){
|
||||
totalTrs.each(function(){
|
||||
$(this).html(timeout);
|
||||
})
|
||||
}else if(status !="success"){
|
||||
totalTrs.each(function(){
|
||||
$(this).html(failed);
|
||||
})
|
||||
}
|
||||
}
|
||||
});
|
||||
}
|
||||
|
||||
var toLogSearch = function(index){
|
||||
// 保存配置界面URL
|
||||
$("#searchForm").each(function(){
|
||||
var cfgUrl = $(this).attr("action");
|
||||
sessionStorage.removeItem('cfgUrl');
|
||||
sessionStorage.setItem('cfgUrl',cfgUrl);
|
||||
});
|
||||
|
||||
var td = document.getElementById(index+"logTotal");
|
||||
$("td[compileId]").each(function(){
|
||||
if($(this).attr("id") == index+"logTotal"){
|
||||
// 获取检索日志参数
|
||||
var serviceId=$(this).attr("serviceId");
|
||||
var compileId=$(this).attr("compileId");
|
||||
var functionId=$(this).attr("functionId");
|
||||
var date=$(this).attr("date");
|
||||
var pathName=window.document.location.pathname.substring(0,window.document.location.pathname.indexOf("/nis")+4);
|
||||
|
||||
window.location.href = pathName+"/toLogSearch?service="+serviceId+"&functionId="+functionId+"&cfgId="+compileId+"&date="+date+"&isLogTotalSearch=yes";
|
||||
|
||||
}
|
||||
});
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user