diff --git a/src/views/VueUploader/index.vue b/src/views/VueUploader/index.vue index 7b57f773..a4074912 100644 --- a/src/views/VueUploader/index.vue +++ b/src/views/VueUploader/index.vue @@ -537,29 +537,6 @@ export default { this.$router.push({ name: "analyze" }) this.listLoading = true sendAnalyzeRequest().then(response => { -<<<<<<< HEAD -======= - // 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' - // } - // }}) - - ->>>>>>> 9859e590f9df6a776df33682696951db6f36144f var token = response['token'] var future = response['future'] var past = response['past']