Merge branch 'compulsory_professional_skills' into test20250220

src/components/growthpath/GrowthScore.vue

@@ -268,16 +268,16 @@ export default {
               console.log("查询导入状态", res);
               if (res.data.code === 200) {
                 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++;
                   if (i === 1) {
                     message.destroy();

src/components/growthpath/ImportStu.vue

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