Merge branch 'develop' of http://192.168.10.125/k18_web/NFS.git into develop

This commit is contained in:
wangxin
2018-10-30 16:00:06 +08:00

View File

@@ -175,11 +175,6 @@
</tr> </tr>
</thead> </thead>
<tbody id="tbodyDataPort"> <tbody id="tbodyDataPort">
<tr>
<td>80</td>
<td>16764</td>
<td>1</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -194,10 +189,12 @@
<div class="main_left1 fl"> <div class="main_left1 fl">
<div class="left_1"> <div class="left_1">
<div class="main_title1"> <div class="main_title1">
<spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> --> <spring:message code="topic"/>&nbsp;&nbsp;<%-- <a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-list-ul"></i></a> --%>
<a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a> <a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a>
</div> </div>
<!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 420px;"></div> <!-- 网站主题分类图 --><div id="chart_topic" style="width:100%;height:400px;"></div>
</div> </div>
</div> </div>
@@ -217,11 +214,6 @@
</tr> </tr>
</thead> </thead>
<tbody id="tbodyData2"> <tbody id="tbodyData2">
<tr>
<td>1</td>
<td>baidu.com</td>
<td>0</td>
</tr>
</tbody> </tbody>
</table> </table>
</div> </div>
@@ -237,32 +229,62 @@
</div> </div>
</div> </div>
</div> </div>
</div>
<!-- 第三行-->
<div class="data_main1">
<div class="main_left1 fl">
<div class="left_1">
<div class="main_title1">
<spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
<a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a>
</div>
<!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
</div>
</div>
<div class="main_center1 fl">
<div class="bottom_web fl">
<div class="main_title_web">
<!-- 终端 -->BS &nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
<a href="javascipt:void(0)" onclick="uaSelectChange();return false;"><i class="fa fa-refresh"></i></a>
</div>
<div class="main_table_web">
<table>
<thead>
<tr>
<th><spring:message code="ranking"/></th>
<th>
<div class="choice">
<select name="uaSelect" id="uaSelect">
<option value="system"><spring:message code="os"/></option>
<option value="browser"><spring:message code="browser"/></option>
</select>
</div>
</th>
<th><spring:message code="trend"/></th>
</tr>
</thead>
<tbody id="tbodyData1">
</tbody>
</table>
</div>
</div>
</div>
<div class="main_right1 fl">
<div class="bottom_web fl">
<%-- <div class="main_title_web">
<spring:message code="traffic_website_type_chart"/>
</div> --%>
<div class="main_table_web">
<!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 400px;"></div>
</div>
</div>
</div>
</div> </div>
<!-- 第3行 -->
<%-- <div class="data_main2">
<!-- 中图 -->
<div class="main_center2 fl">
<div class="center_text2">
<div class="main_title2">
<spring:message code="业务分类"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-list-ul"></i></a>
</div>
<div id="chart_main" style="width:100%;height:400px;"></div>
</div>
</div>
<div class="main_right2 fr">
<div class="right_1">
<div class="main_title2">
<spring:message code="传输层协议"/>&nbsp;&nbsp;<a href="#"><i class="fa fa-list-ul"></i></a>
</div>
<div id="chart_3" class="" style="width:100%;height: 400px;"></div>
</div>
</div>
</div>
--%>
<!-- 第4行 --> <!-- 第4行 -->
<div class="data_bottom"> <%-- <div class="data_bottom">
<div class="bottom_1 fl"> <div class="bottom_1 fl">
<div class="main_title"> <div class="main_title">
<!-- 终端 -->BS &nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> --> <!-- 终端 -->BS &nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
@@ -297,14 +319,14 @@
<div class="bottom_center fl"> <div class="bottom_center fl">
<div class="bottom_2 fl"> <div class="bottom_2 fl">
<%-- <div class="main_title"> <div class="main_title">
<spring:message code="BS"/> <spring:message code="BS"/>
</div> --%> </div>
<div class="main_table"> <div class="main_table">
<!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 400px;"></div> <!-- ua终端图 --><div id="chart_2" class="" style="width:100%;height: 400px;"></div>
</div> </div>
</div> </div>
<%-- <div class="bottom_3 fl"> <div class="bottom_3 fl">
<div class="main_title"> <div class="main_title">
<spring:message code="traffic_website_list"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/webTypeList"><i class="fa fa-list-ul"></i></a> <spring:message code="traffic_website_list"/>&nbsp;&nbsp;<a href="${ctx}/dashboard/webTypeList"><i class="fa fa-list-ul"></i></a>
</div> </div>
@@ -327,16 +349,16 @@
</table> </table>
</div> </div>
</div> </div>
--%>
<div class="bottom_3 fr"> <div class="bottom_3 fl">
<div class="main_title"> <div class="main_title">
<spring:message code="topic"/>&nbsp;&nbsp;<%-- <a href="${ctx}/dashboard/ipActiveList"><i class="fa fa-list-ul"></i></a> --%> <spring:message code="traffic_app_chart"/>&nbsp;&nbsp;<!-- <a href="#"><i class="fa fa-list-ul"></i></a> -->
<a href="javascipt:void(0)" onclick="topicAndDomainList();return false;"><i class="fa fa-refresh"></i></a> <a href="javascipt:void(0)" onclick="appTypeList();return false;"><i class="fa fa-refresh"></i></a>
</div> </div>
<!-- 网站主题分类图 --><div id="chart_topic" style="width:100%;height:400px;"></div> <!--app应用图 --><div id="chart_3" class="" style="width:100%;height: 420px;"></div>
</div> </div>
</div> </div>
</div> </div> --%>
</div> </div>
@@ -435,6 +457,7 @@ function ajaxinfo(){
var bandwidth=data.bandwidth; var bandwidth=data.bandwidth;
var bandwidthK=bandwidth/1024; var bandwidthK=bandwidth/1024;
var bandwidthM=bandwidthK/1024; var bandwidthM=bandwidthK/1024;
var bandwidthG=bandwidthG/1024;
if(bandwidth==null||bandwidth==""){ if(bandwidth==null||bandwidth==""){
bandwidth=0; bandwidth=0;
} }
@@ -446,6 +469,10 @@ function ajaxinfo(){
bandwidth=bandwidthM; bandwidth=bandwidthM;
$(".numberRun4-unit").text(" Mbps"); $(".numberRun4-unit").text(" Mbps");
} }
if(bandwidthG>10){
bandwidth=bandwidthG;
$(".numberRun4-unit").text(" Mbps");
}
dataScroll(".numberRun4",Math.floor(bandwidth)); dataScroll(".numberRun4",Math.floor(bandwidth));
//计算带宽进出口流量百分比 //计算带宽进出口流量百分比
// $("#c2sColor").removeClass(); // $("#c2sColor").removeClass();
@@ -453,9 +480,11 @@ function ajaxinfo(){
var inoctetsNum=Math.floor(data.inoctetsNum); var inoctetsNum=Math.floor(data.inoctetsNum);
var inoctetsNumK=inoctetsNum/1024; var inoctetsNumK=inoctetsNum/1024;
var inoctetsNumM=inoctetsNumK/1024; var inoctetsNumM=inoctetsNumK/1024;
var inoctetsNumG=inoctetsNumM/1024;
var outoctetsNum=Math.floor(data.outoctetsNum); var outoctetsNum=Math.floor(data.outoctetsNum);
var outoctetsNumK=outoctetsNum/1024; var outoctetsNumK=outoctetsNum/1024;
var outoctetsNumM=outoctetsNumK/1024; var outoctetsNumM=outoctetsNumK/1024;
var outoctetsNumG=outoctetsNumM/1024;
var unit="bps"; var unit="bps";
if(inoctetsNumK>10){ if(inoctetsNumK>10){
inoctetsNum=inoctetsNumK; inoctetsNum=inoctetsNumK;
@@ -467,6 +496,11 @@ function ajaxinfo(){
outoctetsNum=outoctetsNumM; outoctetsNum=outoctetsNumM;
unit="Mbps"; unit="Mbps";
}; };
if(inoctetsNumG>10){
inoctetsNum=inoctetsNumG;
outoctetsNum=outoctetsNumG;
unit="Mbps";
};
$(".c2sNum").text(Math.floor(inoctetsNum)+" "+unit); $(".c2sNum").text(Math.floor(inoctetsNum)+" "+unit);
$(".s2cNum").text(Math.floor(outoctetsNum)+" "+unit); $(".s2cNum").text(Math.floor(outoctetsNum)+" "+unit);
/* if(data.inoctetsNum!=c2s){ /* if(data.inoctetsNum!=c2s){
@@ -513,6 +547,7 @@ function uaSelectChange(){
//协议类型统计 //协议类型统计
function protocolList(){ function protocolList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/protocol', url: '${ctx}/dashboard/protocol',
type : "get" , type : "get" ,
@@ -524,6 +559,7 @@ function protocolList(){
return; return;
}else{ }else{
echart_1(rs); echart_1(rs);
closeTip();
} }
}, },
}); });
@@ -531,7 +567,7 @@ function protocolList(){
} }
//活跃IP统计 //活跃IP统计
function ipActiveList(){ function ipActiveList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/ipActive', url: '${ctx}/dashboard/ipActive',
type : "get" , type : "get" ,
@@ -543,6 +579,7 @@ function ipActiveList(){
return; return;
}else{ }else{
echart_main(rs); echart_main(rs);
closeTip();
} }
}, },
}); });
@@ -550,7 +587,7 @@ function ipActiveList(){
} }
//活跃端口统计 //活跃端口统计
function portActiveList(){ function portActiveList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/portActive', url: '${ctx}/dashboard/portActive',
type : "get" , type : "get" ,
@@ -600,13 +637,14 @@ function portActiveList(){
$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>"); $("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'>No Data</td><td></td></tr>");
} }
} }
closeTip();
}, },
}); });
} }
//app应用类型统计 //app应用类型统计
function appTypeList(){ function appTypeList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/app', url: '${ctx}/dashboard/app',
type : "get" , type : "get" ,
@@ -618,6 +656,7 @@ function appTypeList(){
return; return;
}else{ }else{
echart_3(rs); echart_3(rs);
closeTip();
} }
}, },
}); });
@@ -625,7 +664,7 @@ function appTypeList(){
} }
//获取终端用户-操作系统列表 左下 //获取终端用户-操作系统列表 左下
function systemList(){ function systemList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/osList', url: '${ctx}/dashboard/osList',
type : "get" , type : "get" ,
@@ -676,6 +715,7 @@ function systemList(){
} }
//终端图-操作系统 //终端图-操作系统
echart_2(rs.reverse()); echart_2(rs.reverse());
closeTip();
} }
}, },
}); });
@@ -684,6 +724,7 @@ function systemList(){
function osClick(osType,obj){ function osClick(osType,obj){
//点击行变色 //点击行变色
$("#tbodyData1 tr").removeClass("activeColor"); $("#tbodyData1 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor"); $(obj).addClass("activeColor");
$.ajax({ $.ajax({
@@ -694,12 +735,14 @@ function osClick(osType,obj){
cache:false,async:true, cache:false,async:true,
success:function (rs) { success:function (rs) {
echart_5(rs.reverse()); echart_5(rs.reverse());
closeTip();
}, },
}); });
} }
//点击浏览器列表右侧显示 操作系统图 //点击浏览器列表右侧显示 操作系统图
function bsClick(bsType,obj){ function bsClick(bsType,obj){
$("#tbodyData1 tr").removeClass("activeColor"); $("#tbodyData1 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor"); $(obj).addClass("activeColor");
$.ajax({ $.ajax({
url: '${ctx}/dashboard/systemChart', url: '${ctx}/dashboard/systemChart',
@@ -709,6 +752,7 @@ function bsClick(bsType,obj){
cache:false,async:true, cache:false,async:true,
success:function (rs) { success:function (rs) {
echart_2(rs.reverse()); echart_2(rs.reverse());
closeTip();
}, },
}); });
} }
@@ -716,7 +760,7 @@ function bsClick(bsType,obj){
//获取终端用户-浏览器列表 //获取终端用户-浏览器列表
function browserList() { function browserList() {
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/bsList', url: '${ctx}/dashboard/bsList',
type : "get" , type : "get" ,
@@ -767,6 +811,7 @@ function browserList() {
} }
//终端图-浏览器 //终端图-浏览器
echart_5(rs.reverse()); echart_5(rs.reverse());
closeTip();
} }
}, },
}); });
@@ -774,7 +819,7 @@ function browserList() {
} }
//获取http网站table列表 //获取http网站table列表
function websiteList() { function websiteList() {
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/websiteList', url: '${ctx}/dashboard/websiteList',
type : "get" , type : "get" ,
@@ -822,6 +867,7 @@ function websiteList() {
} }
//网站统计图 //网站统计图
echart_4(rs.reverse()); echart_4(rs.reverse());
closeTip();
} }
}, },
}); });
@@ -830,6 +876,7 @@ function websiteList() {
function webClick(websiteServiceId,obj){ function webClick(websiteServiceId,obj){
//点击行变色 //点击行变色
$("#tbodyData2 tr").removeClass("activeColor"); $("#tbodyData2 tr").removeClass("activeColor");
loading();
$(obj).addClass("activeColor"); $(obj).addClass("activeColor");
$.ajax({ $.ajax({
@@ -840,11 +887,13 @@ function webClick(websiteServiceId,obj){
cache:false,async:true, cache:false,async:true,
success:function (rs) { success:function (rs) {
echart_6(rs); echart_6(rs);
closeTip();
}, },
}); });
} }
//网站主题 //网站主题
function topicAndDomainList(){ function topicAndDomainList(){
loading();
$.ajax({ $.ajax({
url: '${ctx}/dashboard/topicAndDomainList', url: '${ctx}/dashboard/topicAndDomainList',
type : "get" , type : "get" ,
@@ -853,6 +902,7 @@ function topicAndDomainList(){
success:function (rs) { success:function (rs) {
//主题域名流量统计图 //主题域名流量统计图
echart_topic_domain(rs); echart_topic_domain(rs);
closeTip();
}, },
}); });
} }