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" >
@@ -70,8 +70,8 @@
-
暂停
-
取消
+
@@ -207,7 +207,7 @@ export default { type: Number, default: null, }, - getStudent: { + searchTaskList: { type: Function, default: null, }, @@ -275,11 +275,12 @@ export default { message.destroy(); message.success(`${info.file.name}上传成功`); state.addLoading = false; + props.searchTaskList && props.searchTaskList(); } state.succNum = res.data.data.successNum; state.errNum = res.data.data.failedNum; state.downloadErrUrl = res.data.data.url; - props.getStudent && props.getStudent(); + console.log("props.getStudent", props.getStudent); clearInterval(timer); } } @@ -336,6 +337,10 @@ export default { state.fileList = []; state.uploadpercent = -1; state.uploadErr = false; //上传失败 + state.succNum = 0; + state.errNum = 0; + state.downloadErrUrl = null; + state.addLoading = false; }; // 下载失败数据 const downloadEeeorData = () => { diff --git a/src/components/drawers/project/ProjectFaceStu.vue b/src/components/drawers/project/ProjectFaceStu.vue index 35257f02..ab8ed207 100644 --- a/src/components/drawers/project/ProjectFaceStu.vue +++ b/src/components/drawers/project/ProjectFaceStu.vue @@ -180,7 +180,7 @@ - + { + console.log('关闭了导入学员弹框') + {/* 此处操作重新获取学员列表数据 */} + getStudent() + } + return { ...toRefs(state), selectProjectName, @@ -746,6 +754,7 @@ export default { changePaginationStu, exportTaskStu, clearLine, + AddImpStuvisibleClose }; }, }; diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index 9ccb6f57..edfa30f7 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -133,8 +133,8 @@ @@ -639,6 +639,7 @@ export default { exportTaskStu, exportHomeWork, exportHomeWorkShow, + getStudent, }; }, }; diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index cd3321d0..e0045294 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -174,7 +174,7 @@ - + { + console.log('关闭了导入学员弹框') + {/* 此处操作重新获取学员列表数据 */} + getStudent() + } + return { ...toRefs(state), selectProjectName, @@ -715,6 +723,7 @@ export default { exportTaskStu, clearLine, qrcodeVisible, + AddImpStuvisibleClose }; }, }; diff --git a/src/components/drawers/router/RouterHomeworkManage.vue b/src/components/drawers/router/RouterHomeworkManage.vue index 38f74e54..258327db 100644 --- a/src/components/drawers/router/RouterHomeworkManage.vue +++ b/src/components/drawers/router/RouterHomeworkManage.vue @@ -128,8 +128,8 @@ @@ -647,6 +647,7 @@ export default { exportTaskStu, exportHomeWork, exportHomeWorkShow, + getStudent, }; }, }; diff --git a/src/components/student/TableStudent.vue b/src/components/student/TableStudent.vue index b137a90a..69b12142 100644 --- a/src/components/student/TableStudent.vue +++ b/src/components/student/TableStudent.vue @@ -102,7 +102,9 @@ 批量换组 - 导出学习信息 + + 导出学习信息 + @@ -338,7 +340,12 @@ /> - + { getStuList(); }); - +watch(props.isgetStudent, () => { + console.log("监测"); +}); watch(props, () => { if (!props.visable) { stuSelectKeys.value = []; diff --git a/src/views/courselibrary/CoursewareManage.vue b/src/views/courselibrary/CoursewareManage.vue index 7c711c90..e893422e 100644 --- a/src/views/courselibrary/CoursewareManage.vue +++ b/src/views/courselibrary/CoursewareManage.vue @@ -93,7 +93,11 @@
-
+
导出
@@ -1090,7 +1094,7 @@
@@ -1706,6 +1710,7 @@ :id="offcoursePlanId" :columns="stuColumns" :visable="sm_hs" + :isgetStudent="isgetStudent" >