diff --git a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
index c9cf63f79..884d1044a 100644
--- a/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
+++ b/src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
@@ -175,11 +175,6 @@
+<%--
BS
@@ -297,14 +319,14 @@
-
+
--%>
@@ -435,6 +457,7 @@ function ajaxinfo(){
var bandwidth=data.bandwidth;
var bandwidthK=bandwidth/1024;
var bandwidthM=bandwidthK/1024;
+ var bandwidthG=bandwidthG/1024;
if(bandwidth==null||bandwidth==""){
bandwidth=0;
}
@@ -446,6 +469,10 @@ function ajaxinfo(){
bandwidth=bandwidthM;
$(".numberRun4-unit").text(" Mbps");
}
+ if(bandwidthG>10){
+ bandwidth=bandwidthG;
+ $(".numberRun4-unit").text(" Mbps");
+ }
dataScroll(".numberRun4",Math.floor(bandwidth));
//计算带宽进出口流量百分比
// $("#c2sColor").removeClass();
@@ -453,9 +480,11 @@ function ajaxinfo(){
var inoctetsNum=Math.floor(data.inoctetsNum);
var inoctetsNumK=inoctetsNum/1024;
var inoctetsNumM=inoctetsNumK/1024;
+ var inoctetsNumG=inoctetsNumM/1024;
var outoctetsNum=Math.floor(data.outoctetsNum);
var outoctetsNumK=outoctetsNum/1024;
var outoctetsNumM=outoctetsNumK/1024;
+ var outoctetsNumG=outoctetsNumM/1024;
var unit="bps";
if(inoctetsNumK>10){
inoctetsNum=inoctetsNumK;
@@ -467,6 +496,11 @@ function ajaxinfo(){
outoctetsNum=outoctetsNumM;
unit="Mbps";
};
+ if(inoctetsNumG>10){
+ inoctetsNum=inoctetsNumG;
+ outoctetsNum=outoctetsNumG;
+ unit="Mbps";
+ };
$(".c2sNum").text(Math.floor(inoctetsNum)+" "+unit);
$(".s2cNum").text(Math.floor(outoctetsNum)+" "+unit);
/* if(data.inoctetsNum!=c2s){
@@ -513,6 +547,7 @@ function uaSelectChange(){
//协议类型统计
function protocolList(){
+ loading();
$.ajax({
url: '${ctx}/dashboard/protocol',
type : "get" ,
@@ -524,6 +559,7 @@ function protocolList(){
return;
}else{
echart_1(rs);
+ closeTip();
}
},
});
@@ -531,7 +567,7 @@ function protocolList(){
}
//活跃IP统计
function ipActiveList(){
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/ipActive',
type : "get" ,
@@ -543,6 +579,7 @@ function ipActiveList(){
return;
}else{
echart_main(rs);
+ closeTip();
}
},
});
@@ -550,7 +587,7 @@ function ipActiveList(){
}
//活跃端口统计
function portActiveList(){
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/portActive',
type : "get" ,
@@ -600,13 +637,14 @@ function portActiveList(){
$("#tbodyDataPort").prepend("
| No Data | |
");
}
}
+ closeTip();
},
});
}
//app应用类型统计
function appTypeList(){
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/app',
type : "get" ,
@@ -618,6 +656,7 @@ function appTypeList(){
return;
}else{
echart_3(rs);
+ closeTip();
}
},
});
@@ -625,7 +664,7 @@ function appTypeList(){
}
//获取终端用户-操作系统列表 左下
function systemList(){
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/osList',
type : "get" ,
@@ -676,6 +715,7 @@ function systemList(){
}
//终端图-操作系统
echart_2(rs.reverse());
+ closeTip();
}
},
});
@@ -684,6 +724,7 @@ function systemList(){
function osClick(osType,obj){
//点击行变色
$("#tbodyData1 tr").removeClass("activeColor");
+ loading();
$(obj).addClass("activeColor");
$.ajax({
@@ -694,12 +735,14 @@ function osClick(osType,obj){
cache:false,async:true,
success:function (rs) {
echart_5(rs.reverse());
+ closeTip();
},
});
}
//点击浏览器列表右侧显示 操作系统图
function bsClick(bsType,obj){
$("#tbodyData1 tr").removeClass("activeColor");
+ loading();
$(obj).addClass("activeColor");
$.ajax({
url: '${ctx}/dashboard/systemChart',
@@ -709,6 +752,7 @@ function bsClick(bsType,obj){
cache:false,async:true,
success:function (rs) {
echart_2(rs.reverse());
+ closeTip();
},
});
}
@@ -716,7 +760,7 @@ function bsClick(bsType,obj){
//获取终端用户-浏览器列表
function browserList() {
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/bsList',
type : "get" ,
@@ -767,6 +811,7 @@ function browserList() {
}
//终端图-浏览器
echart_5(rs.reverse());
+ closeTip();
}
},
});
@@ -774,7 +819,7 @@ function browserList() {
}
//获取http网站table列表
function websiteList() {
-
+ loading();
$.ajax({
url: '${ctx}/dashboard/websiteList',
type : "get" ,
@@ -822,6 +867,7 @@ function websiteList() {
}
//网站统计图
echart_4(rs.reverse());
+ closeTip();
}
},
});
@@ -830,6 +876,7 @@ function websiteList() {
function webClick(websiteServiceId,obj){
//点击行变色
$("#tbodyData2 tr").removeClass("activeColor");
+ loading();
$(obj).addClass("activeColor");
$.ajax({
@@ -840,11 +887,13 @@ function webClick(websiteServiceId,obj){
cache:false,async:true,
success:function (rs) {
echart_6(rs);
+ closeTip();
},
});
}
//网站主题
function topicAndDomainList(){
+ loading();
$.ajax({
url: '${ctx}/dashboard/topicAndDomainList',
type : "get" ,
@@ -853,6 +902,7 @@ function topicAndDomainList(){
success:function (rs) {
//主题域名流量统计图
echart_topic_domain(rs);
+ closeTip();
},
});
}