|
@@ -137,8 +137,8 @@ export default {
|
|
|
.then(response => {
|
|
|
if (response.status == 200) {
|
|
|
var receivedMsg = response.data;
|
|
|
- this.faceTestEnd(receivedMsg);
|
|
|
faceTestEndCalled = true;
|
|
|
+ return this.faceTestEnd(receivedMsg);
|
|
|
}
|
|
|
})
|
|
|
.finally(() => {
|
|
@@ -153,7 +153,9 @@ export default {
|
|
|
}
|
|
|
this.logout(
|
|
|
"?LogoutReason=" +
|
|
|
- (faceTestEndCalled ? "活体检测超时" : "活体检测超时-可续考")
|
|
|
+ (faceTestEndCalled
|
|
|
+ ? "活体检测超时"
|
|
|
+ : "活体检测超时-faceLivenessVerifyTimeOut-调用失败")
|
|
|
);
|
|
|
});
|
|
|
},
|
|
@@ -220,14 +222,14 @@ export default {
|
|
|
duration: 30,
|
|
|
closable: true,
|
|
|
});
|
|
|
- this.faceTestUploadResult("FAILED");
|
|
|
+ return this.faceTestUploadResult("FAILED");
|
|
|
} else if (receivedMsg.verifyResult == "VERIFY_SUCCESS") {
|
|
|
this.$Message.info({
|
|
|
content: "人脸检测成功,请继续完成考试",
|
|
|
duration: 15,
|
|
|
closable: true,
|
|
|
});
|
|
|
- this.faceTestUploadResult("SUCCESS");
|
|
|
+ return this.faceTestUploadResult("SUCCESS");
|
|
|
}
|
|
|
} else if (receivedMsg.verifyCount >= 2) {
|
|
|
if (receivedMsg.verifyResult == "VERIFY_SUCCESS") {
|
|
@@ -236,14 +238,14 @@ export default {
|
|
|
duration: 15,
|
|
|
closable: true,
|
|
|
});
|
|
|
- this.faceTestUploadResult("SUCCESS");
|
|
|
+ return this.faceTestUploadResult("SUCCESS");
|
|
|
} else {
|
|
|
this.$Message.error({
|
|
|
content: "人脸检测不合格,结束考试",
|
|
|
duration: 30,
|
|
|
closable: true,
|
|
|
});
|
|
|
- this.faceTestUploadResult("FAILED");
|
|
|
+ return this.faceTestUploadResult("FAILED");
|
|
|
}
|
|
|
}
|
|
|
},
|
|
@@ -251,7 +253,7 @@ export default {
|
|
|
* 人脸检测结果返回后台处理
|
|
|
*/
|
|
|
faceTestUploadResult(result) {
|
|
|
- this.$http
|
|
|
+ return this.$http
|
|
|
.get(
|
|
|
"/api/ecs_oe_student/examFaceLivenessVerify/faceLivenessVerifyEnd/" +
|
|
|
this.examRecordId +
|
|
@@ -298,6 +300,7 @@ export default {
|
|
|
|
|
|
// 两个结束点。第一个结束点:超时。先传后台,再根据后台信息进行处理。可能ws没有收到处理结果,会通过http接收一遍。
|
|
|
//定时事件,如果1分钟内未完成人脸检测,执行内部程序
|
|
|
+ clearTimeout(this.faceIdTimeout); // 防止这个函数是否会因为别的原因被调两次
|
|
|
this.faceIdTimeout = setTimeout(() => {
|
|
|
this.faceidLoadedButTimeouted();
|
|
|
}, 60000); //60000
|