林旭祥 vor 7 Monaten
Ursprung
Commit
d5e9bfbbdd

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

@@ -198,7 +198,7 @@ const getFaceConfirmOnly = (data?: any) => {
   }
   faceConfirmOnly({
     exam_id: examId,
-    // result_id: resultId.value,
+    result_id: resultId.value,
     student_id: faceCheckStu.value.student_id,
     gender: faceCheckStu.value.gender
   }, () => {
@@ -346,7 +346,7 @@ const initProject = () => {
     if (!faceCheckStu.value.student_id) {
       time = 500;
     } else {
-      time = 8000;
+      time = 10000;
     }
     setTimeout(() => {
       //再加一个判断以免和再测一次冲突

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

@@ -189,6 +189,7 @@ const getLogout = async () => {
  * 提示语
 */
 const getTips = () => {
+  getClearTimer('nextItem');
   let myTime = 4000;
   let num = 0;
   timerManager.value.nextItem = setInterval(() => {

+ 2 - 6
src/views/train/multiple.vue

@@ -24,7 +24,7 @@
         <div class="btn" @click="getAgain" v-if="examState == 42 || showTestAgain">再测一次</div>
         <div class="btn" @click="getOpenOneTestAndStartFace" v-if="examState < 41">开始识别</div>
         <div class="btn" @click="getStopFace" v-if="examState == 41">停止人脸识别</div>
-        <div class="btn startBtn" @click="getStartOneTest" v-if="examState == 43">开始测试</div>
+        <div class="btn startBtn" @click="getReady" v-if="examState == 43">开始测试</div>
         <div class="btn" @click="getAllRetestFace" v-if="examState == 43 || examState == 42">重新识别</div>
       </template>
       <template v-else>
@@ -579,11 +579,7 @@ const initHand = () => {
       }
       //开始测试
       if (examState.value == 43) {
-        if (needStart.value) {
-          getStartOneTest();
-        } else {
-          getReady()
-        }
+        getReady()
       }
       //确认退出
       if (exit.value) {

+ 3 - 3
src/views/train/test.vue

@@ -21,7 +21,7 @@
               :leave-active-class="proxy?.animate.dialog.leave">
               <div class="time" v-show="needStart && [42].includes(examState)">{{
                 time.countdownNum
-                }}</div>
+              }}</div>
             </Transition>
             <div class="tips" v-if="examState == 41">
               <img v-if="parameter.gesture" src="@/assets/images/test/ready1.png" />
@@ -718,9 +718,9 @@ const initHand = () => {
       //开始测试
       if (examState.value == 43) {
         if (needStart.value) {
-          getStartOneTest();
-        } else {
           getReady()
+        } else {
+          getStartOneTest();
         }
       }
       if (exit.value) {