diff --git a/src/components/drawers/AddLevelImportStu.vue b/src/components/drawers/AddLevelImportStu.vue index 24d6ff3f..34b9fa3b 100644 --- a/src/components/drawers/AddLevelImportStu.vue +++ b/src/components/drawers/AddLevelImportStu.vue @@ -31,8 +31,11 @@ name="uploadFile" :multiple="false" @change="handleChange" - :data="{ - targetId: Number(courseId), + :data=" courseType==1?{ + stageId: Number(courseId), + type: 3 + }:{ + targetId: Number(courseId), type: 3 }" :showUploadList="false" @@ -196,6 +199,18 @@ export default { //上传文件 const handleChange = (info) => { console.log("info", info); + + if(info){ + var FileExt = info.file.name.replace(/.+\./, ""); + if (['xls','xlsx'].indexOf(FileExt.toLowerCase()) === -1){ + state.fileList = []; + state.uploadpercent = -1; + message.destroy() + message.error("请上传正确的文件格式") + return + } + } + state.addLoading = true; state.uploadErr = false; state.uploadpercent = parseInt(info.file.percent); diff --git a/src/components/drawers/ExportScore.vue b/src/components/drawers/ExportScore.vue index 75f331b5..0c1a267e 100644 --- a/src/components/drawers/ExportScore.vue +++ b/src/components/drawers/ExportScore.vue @@ -134,8 +134,10 @@ -
-
下载失败数据
+
+
+ 下载失败数据 +
{ ctx.emit("update:eScorevisible", false); @@ -232,20 +242,17 @@ export default { //上传文件 const handleChange = (info) => { - const isType = - info.file.name.indexOf(".xlsx") !== -1 || - info.file.name.indexOf(".xls") != -1; - console.log("info11111", info, isType); - if (!isType) { - message.destroy(); - message.error("仅支持xls、xlsx格式!"); - return; + if (info) { + var FileExt = info.file.name.replace(/.+\./, ""); + if (["xls", "xlsx"].indexOf(FileExt.toLowerCase()) === -1) { + state.fileList = []; + state.uploadpercent = -1; + message.destroy(); + message.error("请上传正确的文件格式"); + return; + } } - state.importHomeWorkData = { - // stageId:props.stageId, - // targetId:props.targetId, - type: props.type, - }; + state.addLoading = true; state.uploadpercent = parseInt(info.file.percent); console.log("我是文件上传的进度---------->", info.file.percent); @@ -271,11 +278,14 @@ export default { } state.succNum = res.data.data.successNum; state.errNum = res.data.data.failedNum; + state.downloadErrUrl = res.data.data.url; + props.getStudent && props.getStudent(); clearInterval(timer); } } }) .catch((err) => { + state.addLoading = false; clearInterval(timer); console.log("查询导入状态失败", err); }); @@ -327,6 +337,14 @@ export default { state.uploadpercent = -1; state.uploadErr = false; //上传失败 }; + // 下载失败数据 + const downloadEeeorData = () => { + console.log(state.locationHref + state.downloadErrUrl); + if (state.downloadErrUrl !== "") { + window.open(state.locationHref + state.downloadErrUrl); + } + }; + return { ...toRefs(state), afterVisibleChange, @@ -336,6 +354,7 @@ export default { beforeUpload, handleUpload, removeUpload, + downloadEeeorData, }; }, }; diff --git a/src/components/drawers/project/ProjectHomeWorkManage.vue b/src/components/drawers/project/ProjectHomeWorkManage.vue index c86e0d2f..9ccb6f57 100644 --- a/src/components/drawers/project/ProjectHomeWorkManage.vue +++ b/src/components/drawers/project/ProjectHomeWorkManage.vue @@ -134,6 +134,7 @@ v-model:eScorevisible="Evisible" :type="1" :id="datasource.projectTaskId" + v-model:getStudent="getStudent" /> diff --git a/src/components/drawers/router/RouterFaceStu.vue b/src/components/drawers/router/RouterFaceStu.vue index e86647bb..cd3321d0 100644 --- a/src/components/drawers/router/RouterFaceStu.vue +++ b/src/components/drawers/router/RouterFaceStu.vue @@ -174,7 +174,7 @@ - +