diff --git a/src/api/index1.js b/src/api/index1.js index 85d83749..d5b33d83 100644 --- a/src/api/index1.js +++ b/src/api/index1.js @@ -2,7 +2,7 @@ * @Author: lixg lixg@dongwu-inc.com * @Date: 2022-11-04 22:45:31 * @LastEditors: lixg lixg@dongwu-inc.com - * @LastEditTime: 2023-01-09 16:29:37 + * @LastEditTime: 2023-01-10 17:38:43 * @FilePath: /fe-manage/src/api/index1.js * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE */ @@ -184,4 +184,6 @@ export const getImportStatus = (uuid) => http.get('/admin/student/getImportStatu // export const exportHomeWork=(obj)=>http.get('admin/student/exportHomeWork',{params:obj}) // 面授课导入学员 -export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, {headers: { "Content-Type": "multipart/form-data" }}) \ No newline at end of file +export const FaceTeachImportStudent = (obj) => http.post('/admin/student/importStudent', obj, { headers: { "Content-Type": "multipart/form-data" } }) +//成绩录入 +export const updateStudent = (obj) => http.post('/admin/student/updateStudent', obj) \ No newline at end of file diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 34b9fa3b..708ab66b 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -171,6 +171,7 @@ export default { const state = reactive({ template: process.env.VUE_APP_TEMPLATE + "导入学员模版-1672998102528.xlsx", importStudent: process.env.VUE_APP_BASE_API + "admin/student/importStudent", + timers: "", // 定时器,用于清空定时器使用 uploadpercent: -1, uploadErr: false, //上传失败 addLoading: false, @@ -182,6 +183,7 @@ export default { locationHref: location.href.indexOf('http://') !== -1 ? 'http://111.231.196.214:12016/' : location.href.slice(0, location.href.indexOf('/m')) + '/upload/' }); const closeDrawer = () => { + clearInterval(state.timers); state.fileList = []; state.uploadpercent = -1; state.addLoading = false; @@ -191,6 +193,8 @@ export default { state.errNum = 0; state.downloadErrUrl = ""; ctx.emit("update:AddImpStuvisible", false); + // 通知父组件重新获取学员列表 + ctx.emit("AddImpStuvisibleClose", false); }; const afterVisibleChange = (bool) => { @@ -228,7 +232,7 @@ export default { type: 3 }) let i = 0; - let timer = setInterval(() => { + state.timers = setInterval(() => { let uid = info.file.response.data; api .getImportStatus(uid) @@ -246,12 +250,12 @@ export default { state.succNum = res.data.data.successNum; state.errNum = res.data.data.failedNum; state.downloadErrUrl = res.data.data.url; - clearInterval(timer); + clearInterval(state.timers); } } }) .catch((err) => { - clearInterval(timer); + clearInterval(state.timers); state.showBottomBar = true; state.addLoading = false; console.log("查询导入状态失败", err); diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index 0c1a267e..929c4873 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -6,7 +6,7 @@ placement="right" width="700px" @after-visible-change="afterVisibleChange" - :zIndex="999" + :zIndex="1000" >