|
@@ -121,8 +121,27 @@
|
|
|
</el-form-item>
|
|
|
|
|
|
<div v-show="ruleForm.IDENTIFICATION_OF_LIVING_BODY_SCHEME !== 'S3'">
|
|
|
- <el-form-item label="人脸API" prop="FACE_API_PROVIDER">
|
|
|
- <el-radio-group v-model="ruleForm.FACE_API_PROVIDER" class="input">
|
|
|
+ <el-form-item
|
|
|
+ label="开考时人脸识别API"
|
|
|
+ prop="FACE_VERIFY_API_PROVIDER"
|
|
|
+ >
|
|
|
+ <el-radio-group
|
|
|
+ v-model="ruleForm.FACE_VERIFY_API_PROVIDER"
|
|
|
+ class="input"
|
|
|
+ >
|
|
|
+ <el-radio label="FACEPP">旷视</el-radio>
|
|
|
+ <el-radio label="BAIDU">百度</el-radio>
|
|
|
+ </el-radio-group>
|
|
|
+ </el-form-item>
|
|
|
+
|
|
|
+ <el-form-item
|
|
|
+ label="抓拍时人脸比对API"
|
|
|
+ prop="FACE_COMPARE_API_PROVIDER"
|
|
|
+ >
|
|
|
+ <el-radio-group
|
|
|
+ v-model="ruleForm.FACE_COMPARE_API_PROVIDER"
|
|
|
+ class="input"
|
|
|
+ >
|
|
|
<el-radio label="FACEPP">旷视</el-radio>
|
|
|
<el-radio label="BAIDU">百度</el-radio>
|
|
|
</el-radio-group>
|
|
@@ -134,7 +153,6 @@
|
|
|
>
|
|
|
<el-input
|
|
|
v-model="ruleForm.BAIDU_EXPECT_FACE_COMPARE_SCORE"
|
|
|
- :disabled="ruleForm.FACE_API_PROVIDER !== 'BAIDU'"
|
|
|
style="width: 180px"
|
|
|
></el-input>
|
|
|
<span style="font-size: 14px; line-height: 44px"></span>
|
|
@@ -259,7 +277,10 @@ export default {
|
|
|
};
|
|
|
|
|
|
let checkFaceScore = (rule, value, callback) => {
|
|
|
- if (this.ruleForm.FACE_API_PROVIDER === "BAIDU") {
|
|
|
+ if (
|
|
|
+ this.ruleForm.FACE_VERIFY_API_PROVIDER === "BAIDU" ||
|
|
|
+ this.ruleForm.FACE_COMPARE_API_PROVIDER === "BAIDU"
|
|
|
+ ) {
|
|
|
let reg = /^[1-9][0-9]*$/;
|
|
|
if (!new String(value).match(reg) || value < 50 || value > 90) {
|
|
|
return callback(new Error("范围50至90之间"));
|
|
@@ -286,7 +307,8 @@ export default {
|
|
|
WEIXIN_ANSWER_ENABLED: false,
|
|
|
PC_CLIENT_ENABLED: false,
|
|
|
IDENTIFICATION_OF_LIVING_BODY_SCHEME: "S1",
|
|
|
- FACE_API_PROVIDER: "FACEPP",
|
|
|
+ FACE_VERIFY_API_PROVIDER: "FACEPP",
|
|
|
+ FACE_COMPARE_API_PROVIDER: "FACEPP",
|
|
|
BAIDU_EXPECT_FACE_COMPARE_SCORE: 70,
|
|
|
ACTION_ALERT: "",
|
|
|
ACTION_NUM: "",
|
|
@@ -460,8 +482,11 @@ export default {
|
|
|
params.properties.ALL_ACTION_DURATION =
|
|
|
this.ruleForm.ALL_ACTION_DURATION;
|
|
|
} else {
|
|
|
- params.properties.FACE_API_PROVIDER =
|
|
|
- this.ruleForm.FACE_API_PROVIDER;
|
|
|
+ params.properties.FACE_VERIFY_API_PROVIDER =
|
|
|
+ this.ruleForm.FACE_VERIFY_API_PROVIDER;
|
|
|
+
|
|
|
+ params.properties.FACE_COMPARE_API_PROVIDER =
|
|
|
+ this.ruleForm.FACE_COMPARE_API_PROVIDER;
|
|
|
|
|
|
params.properties.BAIDU_EXPECT_FACE_COMPARE_SCORE =
|
|
|
this.ruleForm.BAIDU_EXPECT_FACE_COMPARE_SCORE;
|
|
@@ -530,11 +555,20 @@ export default {
|
|
|
this.ruleForm.IDENTIFICATION_OF_LIVING_BODY_SCHEME = "S1";
|
|
|
}
|
|
|
|
|
|
- if (response.data.FACE_API_PROVIDER) {
|
|
|
- this.ruleForm.FACE_API_PROVIDER = response.data.FACE_API_PROVIDER;
|
|
|
+ if (response.data.FACE_VERIFY_API_PROVIDER) {
|
|
|
+ this.ruleForm.FACE_VERIFY_API_PROVIDER =
|
|
|
+ response.data.FACE_VERIFY_API_PROVIDER;
|
|
|
+ } else {
|
|
|
+ // BAIDU、FACEPP
|
|
|
+ this.ruleForm.FACE_VERIFY_API_PROVIDER = "FACEPP";
|
|
|
+ }
|
|
|
+
|
|
|
+ if (response.data.FACE_COMPARE_API_PROVIDER) {
|
|
|
+ this.ruleForm.FACE_COMPARE_API_PROVIDER =
|
|
|
+ response.data.FACE_COMPARE_API_PROVIDER;
|
|
|
} else {
|
|
|
// BAIDU、FACEPP
|
|
|
- this.ruleForm.FACE_API_PROVIDER = "FACEPP";
|
|
|
+ this.ruleForm.FACE_COMPARE_API_PROVIDER = "FACEPP";
|
|
|
}
|
|
|
|
|
|
if (response.data.BAIDU_EXPECT_FACE_COMPARE_SCORE) {
|