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

修改流量统计列表错误提示格式，对service数据保留处理

Browse Source
This commit is contained in:
zhanghongqing
2018-12-28 18:01:29 +08:00
parent b793df47b6
commit 0f9b829531
2 changed files with 26 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/webapp/WEB-INF/views/dashboard/dashBoardIndex.jsp
View File

@@ -610,7 +610,7 @@ function portActiveList(){
$("#tbodyDataPort").html(""); $("#tbodyDataPort").html("");
var n=rs.length; var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyDataPort").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>"); $("#tbodyDataPort").prepend("<tr class='frist rowData'><td style='color:#fff' colspan='3'><spring:message code='request_service_failed'/></td></tr>");
}else{ }else{
if(n>0){ if(n>0){
@@ -694,7 +694,7 @@ function systemList(){
rs.reverse(); rs.reverse();
var n=rs.length; var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>"); $("#tbodyData1").prepend("<tr class='frist rowData'><td style='color:#fff' colspan='3'><spring:message code='request_service_failed'/></td></tr>");
}else{ }else{
if(n>0){ if(n>0){
@@ -807,7 +807,7 @@ function browserList() {
rs.reverse(); rs.reverse();
var n=rs.length; var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData1").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>"); $("#tbodyData1").prepend("<tr class='frist rowData'><td style='color:#fff' colspan='3'><spring:message code='request_service_failed'/></td></tr>");
}else{ }else{
if(n>0){ if(n>0){
$(rs).each(function(i, itemObj) { $(rs).each(function(i, itemObj) {
@@ -873,7 +873,7 @@ function websiteList() {
$("#tbodyData2").html(""); $("#tbodyData2").html("");
var n=rs.length; var n=rs.length;
if(rs!=null&&rs.length>0&&rs[0].error!=null){ if(rs!=null&&rs.length>0&&rs[0].error!=null){
$("#tbodyData2").prepend("<tr class='frist rowData'><td></td><td style='color:#fff'><spring:message code='request_service_failed'/></td><td></td></tr>"); $("#tbodyData2").prepend("<tr class='frist rowData'><td style='color:#fff' colspan='3'><spring:message code='request_service_failed'/></td></tr>");
}else{ }else{
if(n>0){ if(n>0){
$(rs).each(function(i, itemObj) { $(rs).each(function(i, itemObj) {

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

@@ -1186,29 +1186,38 @@ function echart_topic_domain(rs){
var unit="bytes"; var unit="bytes";
$(rs).each(function(i,d){ $(rs).each(function(i,d){
var inoctetsNum=d.count; var inoctetsNum=d.count;
unit=changeUnit(inoctetsNum); var inoctetsNumK=inoctetsNum/1024;
inoctetsNum=changeNum(inoctetsNum); var inoctetsNumM=inoctetsNumK/1024;
data.push({ var inoctetsNumG=inoctetsNumM/1024;
'id': '1.'+d.topicId, inoctetsNum=inoctetsNumG;
'parent': '0.0', inoctetsNum=Math.round(inoctetsNum*100)/100;
'name': d.topic,
'value':parseFloat(inoctetsNum) unit="GB";
}); if(inoctetsNum>0){
/****主题中的子域名*******/ /****主题中的子域名*******/
var topicData=0;
$(d.domainData).each(function(j,t){ $(d.domainData).each(function(j,t){
var domainNum=t.byteCount; var domainNum=t.byteCount;
unit=changeUnit(domainNum); var domainNumK=domainNum/1024;
domainNum=changeNum(domainNum); var domainNumM=domainNumK/1024;
if(domainNum>0){ var domainNumG=domainNumM/1024;
domainNum=domainNumG;
domainNum=Math.round(domainNum*100)/100;
topicData=topicData+domainNum;
data.push({ data.push({
'id': '2.'+t.webId, 'id': '2.'+t.webId,
'parent': '1.'+d.topicId, 'parent': '1.'+d.topicId,
'name': t.domain, 'name': t.domain,
'value':parseFloat(domainNum) 'value':parseFloat(domainNum)
}); });
}
}) })
data.push({
'id': '1.'+d.topicId,
'parent': '0.0',
'name': d.topic,
'value':parseFloat(topicData)
});
}
}); });
Highcharts.getOptions().colors.splice(0, 0, 'transparent'); Highcharts.getOptions().colors.splice(0, 0, 'transparent');
var chart = Highcharts.chart('chart_topic', { var chart = Highcharts.chart('chart_topic', {