From 446c802ececda8a11c977476e1c7b23749f77ae3 Mon Sep 17 00:00:00 2001 From: shangguanyanfei Date: Thu, 13 Jun 2019 18:41:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B5=81=E9=87=8F=E7=BB=9F=E8=AE=A1-=E7=BB=9F?= =?UTF-8?q?=E8=AE=A1=E9=A1=B5=E9=9D=A2=20=E5=A2=9E=E5=8A=A0=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E5=A4=B1=E8=B4=A5=E7=95=8C=E9=9D=A2=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E7=A4=BA=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../WEB-INF/views/dashboard/newActionList.jsp | 7 ++++++- .../views/dashboard/newActiveClientIPList.jsp | 7 ++++++- .../views/dashboard/newActiveServerIPList.jsp | 7 ++++++- .../WEB-INF/views/dashboard/newAppTypeList.jsp | 7 ++++++- .../WEB-INF/views/dashboard/newBandWidthList.jsp | 10 +++++++++- .../WEB-INF/views/dashboard/newDomainsList.jsp | 13 +++++++++---- .../WEB-INF/views/dashboard/newProtocolTypeList.jsp | 6 ++++++ .../WEB-INF/views/dashboard/newSubscriberIDList.jsp | 7 ++++++- 8 files changed, 54 insertions(+), 10 deletions(-) diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp index b53fd9638..49067e278 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp @@ -1,6 +1,6 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> - +
@@ -268,12 +268,17 @@ function showActionTransChart(chartType,xData,series){ } $("#total").val(JSON.stringify(total)); showActionTransChart(chartType,xData,series); + $("#errorTipDiv").hide(); closeTip(); }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp index 899bf9b92..fb0faffcf 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp @@ -17,7 +17,7 @@ }
- +
@@ -109,6 +109,7 @@ function ajaxClientIPList(start,end,entranceId){ pageJuan(20);//初始化分页 clientIPChart(data,chartType);// 初始化图 closeTip(); + $("#errorTipDiv").hide(); if(data!= null&&data.length<1){ $(".none-data").show(); $('.pageView').hide(); @@ -118,9 +119,13 @@ function ajaxClientIPList(start,end,entranceId){ } }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp index 736be9a31..0bae2eafc 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp @@ -17,7 +17,7 @@ }
- +
@@ -109,6 +109,7 @@ function ajaxServerIPList(start,end,entranceId){ pageJuan(20);//初始化分页 serverIPChart(data,chartType);// 初始化图 closeTip(); + $("#errorTipDiv").hide(); if(data!= null&&data.length<1){ $(".none-data").show(); $('.pageView').hide(); @@ -118,9 +119,13 @@ function ajaxServerIPList(start,end,entranceId){ } }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp index ec1d8e6d4..486fe2e54 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp @@ -17,7 +17,7 @@ }
- +
@@ -111,6 +111,7 @@ function ajaxAppList(start,end,entranceId){ pageJuan(20);//初始化分页 appTypeChart(data,chartType);// 初始化图 closeTip(); + $("#errorTipDiv").hide(); if(data!= null&&data.length<1){ $(".none-data").show(); $('.pageView').hide(); @@ -120,9 +121,13 @@ function ajaxAppList(start,end,entranceId){ } }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp index 3c3343570..aa546f520 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp @@ -1,6 +1,7 @@ <%@ page contentType="text/html;charset=UTF-8"%> <%@ include file="/WEB-INF/include/taglib.jsp"%> +
@@ -81,6 +82,7 @@ function changeBandwidth(unitType,beginDate,endDate){ var chartType = $("#chartType").val(); var timeSize = $(".timeSize:checked").val(); var operator=$("#operator_select").val(); + $.ajax({ url:"${ctx}/dashboard/traffic/bandWidthTransThreeNew", type:"get", @@ -164,7 +166,7 @@ function changeBandwidth(unitType,beginDate,endDate){ } showBandwidthChart("chart1",unitType,xdata,series,title,chartType); - + $("#errorTipDiv").hide(); /* if(data!=null&&Object.keys(data).length>0){ ipv4data2=data.ipv4Type2.result; ipv6data2=data.ipv6Type2.result; @@ -216,9 +218,15 @@ function changeBandwidth(unitType,beginDate,endDate){ // closeTip(); }, error: function(data, textStatus, errorThrown){ +// alert("error"); + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 +// alert("complete"); + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp index 39f5e5abe..e2aeaec98 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp @@ -12,10 +12,10 @@
- -
-
-
+ +
+
+
@@ -124,6 +124,7 @@ getPageData(1, 20);//初始化第一页的数据 pageJuan(20);//初始化分页 closeTip(); + $("#errorTipDiv").hide(); if (data != null && data.length < 1) { $(".none-data").show(); $('.pageView').hide(); @@ -133,9 +134,13 @@ } }, error : function(data, textStatus, errorThrown) { + $("#errorTipDiv").show(); closeTip(); }, complete : function(XMLHttpRequest, status) {//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp index 00b0e9461..ab2954da7 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp @@ -11,6 +11,7 @@
+
@@ -111,6 +112,7 @@ function ajaxProtocolList(start,end,entranceId){ pageJuan(20);//初始化分页 protocolTypeChart(data,chartType);// 初始化图 closeTip(); + $("#errorTipDiv").hide(); if(data!= null&&data.length<1){ $(".none-data").show(); $('.M-box').hide(); @@ -120,9 +122,13 @@ function ajaxProtocolList(start,end,entranceId){ } }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } }); diff --git a/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp index 2d733994f..c76b8cec6 100644 --- a/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp +++ b/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp @@ -17,7 +17,7 @@ }
- +
@@ -109,6 +109,7 @@ function ajaxSubscriberIDList(start,end,entranceId){ pageJuan(20);//初始化分页 subscriberIDChart(data,chartType);// 初始化图 closeTip(); + $("#errorTipDiv").hide(); if(data!= null&&data.length<1){ $(".none-data").show(); $('.pageView').hide(); @@ -118,9 +119,13 @@ function ajaxSubscriberIDList(start,end,entranceId){ } }, error: function(data, textStatus, errorThrown){ + $("#errorTipDiv").show(); closeTip(); }, complete:function(XMLHttpRequest,status){//超时设置 + if(status == 'timeout'){ + $("#errorTipDiv").show(); + } closeTip(); } });