gfwleak/k18-ntcs-web-ntc
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
段冬梅
2018-12-12 15:37:25 +08:00
parent 5363736ff6 f5b0a0d4d0
commit 9d38d83456
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/main/webapp/WEB-INF/views/dashboard/trafficAppTypeList.jsp
View File

@@ -108,6 +108,7 @@ $(document).ready(function(){
});
});
function searchList(){
loading();
var start=$("#searchFoundStartTime").val();
var end=$("#searchFoundEndTime").val();
if(start==''||end==''||end==null||start==null){
@@ -321,7 +322,7 @@ function protocolTypeChart(rs){
softConnector: true, // 是否使用曲线
formatter: function () {
// 通过函数判断是否显示数据标签，为了防止数据标签过于密集
return this.percentage > 1 ? '<b>' + this.point.name + ' :</b> ' +this.percentage.toFixed(1)+' %' : null;
return this.percentage > 1 ? '<b>' + this.point.name + ' :</b> ' +this.percentage.toFixed(2)+' %' : null;
},
style: {
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
@@ -353,7 +354,7 @@ function protocolTypeChart(rs){
},
tooltip: {
headerFormat: '{series.name}<br>',
pointFormat: '{point.name}: <b>{point.percentage:.1f}%</b>'
pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>'
},
series: [{
name: "App",

5
src/main/webapp/WEB-INF/views/dashboard/trafficProtocolTypeList.jsp
View File

@@ -98,6 +98,7 @@ $(document).ready(function(){
});
});
function searchList(){
loading();
var start=$("#searchFoundStartTime").val();
var end=$("#searchFoundEndTime").val();
if(start==''||end==''||end==null||start==null){
@@ -310,7 +311,7 @@ function protocolTypeChart(rs){
softConnector: true, // 是否使用曲线
formatter: function () {
// 通过函数判断是否显示数据标签，为了防止数据标签过于密集
return this.percentage > 1 ? '<b>' + this.point.name + ' :</b> ' +this.percentage.toFixed(1)+' %' : null;
return this.percentage > 1 ? '<b>' + this.point.name + ' :</b> ' +this.percentage.toFixed(2)+' %' : null;
},
style: {
color: (Highcharts.theme && Highcharts.theme.contrastTextColor) || 'black'
@@ -342,7 +343,7 @@ function protocolTypeChart(rs){
},
tooltip: {
headerFormat: '{series.name}<br>',
pointFormat: '{point.name}: <b>{point.percentage:.1f}%</b>'
pointFormat: '{point.name}: <b>{point.percentage:.2f}%</b>'
},
series: [{
name: "Protocol",

4
src/main/webapp/static/pages/scripts/echart.js
View File

@@ -133,7 +133,7 @@
mouseOver: function(e) { // 鼠标滑过时动态更新标题
// 标题更新函数，API 地址：https://api.hcharts.cn/highcharts#Chart.setTitle
chart.setTitle({
text:e.target.name.length>10? this.percentage.toFixed(1)+"%<br><span>"+e.target.name.substring(0,10)+"...</span>":this.percentage.toFixed(1)+"%<br><span>"+e.target.name.substring(0,10)+"</span>",
text:e.target.name.length>10? this.percentage.toFixed(2)+"%<br><span>"+e.target.name.substring(0,10)+"...</span>":this.percentage.toFixed(2)+"%<br><span>"+e.target.name.substring(0,10)+"</span>",
floating:true,
y:120,
style: {//设置字体颜色
@@ -375,7 +375,7 @@
// inoctetsNum=inoctetsNumG;
// };
inoctetsNum=inoctetsNumG;
inoctetsNum=inoctetsNum.toFixed(5)
inoctetsNum=inoctetsNum.toFixed(2)
return inoctetsNum;
}
function changeUnit(inoctetsNum){