Browse Source

日常开发

linxuxiang 4 weeks ago
parent
commit
6b9a745d05

+ 8 - 0
src/assets/styles/index.scss

@@ -343,6 +343,14 @@ i,em{
   }
 }
 
+.highknees {
+  .el-loading-spinner {
+    &::before {
+      background-image: url('../static/images/train/highknees.png');
+    }
+  }
+}
+
 @media screen and (max-width: 1280px) {
   .el-message--success,
   .el-message--warning,

+ 1 - 1
src/components/MultipleItem/index.vue

@@ -361,7 +361,7 @@ const chooseStudent = () => {
  * 返回被选学生
 */
 const returnStudent = (data: any) => {
-  console.log("11111", data)
+  console.log("学生信息", data)
   faceCheckStu.value = data;
   getStopFace();
 };

+ 32 - 10
src/utils/trainWs.ts

@@ -310,10 +310,10 @@ export function useWs() {
           exam_id: examId
         }
       });
-      let timer1 = setInterval(() => {
+      examStateList[index].timer1 = setInterval(() => {
         console.log(`【${examId}】1111111111111`)
         if (examStateList[index].examState != 3) {
-          clearInterval(timer1);
+          clearInterval(examStateList[index].timer1);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
         }
@@ -343,10 +343,10 @@ export function useWs() {
           exam_id: examId
         }
       });
-      let timer1 = setInterval(() => {
+      examStateList[index].timer2 = setInterval(() => {
         console.log(`【${examId}】2222222222222`)
         if (examStateList[index].examState != 40) {
-          clearInterval(timer1);
+          clearInterval(examStateList[index].timer2);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
         }
@@ -376,10 +376,10 @@ export function useWs() {
           exam_id: examId
         }
       });
-      let timer1 = setInterval(() => {
+      examStateList[index].timer3 = setInterval(() => {
         console.log(`【${examId}】3333333333333`)
         if (examStateList[index].examState != 41) {
-          clearInterval(timer1);
+          clearInterval(examStateList[index].timer3);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
         }
@@ -461,10 +461,10 @@ export function useWs() {
           exam_id: examId
         }
       });
-      let timer1 = setInterval(() => {
+      examStateList[index].timer4 = setInterval(() => {
         console.log(`【${examId}】4444444444444`)
         if (examStateList[index].examState != 42) {
-          clearInterval(timer1);
+          clearInterval(examStateList[index].timer4);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
         }
@@ -494,10 +494,10 @@ export function useWs() {
           exam_id: examId
         }
       });
-      let timer1 = setInterval(() => {
+      examStateList[index].timer5 = setInterval(() => {
         console.log(`【${examId}】5555555555555`)
         if (examStateList[index].examState >= 3) {
-          clearInterval(timer1);
+          clearInterval(examStateList[index].timer5);
           // clearTimeout(timer2);
           resolve({ data: examStateList[index].examState });
         }
@@ -639,6 +639,28 @@ export function useWs() {
         timerManager[key] = null;
       }
     }
+		for(let i = 0;i<examStateList.length;i++){
+			if (examStateList[i].hasOwnProperty('timer1')) {
+				clearInterval(examStateList[i].timer1);
+				examStateList[i].timer1 = null;
+			}
+			if (examStateList[i].hasOwnProperty('timer2')) {
+				clearInterval(examStateList[i].timer2);
+				examStateList[i].timer2 = null;
+			}
+			if (examStateList[i].hasOwnProperty('timer3')) {
+				clearInterval(examStateList[i].timer3);
+				examStateList[i].timer3 = null;
+			}
+			if (examStateList[i].hasOwnProperty('timer4')) {
+				clearInterval(examStateList[i].timer4);
+				examStateList[i].timer4 = null;
+			}
+			if (examStateList[i].hasOwnProperty('timer5')) {
+				clearInterval(examStateList[i].timer5);
+				examStateList[i].timer5 = null;
+			}
+		}
   }
 
   /**

+ 1 - 1
src/views/gesture/index.vue

@@ -106,7 +106,7 @@ const getExam = async () => {
  * 获取实例
  */
 const onSwiper = ($ev: any) => {
-  console.log('1111111', $ev);
+  // console.log('1111111', $ev);
   mySwiper.value = $ev;
   slidePrev();
 };