diff --git a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue index 5b75ac1..43dbf83 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/cpu.vue @@ -813,7 +813,6 @@ export default { &-item { width: 100%; height: 100%; - // background: #ade6ee; &-chart { width: 100%; height: calc(100% - 40px); @@ -831,7 +830,7 @@ export default { font-size: 14px; font-weight: normal; color: #ffffff; - margin-left: 10px; + // margin-left: 5px; span { color: #00e9fe; background: none; diff --git a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue index 43a213a..00d2669 100644 --- a/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue +++ b/src/views/abnormalAlarm/serverMonitor/instances/serviceProcess.vue @@ -216,14 +216,26 @@ export default { processCpu: { content: null, legend: ['mysqld.exe', 'svchost.exe'], - color: ['#2d5cd3', '#60cae8', '#1ab060', '#ffbf44', '#e86954', 'red'], + color: [ + ['rgb(45, 92, 211)', 'rgba(45, 92, 211,0)'], + ['rgb(96, 202, 232)', 'rgba(96, 202, 232,0)'], + ['rgb(26, 176, 96)', 'rgba(26, 176, 96,0)'], + ['rgb(255, 191, 68)', 'rgba(255, 191, 68,0)'], + ['rgb(232, 105, 84)', 'rgba(232, 105, 84,0)'], + ], xData: [], data: [], }, processMenbry: { content: null, legend: ['mysqld.exe', 'svchost.exe'], - color: ['#2d5cd3', '#60cae8', '#1ab060', '#ffbf44', '#e86954', 'red'], + color: [ + ['rgb(45, 92, 211)', 'rgba(45, 92, 211,0)'], + ['rgb(96, 202, 232)', 'rgba(96, 202, 232,0)'], + ['rgb(26, 176, 96)', 'rgba(26, 176, 96,0)'], + ['rgb(255, 191, 68)', 'rgba(255, 191, 68,0)'], + ['rgb(232, 105, 84)', 'rgba(232, 105, 84,0)'], + ], xData: [], data: [], }, @@ -242,7 +254,6 @@ export default { showSizeChanger: true, total: 0, }, - xData: ['Mon', 'Tue', 'Wed', 'Thu', 'Fri', 'Sat', 'Sun'], rankData: {}, } }, @@ -525,12 +536,12 @@ export default { type: 'line', name: item.name, symbol: 'none', - itemStyle: { normal: { color: this.processCpu.color[index] } }, + itemStyle: { normal: { color: this.processCpu.color[index][0] } }, areaStyle: { normal: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: this.processCpu.color[index] }, - { offset: 1, color: 'rgba(255,255,255,0)' }, + { offset: 0, color: this.processCpu.color[index][0] }, + { offset: 1, color: this.processCpu.color[index][1] }, ]), }, }, @@ -599,12 +610,12 @@ export default { type: 'line', name: item.name, symbol: 'none', - itemStyle: { normal: { color: this.processCpu.color[index] } }, + itemStyle: { normal: { color: this.processMenbry.color[index][0] } }, areaStyle: { normal: { color: new echarts.graphic.LinearGradient(0, 0, 0, 1, [ - { offset: 0, color: this.processCpu.color[index] }, - { offset: 1, color: 'rgba(255,255,255,0)' }, + { offset: 0, color: this.processMenbry.color[index][0] }, + { offset: 1, color: this.processMenbry.color[index][1] }, ]), }, },