From 1edb17ab8d9332fead5549bb556e6c9f50775181 Mon Sep 17 00:00:00 2001 From: weijianli Date: Wed, 2 Oct 2019 12:59:22 -0500 Subject: [PATCH] haha --- src/views/VueUploader/index.vue | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/src/views/VueUploader/index.vue b/src/views/VueUploader/index.vue index 9a804818..9a071405 100644 --- a/src/views/VueUploader/index.vue +++ b/src/views/VueUploader/index.vue @@ -531,8 +531,19 @@ export default { }, onSendAnalyzeRequest() { - var k = [100, 120, 161, 134, 105, 160, 165,190,200] - this.$router.push({ name: "plotTest", params: { + // var k = [100, 120, 161, 134, 105, 160, 165,190,200] + + + this.$router.push({ name: "analyze" }) + this.listLoading = true + sendAnalyzeRequest().then(response => { + var token = response['token'] + var para = response['future'] + + // 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: { yAxisData: [100, 120, 161, 134, 105, 160, 165, 190,200,250], xAxisData: ['2019-7-13', '2019-7-14', '2019-7-15', '2019-7-16', '2019-7-17', '2019-7-18', '2019-7-19', '2019-7-20','2019-7-21','2019-7-22'] , @@ -546,17 +557,8 @@ export default { colorPicked: '#519e19' } }}) - - // this.$router.push({ name: "analyze" }) - // this.listLoading = true - // sendAnalyzeRequest().then(response => { - // var token = response['token'] - // - // // 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" }) - // } - // }) + } + }) } }