From 7107cf63910a8a40770ca8ffc230efce81dbe071 Mon Sep 17 00:00:00 2001 From: weijianli Date: Tue, 17 Sep 2019 19:28:41 -0500 Subject: [PATCH 1/2] remove useless items --- package.json | 5 +- src/api/user.js | 2 +- src/layout/index.vue | 7 +- src/router/index.js | 45 ++- src/router/modules/charts.js | 1 + src/router/modules/components.js | 1 + src/router/modules/nested.js | 1 + src/router/modules/table.js | 1 + src/views/Analyzing/analyzing.vue | 22 +- src/views/VueUploader/index.vue | 639 ++++++++++++++++-------------- src/views/plot/index.vue | 26 -- 11 files changed, 379 insertions(+), 371 deletions(-) delete mode 100644 src/views/plot/index.vue diff --git a/package.json b/package.json index 81fad796..3cb592c3 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,6 @@ "dropzone": "5.5.1", "echarts": "4.2.1", "element-ui": "2.7.0", - "eslint": "^6.3.0", "file-saver": "2.0.1", "fuse.js": "3.4.4", "jquery": "^3.4.1", @@ -94,8 +93,10 @@ "chalk": "2.4.2", "chokidar": "2.1.5", "connect": "3.6.6", - "eslint-plugin-vue": "^5.2.3", + "eslint": "5.15.3", + "eslint-plugin-vue": "5.2.2", "html-webpack-plugin": "3.2.0", + "husky": "1.3.1", "lint-staged": "8.1.5", "mockjs": "1.0.1-beta3", "node-sass": "^4.9.0", diff --git a/src/api/user.js b/src/api/user.js index de6a6c82..45c13b4d 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -27,7 +27,7 @@ export function sendAnalyzeRequest(token) { return request({ url: '/testpredict', method: 'get', - baseURL: 'http://localhost:8010', + baseURL: 'http://localhost:8888', params: { token } }) } diff --git a/src/layout/index.vue b/src/layout/index.vue index 965bcd1b..316bf698 100644 --- a/src/layout/index.vue +++ b/src/layout/index.vue @@ -8,16 +8,16 @@ - + + + --> \ No newline at end of file diff --git a/src/views/plot/index.vue b/src/views/plot/index.vue deleted file mode 100644 index a33371af..00000000 --- a/src/views/plot/index.vue +++ /dev/null @@ -1,26 +0,0 @@ - - - - - From b6a8d9c53a327691fc9ea9fe28a1b0bb22a8ef49 Mon Sep 17 00:00:00 2001 From: weijianli Date: Wed, 18 Sep 2019 13:45:20 -0500 Subject: [PATCH 2/2] update request timeout --- src/utils/request.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/utils/request.js b/src/utils/request.js index 1b76a5d1..e4c90266 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: 500000 // request timeout }) // request interceptor