Merge pull request #6 from nowcastsystem/zhnew

Zhnew

mock/user.js

@@ -84,7 +84,7 @@ export default [
 
   // plot prediction graph
   {
-    url: '/testpredict',
+    url: '/testpppredict',
     type: 'get',
     response: _ => {
       return {

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 }
   })

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

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
           }})
         }
       })