diff --git a/package.json b/package.json index 9942fbac..f1f60723 100644 --- a/package.json +++ b/package.json @@ -43,9 +43,12 @@ "url": "https://github.com/PanJiaChen/vue-element-admin/issues" }, "dependencies": { + "@xkeshi/image-compressor": "^0.5.3", "axios": "0.18.1", + "bootstrap": "4.3.1", "clipboard": "2.0.4", "codemirror": "5.45.0", + "cropper": "4.0.0", "driver.js": "0.9.5", "dropzone": "5.5.1", "echarts": "4.2.1", @@ -58,6 +61,7 @@ "normalize.css": "7.0.0", "nprogress": "0.2.0", "path-to-regexp": "2.4.0", + "popper.js": "1.15.0", "screenfull": "4.2.0", "showdown": "1.9.0", "sortablejs": "1.8.4", @@ -66,6 +70,7 @@ "vue-count-to": "1.0.13", "vue-router": "3.0.2", "vue-splitpane": "1.0.4", + "vue-upload-component": "2.8.20", "vuedraggable": "2.20.0", "vuex": "3.1.0", "xlsx": "0.14.1" diff --git a/src/api/user.js b/src/api/user.js index de69f707..6cff7f62 100644 --- a/src/api/user.js +++ b/src/api/user.js @@ -22,3 +22,11 @@ export function logout() { method: 'post' }) } + +export function sendAnalyzeRequest() { + return request({ + url: '/uploader/analyze', + method: 'get', + baseURL: 'http://www.google.com' + }) +} diff --git a/src/components/UploadExcel/index.vue b/src/components/UploadExcel/index.vue index 9e8ba8b6..48e19922 100644 --- a/src/components/UploadExcel/index.vue +++ b/src/components/UploadExcel/index.vue @@ -2,7 +2,7 @@
- Drop excel file here or + Drop file here or Browse @@ -113,6 +113,7 @@ export default { }, isExcel(file) { return /\.(xlsx|xls|csv)$/.test(file.name) + // return true } } } diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue index d9075a24..2f04decf 100644 --- a/src/layout/components/Navbar.vue +++ b/src/layout/components/Navbar.vue @@ -84,11 +84,12 @@ export default {