From 5a3bb59f17466324658d23ab2acb33ef73739dfc Mon Sep 17 00:00:00 2001
From: wangxin <wangxin@intranet.com>
Date: Tue, 12 Jun 2018 11:24:19 +0800
Subject: [PATCH] =?UTF-8?q?=EF=BC=881=EF=BC=89common.js=E5=8A=A0=E5=85=A5a?=
 =?UTF-8?q?jax=E6=9F=A5=E8=AF=A2=E6=97=A5=E5=BF=97=E6=80=BB=E9=87=8F?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95=E4=BD=93=EF=BC=8C=E7=AD=89=E5=BE=85=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97=E6=96=B9=E9=9D=A2=E5=8F=AF=E7=94=A8=E5=90=8E=E5=AE=8C?=
 =?UTF-8?q?=E5=96=84=E6=96=B9=E6=B3=95=20=EF=BC=882=EF=BC=89list.jsp?=
 =?UTF-8?q?=E5=8A=A0=E5=85=A5=E9=81=AE=E7=BD=A9=E5=B1=82=EF=BC=8C=E9=81=AE?=
 =?UTF-8?q?=E7=BD=A9=E5=B1=82=E7=9A=84=E8=B0=83=E7=94=A8=E7=8E=B0=E9=98=B6?=
 =?UTF-8?q?=E6=AE=B5=E5=85=88=E6=B3=A8=E9=87=8A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/views/cfg/iplist/list.jsp  | 16 +++++++++++++-
 .../webapp/static/global/scripts/common.js    | 21 +++++++++++++++++++
 2 files changed, 36 insertions(+), 1 deletion(-)

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 d7f72d4b8..735d83504 100644
--- a/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
+++ b/src/main/webapp/WEB-INF/views/cfg/iplist/list.jsp
@@ -5,6 +5,11 @@
 <title><spring:message code="${cfgName}"></spring:message></title>
 <script>
 	$(document).ready(function() {
+		//$("#loadingModal").modal("show");
+		//setTimeout(function(){
+		//	$("#loadingModal").modal("hide");
+		//},1000);
+		//$("#loadingModal").modal({backdrop:'static',keybord:false});
 		//搜索框提示语初始化
 		if("${cfg.srcIpAddress}"){
 			$("#intype").val("${cfg.srcIpAddress}");
@@ -222,6 +227,7 @@
 									<th><spring:message code="label"/></th>
 									<th><spring:message code="valid_identifier"/></th>
 									<th><spring:message code="is_audit"/></th>
+									<th><spring:message code="log_total"/></th>
 									<th><spring:message code="creator"/></th>
 									<th class="sort-column r.create_time"><spring:message code="config_time"/></th>
 									<th><spring:message code="editor"/></th>
@@ -305,6 +311,7 @@
 									       <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:forEach>
 									</td>
+									<td compileId="${cfg.compileId}">0</td>
 									<td>${cfg.creatorName }</td>
 									<td><fmt:formatDate value="${cfg.createTime }" pattern="yyyy-MM-dd HH:mm:ss"/></td>
 									<td>${cfg.editorName }</td>
@@ -321,6 +328,13 @@
 				</div>
 			</div>
 </div>
-
+<div class="modal fade" id="loadingModal">
+	<div style="width:100%;height:100%; z-index:200000; position:absolute;text-align:center;left:50%;top:50%;margin-left:-100px;margin-top:-10px">
+		<!-- <div class="progress progeress-striped active" style="margin-bottom: 0;">
+			<div class="process-bar process-bar-info" role="processbar" style="width:100%"></div>
+		</div> 
+		<h5><spring:message code="loading..."/></h5>-->
+</div>
+</div>
 </body>
 </html>
\ No newline at end of file
diff --git a/src/main/webapp/static/global/scripts/common.js b/src/main/webapp/static/global/scripts/common.js
index 8840a5712..273978b5a 100644
--- a/src/main/webapp/static/global/scripts/common.js
+++ b/src/main/webapp/static/global/scripts/common.js
@@ -617,6 +617,27 @@ var viewAreaInfo=function(path,areaEffectiveIds,compileId){
   
   });
 }
+
+var GetLogTotal=function(){
+	$.ajax({
+		type:'post',
+		timeout:1000,//超时时间设置，查询接口时间过长超时
+		url:path+'/logs/ajaxGetLogTotal',
+		data:function(){//处理数据
+			return {"functionId":functionId,"compileIds":compileIds};
+		},
+		dataType:'json',
+		async:false,
+		success:function(data,textStatus){//处理返回结果
+			
+		},
+		complete:function(XMLHttpRequest,status){//超时设置
+			if(status=="timeout"){
+				GetLogTotal.about();
+			}
+		}
+	});
+}
 //删除区域IP
 function delAreaIp(obj){ 
 	var thisObj=$(obj);