From 9defc58b73433fec5edd3e80cbe0e798e981bf09 Mon Sep 17 00:00:00 2001 From: Z Date: Mon, 30 Sep 2019 19:40:04 -0500 Subject: [PATCH 1/4] usernamenocheck --- src/views/login/index.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/login/index.vue b/src/views/login/index.vue index 47bafbac..31d0f0b9 100644 --- a/src/views/login/index.vue +++ b/src/views/login/index.vue @@ -83,7 +83,8 @@ export default { data() { const validateUsername = (rule, value, callback) => { if (!validUsername(value)) { - callback(new Error('Please enter the correct user name')) + callback() + // callback(new Error('Please enter the correct user name')) } else { callback() } From 9df303041dc49dcd7b739310312d382a9b70d3cc Mon Sep 17 00:00:00 2001 From: Z Date: Wed, 2 Oct 2019 16:33:36 -0500 Subject: [PATCH 2/4] fixedplot --- mock/user.js | 2 +- src/api/user.js | 2 +- src/utils/request.js | 2 +- src/views/VueUploader/index.vue | 17 ++++------------- 4 files changed, 7 insertions(+), 16 deletions(-) diff --git a/mock/user.js b/mock/user.js index 9810b161..6310ff06 100644 --- a/mock/user.js +++ b/mock/user.js @@ -84,7 +84,7 @@ export default [ // plot prediction graph { - url: '/testpredict', + url: '/testpppredict', type: 'get', response: _ => { return { diff --git a/src/api/user.js b/src/api/user.js index 883e00b8..429b7c46 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -29,7 +29,7 @@ export function sendAnalyzeRequest(token) { return request({ url: '/testpredict', method: 'get', - // baseURL: 'http://localhost:8010', + baseURL: 'http://localhost:8010', // authorization: token, // params: { token } }) diff --git a/src/utils/request.js b/src/utils/request.js index 1b76a5d1..d3b97ca8 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -7,7 +7,7 @@ import { getToken } from '@/utils/auth' const service = axios.create({ baseURL: process.env.VUE_APP_BASE_API, // url = base url + request url // withCredentials: true, // send cookies when cross-domain requests - timeout: 5000 // request timeout + timeout: 5000000 // request timeout }) // request interceptor diff --git a/src/views/VueUploader/index.vue b/src/views/VueUploader/index.vue index 9a071405..44a33f94 100644 --- a/src/views/VueUploader/index.vue +++ b/src/views/VueUploader/index.vue @@ -538,24 +538,15 @@ export default { this.listLoading = true sendAnalyzeRequest().then(response => { var token = response['token'] - var para = response['future'] + var future = response['future'] + var past = response['past'] // 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'] , - label: 'Past', - colorPicked: '#999997' - }, - future: { - yAxisData: [260, 230, 270, 285, 295, 300, 310,330], - xAxisData: ['2019-8-13', '2019-8-14', '2019-8-15', '2019-8-16', '2019-8-17', '2019-8-18', '2019-8-19', '2019-8-20'] , - label: 'Future', - colorPicked: '#519e19' - } + past, + future }}) } }) From cff22e44740359b8a636448fea1ebc3a5e4ebb85 Mon Sep 17 00:00:00 2001 From: Z Date: Wed, 2 Oct 2019 17:32:35 -0500 Subject: [PATCH 3/4] 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] From 9859e590f9df6a776df33682696951db6f36144f Mon Sep 17 00:00:00 2001 From: Z Date: Tue, 15 Oct 2019 18:44:52 -0500 Subject: [PATCH 4/4] addline --- src/views/VueUploader/index.vue | 36 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/src/views/VueUploader/index.vue b/src/views/VueUploader/index.vue index 022962db..b8c8208e 100644 --- a/src/views/VueUploader/index.vue +++ b/src/views/VueUploader/index.vue @@ -537,24 +537,24 @@ export default { this.$router.push({ name: "analyze" }) this.listLoading = true sendAnalyzeRequest().then(response => { - 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'] , - label: 'Past', - colorPicked: '#999997', - twoLines: true, - yAxisData2: [30, 140, 150, 200, 150, 170, 165, 170,150,230], - label2: 'Prediction', - colorPicked2: '#999997' - }, - future: { - yAxisData: [260, 230, 270, 285, 295, 300, 310,330], - xAxisData: ['2019-8-13', '2019-8-14', '2019-8-15', '2019-8-16', '2019-8-17', '2019-8-18', '2019-8-19', '2019-8-20'] , - label: 'Future', - colorPicked: '#519e19' - } - }}) + // 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'] , + // label: 'Past', + // colorPicked: '#999997', + // twoLines: true, + // yAxisData2: [30, 140, 150, 200, 150, 170, 165, 170,150,230], + // label2: 'Prediction', + // colorPicked2: '#999997' + // }, + // future: { + // yAxisData: [260, 230, 270, 285, 295, 300, 310,330], + // xAxisData: ['2019-8-13', '2019-8-14', '2019-8-15', '2019-8-16', '2019-8-17', '2019-8-18', '2019-8-19', '2019-8-20'] , + // label: 'Future', + // colorPicked: '#519e19' + // } + // }}) var token = response['token']