From de96ba18c6739dfdaccc71ddf7685e0dd2a6e4a3 Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Wed, 27 Jun 2018 15:13:08 +0800
Subject: [PATCH] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8Fjs=E6=8F=90?=
 =?UTF-8?q?=E5=8F=96=E5=88=B0common.js=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/views/cfg/common/ipList.jsp       | 17 ++++----------
 .../webapp/WEB-INF/views/cfg/iplist/list.jsp  | 17 ++++----------
 .../webapp/static/global/scripts/common.js    | 23 ++++++++++++++++++-
 3 files changed, 30 insertions(+), 27 deletions(-)

diff --git a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
index 3aa30ba30..254ff8de7 100644
--- a/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/common/ipList.jsp
@@ -5,15 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
 	$(document).ready(function() {
-		$("td[compileId]").each(function(){
-			var data={};
-			data.date=new Date();
-			data.compileId=$(this).attr("compileId");
-			data.action=$(this).attr("action");
-			data.functionId=$(this).attr("functionId");
-			data.obj=$(this)
-			GetLogTotal('${ctx}',data);
-		});
 		//搜索框提示语初始化
 		if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
@@ -354,10 +345,10 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span data-audit="created" class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span data-audit="approved" class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span data-audit="unapproved" class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
 									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
diff --git a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
index 22b37cdf5..05be41786 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
@@ -5,15 +5,6 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
 	$(document).ready(function() {
-		$("td[compileId]").each(function(){
-			var data={};
-			data.date=new Date();
-			data.compileId=$(this).attr("compileId");
-			data.action=$(this).attr("action");
-			data.functionId=$(this).attr("functionId");
-			data.obj=$(this)
-			GetLogTotal('${ctx}',data);
-		});
 		//搜索框提示语初始化
 		if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
@@ -344,10 +335,10 @@
 									</td>
 									<td>
 										<c:forEach items="${fns:getDictList('SPEC_AUDIT')}" var="auditC">
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
-									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'created'}"><span data-audit="created" class="label label-danger"><spring:message code="created"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'approved'}"><span data-audit="approved" class="label label-success"><spring:message code="approved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'unapproved'}"><span data-audit="unapproved" class="label label-warning"><spring:message code="unapproved"></spring:message></span></c:if>
+									       <c:if test="${cfg.isAudit eq auditC.itemCode and auditC.itemValue eq 'cancel'}"><span  data-audit="cancel" class="label label-warning"><spring:message code="cancel_approved"></spring:message></span></c:if>
 							            </c:forEach>
 									</td>
 									<td functionId="${cfg.functionId}" compileId="${cfg.compileId}" action="${cfg.action}"><div class="loading-total"></div></td>
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index f722ff65c..f2d12a6f1 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -289,7 +289,28 @@ $(function(){
    $("input[name$='exprType']:checked").each(function(){
 	   setDefaultMatchMethod(this);
    });
-   
+   /*
+    *配置展示日志总数，审核通过才会调用接口查询日志总量
+	必须放在是否审核一列之后 
+	并且是否审核一列的span标签需配置data-audit="xxxx"属性
+	xxxx可用值为created，approved，unapproved，cancel 
+	td需要配置属性有，functionId，compileId，action
+    */
+   $("td[compileId]").each(function(){
+	   	var audit=$(this).prev().find("span").data("audit");
+	   	if(audit == "approved"){
+	   		var data={};
+			data.date=new Date();
+			data.compileId=$(this).attr("compileId");
+			data.action=$(this).attr("action");
+			data.functionId=$(this).attr("functionId");
+			data.audit=$(this).attr("audit");
+			data.obj=$(this)
+			GetLogTotal('${ctx}',data);
+	   	}else{
+	   		$(this).html("0");
+	   	}
+	});
 });
 //与表达式时，只允许为子串匹配
 var setDefaultMatchMethod=function (obj){