diff --git a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
index c1e9fcf8b..8290abf4c 100644
--- a/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
+++ b/src/main/java/com/nis/web/controller/dashboard/ConfigStatisticsController.java
@@ -133,6 +133,7 @@ public class ConfigStatisticsController extends BaseController {
} catch (Exception e) {
e.printStackTrace();
logger.error("带宽详情数据获取错误"+e);
+ map.put("error","request_service_failed");
LogUtils.saveLog(request, null, e, null);
}
return map;
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
index 591e188da..e1954d50a 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newActionList.jsp
@@ -1,9 +1,11 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
+
+
<%-- --%>
@@ -201,6 +203,11 @@ function showActionTransChart(chartType,xData,series){
async:true,
timeout:50000,
success:function (rs) {
+ if(rs!=null&&rs.length>0&&rs[0].error!=null){
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
+ return;
+ }
var xData=new Array();
var series=new Array();
var total=[];
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp
index fb0faffcf..3d88caa5a 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newActiveClientIPList.jsp
@@ -101,7 +101,8 @@ function ajaxClientIPList(start,end,entranceId){
traditional:true,
success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){
- top.$.jBox.tip("", "");
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
return;
}
fileData =data;
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp
index 0bae2eafc..d12ba4ed1 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newActiveServerIPList.jsp
@@ -101,7 +101,8 @@ function ajaxServerIPList(start,end,entranceId){
traditional:true,
success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){
- top.$.jBox.tip("", "");
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
return;
}
fileData =data;
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp
index 486fe2e54..d834f9bbb 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newAppTypeList.jsp
@@ -103,9 +103,10 @@ function ajaxAppList(start,end,entranceId){
traditional:true,
success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){
- top.$.jBox.tip("", "");
- return;
- }
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
+ return;
+ }
fileData =data;
getPageData(1,20);//初始化第一页的数据
pageJuan(20);//初始化分页
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp
index aa546f520..5f8935821 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newBandWidthList.jsp
@@ -1,6 +1,6 @@
<%@ page contentType="text/html;charset=UTF-8"%>
<%@ include file="/WEB-INF/include/taglib.jsp"%>
-
+ -->
-
+
<%-- --%>
@@ -91,6 +91,11 @@ function changeBandwidth(unitType,beginDate,endDate){
async:true,
timeout:50000,
success:function (data){
+ if(data!=null && data.error!=null){
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
+ return;
+ }
var xdata=null;
var ipv4data=null;
var ipv6data=null;
@@ -102,14 +107,14 @@ function changeBandwidth(unitType,beginDate,endDate){
var udpdata2=null;
var total=[];
var total2=[];
- if(data!=null&&Object.keys(data).length>0){
+ if(data!=null&&Object.keys(data).length>0){
ipv4data=data.ipv4Type1.result;
ipv6data=data.ipv6Type1.result;
tcpdata=data.trans6Type1.result;
udpdata=data.trans17Type1.result;
total.push(data.ipv4Type1.sum,data.ipv6Type1.sum,data.trans6Type1.sum,data.trans17Type1.sum);
- }
- var series=new Array();
+ }
+ var series=new Array();
series.push({
// type:'area',
name: "IPv4",
@@ -165,7 +170,7 @@ function changeBandwidth(unitType,beginDate,endDate){
title="Astana+Almaty";
}
- showBandwidthChart("chart1",unitType,xdata,series,title,chartType);
+ showBandwidthChart("chart1",unitType,xdata,series,title,chartType);
$("#errorTipDiv").hide();
/* if(data!=null&&Object.keys(data).length>0){
ipv4data2=data.ipv4Type2.result;
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp
index e2aeaec98..0419d95bb 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newDomainsList.jsp
@@ -114,9 +114,10 @@
traditional:true,
success : function(data) {
if (data != null && data.length > 0 && data[0].error != null) {
- top.$.jBox.tip(
- "",
- "");
+// top.$.jBox.tip(
+// "",
+// "");
+ $("#errorTipDiv").show();
return;
}
webTypeChart(data,chartType);
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp
index ab2954da7..54202bfeb 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newProtocolTypeList.jsp
@@ -104,9 +104,10 @@ function ajaxProtocolList(start,end,entranceId){
},
success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){
- top.$.jBox.tip("", "");
- return;
- }
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
+ return;
+ }
fileData =data;
getPageData(1,20);//初始化第一页的数据
pageJuan(20);//初始化分页
diff --git a/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp b/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp
index c76b8cec6..9c15cb47e 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/newSubscriberIDList.jsp
@@ -101,7 +101,8 @@ function ajaxSubscriberIDList(start,end,entranceId){
traditional:true,
success:function (data){
if(data!=null&&data.length>0&&data[0].error!=null){
- top.$.jBox.tip("", "");
+// top.$.jBox.tip("", "");
+ $("#errorTipDiv").show();
return;
}
fileData =data;