From cff22e44740359b8a636448fea1ebc3a5e4ebb85 Mon Sep 17 00:00:00 2001 From: Z Date: Wed, 2 Oct 2019 17:32:35 -0500 Subject: [PATCH] improveplot --- src/views/VueUploader/index.vue | 2 ++ .../dashboard/admin/components/LineChart.vue | 2 +- src/views/plotTest/plotTest.vue | 15 +++++++++++++++ 3 files changed, 18 insertions(+), 1 deletion(-) diff --git a/src/views/VueUploader/index.vue b/src/views/VueUploader/index.vue index 44a33f94..589dfe4a 100644 --- a/src/views/VueUploader/index.vue +++ b/src/views/VueUploader/index.vue @@ -540,12 +540,14 @@ export default { var token = response['token'] var future = response['future'] var past = response['past'] + var past_predict = response['past_predict'] // if the response from the server indicating that it's running the analysis, then redirect to a loading view if (token == 'success') { // this.$router.push({ name: "plot" }) this.$router.push({ name: "plotTest", params: { past, + past_predict, future }}) } diff --git a/src/views/dashboard/admin/components/LineChart.vue b/src/views/dashboard/admin/components/LineChart.vue index 2cd575d3..e9c7ffef 100644 --- a/src/views/dashboard/admin/components/LineChart.vue +++ b/src/views/dashboard/admin/components/LineChart.vue @@ -108,7 +108,7 @@ export default { data: yAxisData, animationDuration: 2800, animationEasing: 'cubicInOut' - } + }, // { // name: 'actual', // smooth: true, diff --git a/src/views/plotTest/plotTest.vue b/src/views/plotTest/plotTest.vue index d5b5e7d9..680c1ec4 100644 --- a/src/views/plotTest/plotTest.vue +++ b/src/views/plotTest/plotTest.vue @@ -63,6 +63,21 @@ export default { default: '#999997' } }, + past_predict: { + xAxisData: { + default: [120, 82, 91, 154, 162, 140, 145,230] + }, + yAxisData: { + default: ['a', 'x', 'c', 'd', 'e', 'f', 'g', 'h'] + }, + label: { + default: 'Future' + }, + colorPicked: { + default: '#999997' + } + }, + future: { xAxisData: { default: [120, 82, 91, 154, 162, 140, 145,230]