Ver código fonte

日常开发

linxuxiang 5 meses atrás
pai
commit
289e45c871
2 arquivos alterados com 18 adições e 13 exclusões
  1. 7 4
      src/views/train/multiple.vue
  2. 11 9
      src/views/train/test.vue

+ 7 - 4
src/views/train/multiple.vue

@@ -15,8 +15,8 @@
         <div class="ul"
           :class="{ 'overlap': (examState == 43 && time.ready) || [42].includes(examState) || (showTestAgain && ![41].includes(examState)), 'ready': [41].includes(examState), 'hands': parameter.gesture }"
           v-for="(items, indexs) in testListArr " :key="indexs">
-          <MultipleItem :ref="(el:any) => { multipleItemRef(el, item.itemNumber, item.area) }" v-for="(item, index) in items"
-            :query="parameter" :area="item.area" :key="index" @returnData="returnData"
+          <MultipleItem :ref="(el: any) => { multipleItemRef(el, item.itemNumber, item.area) }"
+            v-for="(item, index) in items" :query="parameter" :area="item.area" :key="index" @returnData="returnData"
             @getChooseStudent="getChooseStudent" :examState="examState" :needStart="needStart" :styleType="styleType"
             :parentTrainWsMethod="{ initWs, examEnds, openOneTest, startFace, stopFace, faceConfirmOnly, startOneTest, finishOneTest, closeOneTest, suspendFaceRecognitionChannels, resumeFaceRecognitionChannels }"
             :parentSpeechMethod="{ initSpeech, speckText, playMusic, controlMusic, speckCancel, chineseNumber }" />
@@ -650,7 +650,9 @@ const initHand = () => {
     }
     //左滑动
     if (e?.data?.result == "next_item") {
-      getAllRetestFace();
+      if (examState.value == 43 || examState.value == 42) {
+        getAllRetestFace();
+      }
     }
     //举左手
     if (e?.data?.result == "left_hand") {
@@ -1875,4 +1877,5 @@ $waiPadding: 6.51rem;
       }
     }
   }
-}</style>
+}
+</style>

+ 11 - 9
src/views/train/test.vue

@@ -753,16 +753,18 @@ const initHand = () => {
     }
     //左滑动
     if (e?.data?.result == "next_item") {
-      if (needStart.value == false) {
-        //自动流程项目重新识别直接返回3
-        closeOneTest();
-      } else {
-        //手动流程项目重新识别43返回41,42返回3
-        if (examState.value == 43) {
-          cleanData();
-          startFace();
-        } else {
+      if (examState.value == 43 || examState.value == 42) {
+        if (needStart.value == false) {
+          //自动流程项目重新识别直接返回3
           closeOneTest();
+        } else {
+          //手动流程项目重新识别43返回41,42返回3
+          if (examState.value == 43) {
+            cleanData();
+            startFace();
+          } else {
+            closeOneTest();
+          }
         }
       }
     }