From 7f835d7f763e343ba6b0fef14460bcae73f12617 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 13 Mar 2019 09:32:10 +0900 Subject: [PATCH] :art: --- .../app/admin/views/dashboard.queue-charts.vue | 11 ++++++++++- src/client/app/common/views/widgets/queue.vue | 15 ++++++++++----- 2 files changed, 20 insertions(+), 6 deletions(-) diff --git a/src/client/app/admin/views/dashboard.queue-charts.vue b/src/client/app/admin/views/dashboard.queue-charts.vue index 54b635915..f1d389014 100644 --- a/src/client/app/admin/views/dashboard.queue-charts.vue +++ b/src/client/app/admin/views/dashboard.queue-charts.vue @@ -43,11 +43,19 @@ export default Vue.extend({ stats(stats) { this.inChart.updateSeries([{ data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.inbox.active })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting })) }, { data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed })) }]); this.outChart.updateSeries([{ data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.deliver.active })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting })) }, { data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed })) }]); @@ -88,7 +96,8 @@ export default Vue.extend({ legend: { show: false }, - series: [{ data: [] }, { data: [] }] as any, + colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'], + series: [{ data: [] }, { data: [] }, { data: [] }, { data: [] }] as any, xaxis: { type: 'numeric', labels: { diff --git a/src/client/app/common/views/widgets/queue.vue b/src/client/app/common/views/widgets/queue.vue index 671163b7b..c28b5ea86 100644 --- a/src/client/app/common/views/widgets/queue.vue +++ b/src/client/app/common/views/widgets/queue.vue @@ -43,11 +43,19 @@ export default define({ stats(stats) { this.inChart.updateSeries([{ data: stats.map((x, i) => ({ x: i, y: x.inbox.activeSincePrevTick })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.inbox.active })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.inbox.waiting })) }, { data: stats.map((x, i) => ({ x: i, y: x.inbox.delayed })) }]); this.outChart.updateSeries([{ data: stats.map((x, i) => ({ x: i, y: x.deliver.activeSincePrevTick })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.deliver.active })) + }, { + data: stats.map((x, i) => ({ x: i, y: x.deliver.waiting })) }, { data: stats.map((x, i) => ({ x: i, y: x.deliver.delayed })) }]); @@ -81,11 +89,8 @@ export default define({ curve: 'straight', width: 1 }, - series: [{ - data: [] as any - }, { - data: [] as any - }], + colors: ['#00E396', '#00BCD4', '#FFB300', '#e53935'], + series: [{ data: [] }, { data: [] }, { data: [] }, { data: [] }] as any, yaxis: { min: 0, }