Merge branch 'zcwy-zsx' into dev_master

src/views/investigat/InvestigatPage.vue

@@ -301,6 +301,11 @@ const { data } = useRequest(
     chapterOrStageId,
     targetId: infoId ? infoId : 0,
   },(res)=>{
+    if (res.code === 6) {
+      router.push({
+        path: "/NotProject2",
+      });
+    }
     if(res.data.projectInfoList.length == 0){
       res.data.projectInfoList=[
         {teacherName: '', courseName: '', projectName: ''}
@@ -309,11 +314,7 @@ const { data } = useRequest(
     }else{
       res.data.falseS = true
     }
-    if (res.code === 6) {
+     },
-      router.push({
-        path: "/NotProject2",
-      });
-    } },
   (e) => {
     useRequest(
       checkStudentExist,
@@ -426,7 +427,7 @@ onMounted(() => {
       result: JSON.stringify(data.value),
       beginTime: answerTime,
     })
-    if (res.data.isSubmit) {
+    if (res.code == 200 && res.data.isSubmit) {
       open();
     }   
   })