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

调整APP相关趋势图数据比较接近时的颜色区分

Browse Source
This commit is contained in:
dongxiaoyan
2019-02-25 09:29:53 +08:00
committed by 段冬梅
parent 6d9060bb49
commit 7583c01432
1 changed files with 89 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files

160
src/main/webapp/WEB-INF/views/dashboard/trafficAppTrendList.jsp
View File

@@ -741,6 +741,7 @@
marker: {
enabled: false
},
fillOpacity: 0.2 ,// 透明度
data: (function () {
var data = [];
if(sipResult!=null&&sipResult.length>0){
@@ -776,6 +777,7 @@
marker: {
enabled: false
},
fillOpacity: 0.2, // 透明度
data: (function () {
var data = [];
if(dipResult!=null&&dipResult.length>0){
@@ -810,48 +812,51 @@
s2cResult=intData.s2cResult;
totalResult=intData.totalResult;
zxchart=[{
name: 'c2s',
lineColor:'#a9d4cf',
lineWidth:1,
marker: {
enabled: false
},
data: (function () {
var data = [];
if(c2sResult!=null&&c2sResult.length>0){
var count=10;
if(c2sResult.length<10){
count=c2sResult.length;
}
for (var i = 0; i < count; i++) {
var d =c2sResult[i];
var x = d[0], // 时间
y = d[1];
zxchart=[
{
name: 'total',
lineColor:'#709c58',
lineWidth:1,
marker: {
enabled: false
},
fillOpacity: 0.2, // 透明度
data: (function () {
var data = [];
if(totalResult!=null&&totalResult.length>0){
var count=10;
if(totalResult.length<10){
count=totalResult.length;
}
for (var i = 0; i < count; i++) {
var d =totalResult[i];
var x = d[0], // 当前时间
y = d[1];
data.push({
x: x,
y: y
});
}
}else{
var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
for (var i = 0; i <10; i++) {
data.push({
x: x,
y: y
x: time + i * 1000*60,
y: 0
});
}
}
} else{
var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
for (var i = 0; i <10; i++) {
data.push({
x: time + i * 1000*60,
y: 0
});
}
}
return data;
}())
},
return data;
}())
},
{
name: 's2c',
lineColor:'#eecf8d',
lineColor:'#c9a206',
lineWidth:1,
marker: {
enabled: false
},
fillOpacity: 0.15, // 透明度
data: (function () {
var data = [];
if(s2cResult!=null&&s2cResult.length>0){
@@ -880,30 +885,31 @@
return data;
}())
},
{
name: 'total',
lineColor:'#ebb093',
{
name: 'c2s',
lineColor:'#64b5c5',
lineWidth:1,
marker: {
enabled: false
},
fillOpacity: 0.1, // 透明度
data: (function () {
var data = [];
if(totalResult!=null&&totalResult.length>0){
var count=10;
if(totalResult.length<10){
count=totalResult.length;
}
for (var i = 0; i < count; i++) {
var d =totalResult[i];
var x = d[0], // 当前时间
y = d[1];
if(c2sResult!=null&&c2sResult.length>0){
var count=10;
if(c2sResult.length<10){
count=c2sResult.length;
}
for (var i = 0; i < count; i++) {
var d =c2sResult[i];
var x = d[0], // 时间
y = d[1];
data.push({
x: x,
y: y
});
}
}else{
} else{
var time = (new Date()).getTime()-(1000 * 60 * 10+1000 * 60 * 5);
for (var i = 0; i <10; i++) {
data.push({
@@ -911,10 +917,11 @@
y: 0
});
}
}
}
return data;
}())
}]
}
]
}
var nowDate=new Date();
@@ -956,7 +963,9 @@
}
}
},
colors:['#a9d4cf','#eecf8d','#ebb093'],
// colors:['#a9d4cf','#eecf8d','#ebb093'],
colors:['#709c58','#c9a206','#64b5c5'],
title : {
text : (function () {
var timebe=(new Date().getTime())-(1000 * 60 * 6);
@@ -1020,7 +1029,7 @@
radiusPlus : 5
}
},
fillOpacity: 0.2 // 透明度
// fillOpacity: 0.2 // 透明度
}
},
series: zxchart
@@ -1074,12 +1083,12 @@
var s2cRes=realTimeData.s2cResult;
var totalRes=realTimeData.totalResult;
var d =c2sRes[0];
series.addPoint([d[0], d[1]], true, true);
var s =totalRes[0];
series.addPoint([s[0], s[1]], true, true);
var t =s2cRes[0];
series1.addPoint([t[0], t[1]], true, true);
var s =totalRes[0];
series2.addPoint([s[0], s[1]], true, true);
var d =c2sRes[0];
series2.addPoint([d[0], d[1]], true, true);
}
}else{
@@ -1129,7 +1138,8 @@
lineWidth:1,
marker: {
enabled: false
}
},
fillOpacity: 0.2 // 透明度
},
{
name: '<spring:message code="server_ip"/>',
@@ -1138,35 +1148,42 @@
lineWidth:1,
marker: {
enabled: false
}
},
fillOpacity: 0.2 // 透明度
}]
}else{
lsChart= [{
name: 'c2s',
data: c2sResult,
lineColor:'#a9d4cf',
lsChart= [
{
name: 'total',
data: totalResult,
// lineColor:'#D9853A',
lineColor:'#709c58',
lineWidth:1,
marker: {
enabled: false
}
},
fillOpacity: 0.2 // 透明度
},
{
name: 's2c',
data: s2cResult,
lineColor:'#eecf8d',
// lineColor:'#EAB33B',
lineColor:'#c9a206',
lineWidth:1,
marker: {
enabled: false
}
},
{
name: 'total',
data: totalResult,
lineColor:'#ebb093',
},
fillOpacity: 0.15 // 透明度
},{
name: 'c2s',
data: c2sResult,
// lineColor:'#E5E2CD',
lineColor:'#64b5c5',
lineWidth:1,
marker: {
enabled: false
}
},
fillOpacity: 0.1 // 透明度
}]
}
@@ -1200,7 +1217,8 @@
}
}
},
colors:['#a9d4cf','#eecf8d','#ebb093'],
// colors:['#EF843C','#EFCA6B','#6ED0E0'],
colors:['#709c58','#c9a206','#64b5c5'],
title : {
text : '<spring:message code="${appName}"></spring:message> '+$("#beginDateh").val()+'--'+$("#endDateh").val()+''
},
@@ -1255,7 +1273,7 @@
radiusPlus : 5
}
},
fillOpacity: 0.2 // 透明度
// fillOpacity: 0.2 // 透明度
}
},
series:lsChart