Merge branch 'compulsory_professional_skills' into test20250220

This commit is contained in:
joshen
2025-02-28 00:25:50 +08:00
2 changed files with 16 additions and 11 deletions

View File

@@ -268,16 +268,16 @@ export default {
console.log("查询导入状态", res); console.log("查询导入状态", res);
if (res.data.code === 200) { if (res.data.code === 200) {
if (res.data.data.status !== "START") { if (res.data.data.status !== "START") {
if (res.data.data.status === "SUCCESS") { // if (res.data.data.status === "SUCCESS") {
state.addLoading = false; // state.addLoading = false;
state.fileList = []; // state.fileList = [];
state.uploadpercent = -1; // state.uploadpercent = -1;
message.destroy(); // message.destroy();
// message.error(`当前开课暂无作业,无法导入成绩`); // message.error(`当前开课暂无作业,无法导入成绩`);
clearInterval(timer); // clearInterval(timer);
clearTimeout(timeouts); // clearTimeout(timeouts);
return; // return;
} // }
i++; i++;
if (i === 1) { if (i === 1) {
message.destroy(); message.destroy();

View File

@@ -346,7 +346,7 @@ export default {
}); });
state.fileName = info.file.name; state.fileName = info.file.name;
let i = 0; let i = 0;
message.success("导入成功");
if (info.file.response.code == 1) { if (info.file.response.code == 1) {
state.fileList = []; state.fileList = [];
state.addLoading = false; state.addLoading = false;
@@ -354,6 +354,11 @@ export default {
message.destroy(); message.destroy();
message.error(info.file.response.msg); message.error(info.file.response.msg);
return; return;
}else if(info.file.response.code === -1){
state.uploadpercent = -1;
message.error(info.file.response.message);
}else{
message.success("导入成功");
} }
// state.timers = setInterval(() => { // state.timers = setInterval(() => {
// state.redisKey = info.file.response.data; // state.redisKey = info.file.response.data;