Merge pull request #7 from nowcastsystem/zhnew

improveplot

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

src/views/dashboard/admin/components/LineChart.vue

@@ -108,7 +108,7 @@ export default {
           data: yAxisData,
           animationDuration: 2800,
           animationEasing: 'cubicInOut'
-        }
+        },
         // {
         //   name: 'actual',
         //   smooth: true,

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]