diff --git a/src/api/upload.js b/src/api/upload.js new file mode 100644 index 0000000000000000000000000000000000000000..07bdbe3f1151c71cf5afd1338a63f203607cfcd8 --- /dev/null +++ b/src/api/upload.js @@ -0,0 +1,25 @@ +import service from '@/utils/service'; + +// 导入名单 +export function importStu(file) { + const data = { + file + } + return service({ + url: '/student/import', + method: 'post', + data: data + }) + } + + export function getPage(page, pageSize){ + const data = { + page, + pageSize + } + return service({ + url:'/student/page', + method:'get', + data:data + }) + } \ No newline at end of file diff --git a/src/utils/service.js b/src/utils/service.js index e4382ef63d781bdbec5aa6d7d33bda32bad48190..6058aae4c4d1b5d6805f5cb30b5c8d41b5d42dd2 100644 --- a/src/utils/service.js +++ b/src/utils/service.js @@ -3,7 +3,7 @@ import { getToken } from '@/utils/token' import { Message } from 'element-ui' const service = axios.create({ - baseURL: '/api', // baseURL 会自动加在每次请求的最前面,然后被 vue.config.js 解析 + baseURL: 'http://localhost:20235', // baseURL 会自动加在每次请求的最前面,然后被 vue.config.js 解析 timeout: 3000 }) diff --git a/src/views/admins/ImportListView.vue b/src/views/admins/ImportListView.vue index cce7a258c55171701a001435f7db47929173308c..2ae15a6500198cbf52a12d52a50d76c0a77a1058 100644 --- a/src/views/admins/ImportListView.vue +++ b/src/views/admins/ImportListView.vue @@ -1,152 +1,120 @@ - - + - - \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index cb525619f0da702d2c2bea20c51e926ac8c17328..cfe2c3536c708f3b391e3bb643e39b2ff59b70fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2038,10 +2038,48 @@ babel-plugin-dynamic-import-node@^2.3.3: dependencies: object.assign "^4.1.0" +<<<<<<< HEAD +"axios@^1.4.0": + "integrity" "sha512-S4XCWMEmzvo64T9GfvQDOXgYRDJ/wsSZc7Jvdgx5u1sd0JwsuPLqb3SYmusag+edF6ziyMensPVqLTSc1PiSEA==" + "resolved" "https://registry.npmjs.org/axios/-/axios-1.4.0.tgz" + "version" "1.4.0" + dependencies: + "follow-redirects" "^1.15.0" + "form-data" "^4.0.0" + "proxy-from-env" "^1.1.0" + +"babel-helper-vue-jsx-merge-props@^2.0.0": + "integrity" "sha512-gsLiKK7Qrb7zYJNgiXKpXblxbV5ffSwR0f5whkPAaBAR4fhi6bwRZxX9wBlIc5M/v8CCkXUbXZL4N/nSE97cqg==" + "resolved" "https://registry.npmmirror.com/babel-helper-vue-jsx-merge-props/-/babel-helper-vue-jsx-merge-props-2.0.3.tgz" + "version" "2.0.3" + +"babel-loader@^8.2.2": + "integrity" "sha512-H8SvsMF+m9t15HNLMipppzkC+Y2Yq+v3SonZyU70RBL/h1gxPkH08Ot8pEE9Z4Kd+czyWJClmFS8qzIP9OZ04Q==" + "resolved" "https://registry.npmmirror.com/babel-loader/-/babel-loader-8.3.0.tgz" + "version" "8.3.0" + dependencies: + "find-cache-dir" "^3.3.1" + "loader-utils" "^2.0.0" + "make-dir" "^3.1.0" + "schema-utils" "^2.6.5" + +"babel-plugin-dynamic-import-node@^2.3.3": + "integrity" "sha512-jZVI+s9Zg3IqA/kdi0i6UDCybUI3aSBLnglhYbSSjKlV7yF1F/5LWv8MakQmvYpnbJDS6fcBL2KzHSxNCMtWSQ==" + "resolved" "https://registry.npmmirror.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz" + "version" "2.3.3" + dependencies: + "object.assign" "^4.1.0" + +"babel-plugin-polyfill-corejs2@^0.3.3": + "integrity" "sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q==" + "resolved" "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz" + "version" "0.3.3" +======= babel-plugin-polyfill-corejs2@^0.3.3: version "0.3.3" resolved "https://registry.npmmirror.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.3.tgz" integrity sha512-8hOdmFYFSZhqg2C/JgLUQ+t52o5nirNwaWM2B9LWteozwIvM14VSwdsCAUET10qT+kmySAlseadmfeeSWFCy+Q== +>>>>>>> master dependencies: "@babel/compat-data" "^7.17.7" "@babel/helper-define-polyfill-provider" "^0.3.3" @@ -3564,10 +3602,17 @@ fraction.js@^4.2.0: resolved "https://registry.npmmirror.com/fraction.js/-/fraction.js-4.2.0.tgz" integrity sha512-MhLuK+2gUcnZe8ZHlaaINnQLl0xRIGRfcGk2yl8xoQAfHrSsL3rYu6FCmBdkdbhc9EPlwyGHewaRsvwRMJtAlA== +<<<<<<< HEAD +"follow-redirects@^1.0.0", "follow-redirects@^1.15.0": + "integrity" "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==" + "resolved" "https://registry.npmmirror.com/follow-redirects/-/follow-redirects-1.15.2.tgz" + "version" "1.15.2" +======= fresh@0.5.2: version "0.5.2" resolved "https://registry.npmmirror.com/fresh/-/fresh-0.5.2.tgz" integrity sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q== +>>>>>>> master fs-extra@^9.1.0: version "9.1.0" @@ -5541,10 +5586,22 @@ proxy-addr@~2.0.7: forwarded "0.2.0" ipaddr.js "1.9.1" +<<<<<<< HEAD +"proxy-from-env@^1.1.0": + "integrity" "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + "resolved" "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" + "version" "1.1.0" + +"prr@~1.0.1": + "integrity" "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw==" + "resolved" "https://registry.npmmirror.com/prr/-/prr-1.0.1.tgz" + "version" "1.0.1" +======= proxy-from-env@^1.1.0: version "1.1.0" resolved "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz" integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg== +>>>>>>> master prr@~1.0.1: version "1.0.1"