Authored by 王涛

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

杭州-电子税务局-cpu监控优化



See merge request !72
@@ -13,12 +13,12 @@ export default { @@ -13,12 +13,12 @@ export default {
13 allData: { 13 allData: {
14 polyline: { 14 polyline: {
15 title: "申报库CPU监控", 15 title: "申报库CPU监控",
16 - unit: "cpu%", 16 + unit: "cpu使用率%",
17 data: [{ 17 data: [{
18 - name: "80.12.97.2", 18 + name: "80.12.97.3",
19 datas: ["12","15","21","18","20","37","45","23","12","5","7","14"] 19 datas: ["12","15","21","18","20","37","45","23","12","5","7","14"]
20 }, { 20 }, {
21 - name: "80.12.77.3", 21 + name: "80.12.97.2",
22 datas: ["22","35","41","68","70","57","45","33","24","15","7","10"] 22 datas: ["22","35","41","68","70","57","45","33","24","15","7","10"]
23 }] 23 }]
24 }, 24 },
@@ -33,8 +33,8 @@ export default { @@ -33,8 +33,8 @@ export default {
33 names:['20:10','21:10','22:15','23:15'], 33 names:['20:10','21:10','22:15','23:15'],
34 series:[ 34 series:[
35 { 35 {
36 - name:'89.12.97.3',  
37 - datas:[1,1,1,1,1,1,1,1], 36 + name:'80.12.97.3',
  37 + datas:[0,0,0,0,0,0,0,0],
38 flag:'cpu' 38 flag:'cpu'
39 } 39 }
40 ] 40 ]
@@ -47,8 +47,8 @@ export default { @@ -47,8 +47,8 @@ export default {
47 names:['20:10','21:10','22:15','23:15'], 47 names:['20:10','21:10','22:15','23:15'],
48 series:[ 48 series:[
49 { 49 {
50 - name:'89.12.97.2',  
51 - datas:[1,1,1,1,1,1,1,1], 50 + name:'80.12.97.2',
  51 + datas:[0,0,0,0,0,0,0,0],
52 flag:'cpu' 52 flag:'cpu'
53 } 53 }
54 ] 54 ]
@@ -58,7 +58,7 @@ export default { @@ -58,7 +58,7 @@ export default {
58 endValue: 9, // 区域缩放的终点值 58 endValue: 9, // 区域缩放的终点值
59 timerId: null, // 定时器的标识 59 timerId: null, // 定时器的标识
60 titleFontSize: 30, 60 titleFontSize: 30,
61 - kpiIds:'KPI20352505', 61 + kpiIds:'KPI7054BC34',
62 resId:'4c582c0603654352ba4f905e88a56863', 62 resId:'4c582c0603654352ba4f905e88a56863',
63 resId1:'adeeddd6023a4157be523ac5d3b60ed6', 63 resId1:'adeeddd6023a4157be523ac5d3b60ed6',
64 64
@@ -143,7 +143,7 @@ export default { @@ -143,7 +143,7 @@ export default {
143 that.allData = { 143 that.allData = {
144 polyline: { 144 polyline: {
145 title: "申报库CPU监控", 145 title: "申报库CPU监控",
146 - unit: "cpu%", 146 + unit: "cpu使用率%",
147 data: seriesData1 147 data: seriesData1
148 }, 148 },
149 xAxis: { 149 xAxis: {
@@ -12,12 +12,12 @@ export default { @@ -12,12 +12,12 @@ export default {
12 allData: { 12 allData: {
13 polyline: { 13 polyline: {
14 title: "文书库CPU监控", 14 title: "文书库CPU监控",
15 - unit: "cpu%", 15 + unit: "cpu使用率%",
16 data: [{ 16 data: [{
17 - name: "80.12.97.2", 17 + name: "80.12.97.7",
18 data: ["12","15","21","18","20","37","45","23","12","5","7","14"] 18 data: ["12","15","21","18","20","37","45","23","12","5","7","14"]
19 }, { 19 }, {
20 - name: "80.12.77.3", 20 + name: "80.12.97.8",
21 data: ["22","35","41","68","70","57","45","33","24","15","7","10"] 21 data: ["22","35","41","68","70","57","45","33","24","15","7","10"]
22 }] 22 }]
23 }, 23 },
@@ -33,7 +33,7 @@ export default { @@ -33,7 +33,7 @@ export default {
33 series:[ 33 series:[
34 { 34 {
35 name:'80.12.97.7', 35 name:'80.12.97.7',
36 - datas:[1,1,1,1,1,1,1,1], 36 + datas:[0,0,0,0,0,0,0,0],
37 flag:'cpu' 37 flag:'cpu'
38 } 38 }
39 ] 39 ]
@@ -47,14 +47,14 @@ export default { @@ -47,14 +47,14 @@ export default {
47 series:[ 47 series:[
48 { 48 {
49 name:'80.12.97.8', 49 name:'80.12.97.8',
50 - datas:[1,1,1,1,1,1,1,1], 50 + datas:[0,0,0,0,0,0,0,0],
51 flag:'cpu' 51 flag:'cpu'
52 } 52 }
53 ] 53 ]
54 } 54 }
55 }, 55 },
56 titleFontSize: 30, 56 titleFontSize: 30,
57 - kpiIds:'KPI20352505', 57 + kpiIds:'KPI7054BC34',
58 resId:'166eb917fe734dafa2d2474b0a66c37b', 58 resId:'166eb917fe734dafa2d2474b0a66c37b',
59 resId1:'0002fe6fd00c4ab3b6383104b1565c18', 59 resId1:'0002fe6fd00c4ab3b6383104b1565c18',
60 startValue: 0, // 区域缩放的起点值 60 startValue: 0, // 区域缩放的起点值
@@ -135,7 +135,7 @@ export default { @@ -135,7 +135,7 @@ export default {
135 that.allData = { 135 that.allData = {
136 polyline: { 136 polyline: {
137 title: "文书库CPU监控", 137 title: "文书库CPU监控",
138 - unit: "cpu%", 138 + unit: "cpu使用率%",
139 data: seriesData1 139 data: seriesData1
140 }, 140 },
141 xAxis: { 141 xAxis: {