日常开发

src/components/OnlineFaceWindow/index.vue

@@ -9,16 +9,16 @@
         <div>
           <div class="confirmDiaWindow">
             <div class="confirmDiaWindow-con">
-              <div class="pic" :class="{ 'pic2': faceCheckStu.student_id }" v-if="faceCheckStu.student_id"> <img
-                  :src="faceCheckStu.student_icon" /></div>
+              <div class="pic" :class="{ 'pic2': faceCheckStu.id }" v-if="faceCheckStu.id"> <img
+                  :src="faceCheckStu.pic" /></div>
               <div class="pic" v-else>
                 <div class="shine">
                   <img src="@/assets/images/common/shine.png" />
                 </div>
                 <img src="@/assets/images/test/profilePicture.png" />
               </div>
-              <div class="name" :class="{ 'name2': faceCheckStu.student_id }">
-                请看摄像头进行人脸识别
+              <div class="name" :class="{ 'name2': faceCheckStu.id }">
+                {{ faceCheckStu.id ? faceCheckStu.name : '请看摄像头进行人脸识别' }}
               </div>
             </div>
           </div>
@@ -84,20 +84,18 @@ const getInit = async () => {
       } else {
         let msg = "";
         if (e.code == 102402) {
-          //msg = `人脸识别模块被占用，即将重新启动`;
-          //proxy?.$modal.msgWarning(msg);
           //只能重启两次以免循环
-          if (againNum.value <= 2) {
+          if (againNum.value <= 1) {
+            msg = `人脸识别模块被占用，即将重新启动`;
             again.value = true;
           } else {
-            proxy?.$modal.msgError(`多次启动失败，请联系管理员`);
+            msg = `多次启动失败，请联系管理员`;
             again.value = false;
             againNum.value = 0;
           }
         } else {
           msg = `人脸识别模块不可用，code：${e.code}`;
-          proxy?.$modal.msgWarning(msg);
-        }
+        } proxy?.$modal.msgWarning(msg);
         getCloseFace();
       }
     }
@@ -114,16 +112,14 @@ const getInit = async () => {
     }
     if (e?.type == 'facecontroller_result') {
       if (e?.data?.student_id) {
-        getCloseFace();
         //返回人脸信息然后跳转
         let id = e.data.student_id;
         let name = e.data.student_name;
         let pic = e.data.student_icon;
         let obj = { id, name, pic }
         faceCheckStu.value = obj;
-        setTimeout(() => {
-          router.push({ path: '/score', query: obj });
-        }, 1000)
+        getCloseFace();
+        router.push({ path: '/score', query: obj });
       }
     }
     if (e?.cmd == 'terminate_facecontroller') {