Merge branch 'master-V32-XuHaoJie' into 'master'
杭州-电子税务大屏-申报cpu监控、文书库cpu监控 See merge request !69
Showing
2 changed files
with
34 additions
and
7 deletions
| @@ -35,7 +35,21 @@ export default { | @@ -35,7 +35,21 @@ export default { | ||
| 35 | { | 35 | { |
| 36 | name:'89.12.97.3', | 36 | name:'89.12.97.3', |
| 37 | datas:[1,1,1,1,1,1,1,1], | 37 | datas:[1,1,1,1,1,1,1,1], |
| 38 | - flag:'vmem' | 38 | + flag:'cpu' |
| 39 | + } | ||
| 40 | + ] | ||
| 41 | + } | ||
| 42 | + }, | ||
| 43 | + res2:{ | ||
| 44 | + code:'0', | ||
| 45 | + data:{ | ||
| 46 | + kpiUnit:'%', | ||
| 47 | + names:['20:10','21:10','22:15','23:15'], | ||
| 48 | + series:[ | ||
| 49 | + { | ||
| 50 | + name:'89.12.97.2', | ||
| 51 | + datas:[1,1,1,1,1,1,1,1], | ||
| 52 | + flag:'cpu' | ||
| 39 | } | 53 | } |
| 40 | ] | 54 | ] |
| 41 | } | 55 | } |
| @@ -73,7 +87,6 @@ export default { | @@ -73,7 +87,6 @@ export default { | ||
| 73 | methods: { | 87 | methods: { |
| 74 | getData1(that){ | 88 | getData1(that){ |
| 75 | // const { proxy } = Vue.getCurrentInstance(); | 89 | // const { proxy } = Vue.getCurrentInstance(); |
| 76 | - | ||
| 77 | var params = { | 90 | var params = { |
| 78 | resId: that.resId1, | 91 | resId: that.resId1, |
| 79 | kpiIds: that.kpiIds, | 92 | kpiIds: that.kpiIds, |
| @@ -89,10 +102,10 @@ export default { | @@ -89,10 +102,10 @@ export default { | ||
| 89 | if(res.data.series && res.data.series.length>0){ | 102 | if(res.data.series && res.data.series.length>0){ |
| 90 | resData=res.data; | 103 | resData=res.data; |
| 91 | }else{ | 104 | }else{ |
| 92 | - resData=that.res1.data; | 105 | + resData=that.res2.data; |
| 93 | } | 106 | } |
| 94 | }else{ | 107 | }else{ |
| 95 | - resData=that.res1.data; | 108 | + resData=that.res2.data; |
| 96 | 109 | ||
| 97 | } | 110 | } |
| 98 | that.allData.polyline.data.push(resData.series[0]) | 111 | that.allData.polyline.data.push(resData.series[0]) |
| @@ -32,7 +32,21 @@ export default { | @@ -32,7 +32,21 @@ export default { | ||
| 32 | names:['20:10','21:10','22:15','23:15'], | 32 | names:['20:10','21:10','22:15','23:15'], |
| 33 | series:[ | 33 | series:[ |
| 34 | { | 34 | { |
| 35 | - name:'89.12.97.3', | 35 | + name:'80.12.97.7', |
| 36 | + datas:[1,1,1,1,1,1,1,1], | ||
| 37 | + flag:'cpu' | ||
| 38 | + } | ||
| 39 | + ] | ||
| 40 | + } | ||
| 41 | + }, | ||
| 42 | + res2:{ | ||
| 43 | + code:'0', | ||
| 44 | + data:{ | ||
| 45 | + kpiUnit:'%', | ||
| 46 | + names:['20:10','21:10','22:15','23:15'], | ||
| 47 | + series:[ | ||
| 48 | + { | ||
| 49 | + name:'80.12.97.8', | ||
| 36 | datas:[1,1,1,1,1,1,1,1], | 50 | datas:[1,1,1,1,1,1,1,1], |
| 37 | flag:'cpu' | 51 | flag:'cpu' |
| 38 | } | 52 | } |
| @@ -83,11 +97,11 @@ export default { | @@ -83,11 +97,11 @@ export default { | ||
| 83 | if(res.data.series && res.data.series.length>0){ | 97 | if(res.data.series && res.data.series.length>0){ |
| 84 | resData=res.data; | 98 | resData=res.data; |
| 85 | }else{ | 99 | }else{ |
| 86 | - resData=that.res1.data; | 100 | + resData=that.res2.data; |
| 87 | } | 101 | } |
| 88 | 102 | ||
| 89 | }else{ | 103 | }else{ |
| 90 | - resData=that.res1.data | 104 | + resData=that.res2.data |
| 91 | } | 105 | } |
| 92 | that.allData.polyline.data.push(resData.series[0]) | 106 | that.allData.polyline.data.push(resData.series[0]) |
| 93 | that.updateChart() | 107 | that.updateChart() |
-
Please register or login to post a comment