diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index 1aa753886..f71f15426 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -556,13 +556,13 @@ function protocolList(){
}else{
echart_1(rs);
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
-
+ closeTip();
}
//活跃IP统计
function ipActiveList(){
@@ -579,13 +579,13 @@ function ipActiveList(){
}else{
echart_main(rs);
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
-
+ closeTip();
}
//活跃端口统计
function portActiveList(){
@@ -597,7 +597,7 @@ function portActiveList(){
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
- var msg = "Reloading...";
+ var msg = "OnLoading...";
var trLen = $("#tbodyDataPort tr").length;
if(trLen<=0) {
msg = "OnLoading...";
@@ -638,12 +638,13 @@ function portActiveList(){
$("#tbodyDataPort").prepend("
| No Data | |
");
}
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
//app应用类型统计
@@ -661,13 +662,13 @@ function appTypeList(){
}else{
echart_3(rs);
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
-
+ closeTip();
}
//获取终端用户-操作系统列表 左下
function systemList(){
@@ -679,7 +680,7 @@ function systemList(){
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
- var msg = "Reloading...";
+ var msg = "OnLoading...";
var trLen = $("#tbodyData1 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
@@ -723,12 +724,13 @@ function systemList(){
//终端图-操作系统
echart_2(rs.reverse());
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
// 点击操作系统列表右侧显示 浏览器图
function osClick(osType,obj){
@@ -745,12 +747,13 @@ function osClick(osType,obj){
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_5(rs.reverse());
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
//点击浏览器列表右侧显示 操作系统图
function bsClick(bsType,obj){
@@ -765,12 +768,13 @@ function bsClick(bsType,obj){
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_2(rs.reverse());
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
@@ -784,7 +788,7 @@ function browserList() {
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
- var msg = "Reloading...";
+ var msg = "OnLoading...";
var trLen = $("#tbodyData1 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
@@ -828,13 +832,13 @@ function browserList() {
//终端图-浏览器
echart_5(rs.reverse());
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
-
+ closeTip();
}
//获取http网站table列表
function websiteList() {
@@ -845,7 +849,7 @@ function websiteList() {
dataType:"json",
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
beforeSend: function () {
- var msg = "ReLoading...";
+ var msg = "OnLoading...";
var trLen = $("#tbodyData2 tr").length;
if(trLen<=0) {
msg = "OnLoading...";
@@ -887,12 +891,13 @@ function websiteList() {
//网站统计图
echart_4(rs.reverse());
}
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
//点击http网站列表-显示域名图
function webClick(websiteServiceId,obj){
@@ -909,12 +914,13 @@ function webClick(websiteServiceId,obj){
cache:false,async:true,timeout:10000,//超时时间设置,查询接口时间过长超时
success:function (rs) {
echart_6(rs);
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
//网站主题
function topicAndDomainList(){
@@ -927,12 +933,13 @@ function topicAndDomainList(){
success:function (rs) {
//主题域名流量统计图
echart_topic_domain(rs);
- closeTip();
+
},
complete:function(XMLHttpRequest,status){//超时设置
closeTip();
}
});
+ closeTip();
}
diff --git a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
index f74dc83dd..960f7e098 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/trafficUserBehavior.jsp
@@ -281,6 +281,7 @@
+
@@ -322,9 +323,7 @@
-
-
-
+
@@ -376,12 +375,16 @@
-
+
+
+
+
+
@@ -425,9 +428,7 @@
-
-
-
+
@@ -481,7 +482,10 @@
-
+
+
+
+