Browse Source

日常开发

林旭祥 9 months ago
parent
commit
d4641bc726
1 changed files with 18 additions and 20 deletions
  1. 18 20
      src/utils/ws.ts

+ 18 - 20
src/utils/ws.ts

@@ -216,7 +216,6 @@ export const openOneTest = (data?: any) => {
     let index = examStateList.findIndex((item: any) => {
       return item.examId == examId;
     });
-    let examState = examStateList[index].examState;
     sendMessage('msgfrom_frontend', {
       data: {
         cmd: 'open_one_test',
@@ -224,14 +223,14 @@ export const openOneTest = (data?: any) => {
       }
     });
     let timer1 = setInterval(() => {
-      if (examState == 40) {
+      if (examStateList[index].examState == 40) {
         clearInterval(timer1);
         clearTimeout(timer2);
-        resolve({ data: examState });
+        resolve({ data: examStateList[index].examState });
       }
     }, 250);
     let timer2 = setTimeout(() => {
-      if (examState == 3) {
+      if (examStateList[index].examState == 3) {
         clearInterval(timer1);
         clearTimeout(timer2);
         reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时:open_one_test' } });
@@ -249,7 +248,6 @@ export const startFace = (data?: any) => {
     let index = examStateList.findIndex((item: any) => {
       return item.examId == examId;
     });
-    let examState = examStateList[index].examState;
     sendMessage('msgfrom_frontend', {
       data: {
         cmd: 'start_face_recognition',
@@ -257,14 +255,14 @@ export const startFace = (data?: any) => {
       }
     });
     let timer1 = setInterval(() => {
-      if (examState == 41) {
+      if (examStateList[index].examState == 41) {
         clearInterval(timer1);
         clearTimeout(timer2);
-        resolve({ data: examState });
+        resolve({ data: examStateList[index].examState });
       }
     }, 250);
     let timer2 = setTimeout(() => {
-      if (examState == 40) {
+      if (examStateList[index].examState == 40) {
         clearInterval(timer1);
         clearTimeout(timer2);
         reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时:start_face_recognition' } });
@@ -282,7 +280,6 @@ export const stopFace = (data?: any) => {
     let index = examStateList.findIndex((item: any) => {
       return item.examId == examId;
     });
-    let examState = examStateList[index].examState;
     sendMessage('msgfrom_frontend', {
       data: {
         cmd: 'stop_face_recognition',
@@ -290,14 +287,14 @@ export const stopFace = (data?: any) => {
       }
     });
     let timer1 = setInterval(() => {
-      if (examState == 43) {
+      if (examStateList[index].examState == 43) {
         clearInterval(timer1);
         clearTimeout(timer2);
-        resolve({ data: examState });
+        resolve({ data: examStateList[index].examState });
       }
     }, 250);
     let timer2 = setTimeout(() => {
-      if (examState == 41) {
+      if (examStateList[index].examState == 41) {
         clearInterval(timer1);
         clearTimeout(timer2);
         reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时:stop_face_recognition' } });
@@ -367,7 +364,6 @@ export const finishOneTest = (data?: any) => {
     let index = examStateList.findIndex((item: any) => {
       return item.examId == examId;
     });
-    let examState = examStateList[index].examState;
     sendMessage('msgfrom_frontend', {
       data: {
         cmd: 'finish_one_test',
@@ -375,14 +371,14 @@ export const finishOneTest = (data?: any) => {
       }
     });
     let timer1 = setInterval(() => {
-      if (examState == 3) {
+      if (examStateList[index].examState == 3) {
         clearInterval(timer1);
         clearTimeout(timer2);
-        resolve({ data: examState });
+        resolve({ data: examStateList[index].examState });
       }
     }, 250);
     let timer2 = setTimeout(() => {
-      if (examState == 42) {
+      if (examStateList[index].examState == 42) {
         clearInterval(timer1);
         clearTimeout(timer2);
         reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时:finish_one_test' } });
@@ -400,7 +396,6 @@ export const closeOneTest = (data?: any) => {
     let index = examStateList.findIndex((item: any) => {
       return item.examId == examId;
     });
-    let examState = examStateList[index].examState;
     sendMessage('msgfrom_frontend', {
       data: {
         cmd: 'close_one_test',
@@ -408,14 +403,14 @@ export const closeOneTest = (data?: any) => {
       }
     });
     let timer1 = setInterval(() => {
-      if (examState == 3) {
+      if (examStateList[index].examState == 3) {
         clearInterval(timer1);
         clearTimeout(timer2);
-        resolve({ data: examState });
+        resolve({ data: examStateList[index].examState });
       }
     }, 250);
     let timer2 = setTimeout(() => {
-      if (examState != 3) {
+      if (examStateList[index].examState != 3) {
         clearInterval(timer1);
         clearTimeout(timer2);
         reject({ cmd: 'disconnect_request', exam_id: examId, data: { message: '超时:close_one_test' } });
@@ -458,6 +453,9 @@ export const getNetWork = (data: any, callback?: any) => {
     let obj = wkList.find((item: any) => {
       return item.examId == data;
     });
+    if (obj == undefined) {
+      return false;
+    }
     let wk_id = obj.wk_id;
     let examId = data ? data : parameter.examId;
     sendMessage(