日常开发

src/utils/trainWs.ts

@@ -309,7 +309,7 @@ export function useWs() {
       });
       let timer1 = setInterval(() => {
         console.log("1111111111111")
-        if (examStateList[index].examState == 40 || examStateList[index].examState == 0) {
+        if (examStateList[index].examState != 3) {
           clearInterval(timer1);
           clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
@@ -342,7 +342,7 @@ export function useWs() {
       });
       let timer1 = setInterval(() => {
         console.log("2222222222222")
-        if (examStateList[index].examState == 41 || examStateList[index].examState == 0) {
+        if (examStateList[index].examState != 40) {
           clearInterval(timer1);
           clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
@@ -375,7 +375,7 @@ export function useWs() {
       });
       let timer1 = setInterval(() => {
         console.log("3333333333333")
-        if (examStateList[index].examState == 43 || examStateList[index].examState == 0) {
+        if (examStateList[index].examState != 41) {
           clearInterval(timer1);
           clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
@@ -460,7 +460,7 @@ export function useWs() {
       });
       let timer1 = setInterval(() => {
         console.log("4444444444444")
-        if (examStateList[index].examState == 3 || examStateList[index].examState == 0) {
+        if (examStateList[index].examState != 42) {
           clearInterval(timer1);
           clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
@@ -472,7 +472,7 @@ export function useWs() {
           clearTimeout(timer2);
           reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时：finish_one_test' } });
         }
-      }, 60000);
+      }, 30000);
     });
   }
 
@@ -493,7 +493,7 @@ export function useWs() {
       });
       let timer1 = setInterval(() => {
         console.log("5555555555555")
-        if (examStateList[index].examState == 3 || examStateList[index].examState == 0) {
+        if (examStateList[index].examState >= 3) {
           clearInterval(timer1);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });