diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/app/desktop/views/pages/admin/admin.chart.chart.ts | 3 | ||||
| -rw-r--r-- | src/client/app/desktop/views/pages/admin/admin.chart.vue | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts index d79b0ba192..c09dc6dd8c 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts +++ b/src/client/app/desktop/views/pages/admin/admin.chart.chart.ts @@ -1,5 +1,6 @@ import Vue from 'vue'; import { Line } from 'vue-chartjs'; +import * as mergeOptions from 'merge-options'; export default Vue.extend({ extends: Line, @@ -21,7 +22,7 @@ export default Vue.extend({ }, methods: { render() { - this.renderChart(this.data, Object.assign({ + this.renderChart(this.data, mergeOptions({ responsive: false, scales: { xAxes: [{ diff --git a/src/client/app/desktop/views/pages/admin/admin.chart.vue b/src/client/app/desktop/views/pages/admin/admin.chart.vue index 4e0050e8b9..8db54174ff 100644 --- a/src/client/app/desktop/views/pages/admin/admin.chart.vue +++ b/src/client/app/desktop/views/pages/admin/admin.chart.vue @@ -173,7 +173,7 @@ export default Vue.extend({ driveChart(local: boolean, total: boolean): any { const data = this.stats.slice().reverse().map(x => ({ date: new Date(x.date), - count: local ? + size: local ? total ? x.drive.local.totalSize : x.drive.local.diffSize : total ? x.drive.remote.totalSize : x.drive.remote.diffSize })); @@ -186,7 +186,7 @@ export default Vue.extend({ borderWidth: 2, pointBackgroundColor: '#fff', lineTension: 0, - data: data.map(x => ({ t: x.date, y: x.count })) + data: data.map(x => ({ t: x.date, y: x.size })) }] }, { scales: { |