monitor_v3 / hg-monitor-web · Commits

Go to a project

Authored by 王涛
Commit dd99937e547736d70ff2ac13c44d7e321d15d9c1 2 parents 87baa318 e2f240e3

Merge branch 'master-V32-XuHaoJie' into 'master' 

杭州-电子税务大屏-申报cpu监控、文书库cpu监控



See merge request !69
Inline Side-by-side
Showing 2 changed files with 34 additions and 7 deletions
... ... @@ -35,7 +35,21 @@ export default {
{
name:'89.12.97.3',
datas:[1,1,1,1,1,1,1,1],
flag:'vmem'
flag:'cpu'
}
]
}
},
res2:{
code:'0',
data:{
kpiUnit:'%',
names:['20:10','21:10','22:15','23:15'],
series:[
{
name:'89.12.97.2',
datas:[1,1,1,1,1,1,1,1],
flag:'cpu'
}
]
}
... ... @@ -73,7 +87,6 @@ export default {
methods: {
getData1(that){
// const { proxy } = Vue.getCurrentInstance();
var params = {
resId: that.resId1,
kpiIds: that.kpiIds,
... ... @@ -89,10 +102,10 @@ export default {
if(res.data.series && res.data.series.length>0){
resData=res.data;
}else{
resData=that.res1.data;
resData=that.res2.data;
}
}else{
resData=that.res1.data;
resData=that.res2.data;
}
that.allData.polyline.data.push(resData.series[0])
... ...
... ... @@ -32,7 +32,21 @@ export default {
names:['20:10','21:10','22:15','23:15'],
series:[
{
name:'89.12.97.3',
name:'80.12.97.7',
datas:[1,1,1,1,1,1,1,1],
flag:'cpu'
}
]
}
},
res2:{
code:'0',
data:{
kpiUnit:'%',
names:['20:10','21:10','22:15','23:15'],
series:[
{
name:'80.12.97.8',
datas:[1,1,1,1,1,1,1,1],
flag:'cpu'
}
... ... @@ -83,11 +97,11 @@ export default {
if(res.data.series && res.data.series.length>0){
resData=res.data;
}else{
resData=that.res1.data;
resData=that.res2.data;
}
}else{
resData=that.res1.data
resData=that.res2.data
}
that.allData.polyline.data.push(resData.series[0])
that.updateChart()
... ...