|
@@ -29,6 +29,10 @@
|
|
|
v-model="baseID"
|
|
|
placeholder="不处理小于此数字的身份证照片"
|
|
|
>
|
|
|
+
|
|
|
+ <br>
|
|
|
+
|
|
|
+ 覆盖底照:<input type="checkbox" v-model="overridePhoto" title="选中后,即使学生已存在底照,会被本次的照片覆盖">
|
|
|
</div>
|
|
|
<div class='progress-div'>
|
|
|
<div>
|
|
@@ -147,6 +151,7 @@ export default {
|
|
|
allNum: 0, //总数
|
|
|
completeShow: false,
|
|
|
baseID: "", // 从大于这个身份证号开始处理,不能在init初始化
|
|
|
+ overridePhoto: false,
|
|
|
reqNum: 0, // 并发请求数
|
|
|
faceppConcurrencyErrorNum: 0, // face++的并发数报错
|
|
|
startProcessTime: null, // 开始处理的时间
|
|
@@ -288,12 +293,26 @@ export default {
|
|
|
// photoName: serverPhotoPath
|
|
|
// };
|
|
|
// await this.saveStudentFaceInfoByPut(photoInfo);
|
|
|
- let studentInfo = await this.getStudentInfo(rootOrgId, identityNumber);
|
|
|
|
|
|
- if (studentInfo.photoPath) {
|
|
|
+ let alreadyHavePhoto = false;
|
|
|
+ if (this.overridePhoto) {
|
|
|
+ let studentInfo = await this.getStudentInfo(
|
|
|
+ rootOrgId,
|
|
|
+ identityNumber
|
|
|
+ );
|
|
|
+ alreadyHavePhoto = studentInfo.photoPath ? true : false;
|
|
|
+ }
|
|
|
+
|
|
|
+ if (this.overridePhoto || (!this.overridePhoto && !alreadyHavePhoto)) {
|
|
|
+ // 如果选择覆盖,或者不覆盖,但是没有底照,就保存底照
|
|
|
await this.saveStudentBasePhoto(photoFile, photoFileName);
|
|
|
}
|
|
|
- this.finishOnePhotoSuccess("处理成功", studentPhotoPath);
|
|
|
+ const notOverride = this.overridePhoto && alreadyHavePhoto;
|
|
|
+
|
|
|
+ this.finishOnePhotoSuccess(
|
|
|
+ "处理成功" + (this.overridePhoto && notOverride ? "--不覆盖" : ""),
|
|
|
+ studentPhotoPath
|
|
|
+ );
|
|
|
|
|
|
{
|
|
|
// 执行过程中的元信息
|
|
@@ -638,7 +657,7 @@ export default {
|
|
|
.import-body {
|
|
|
display: grid;
|
|
|
height: calc(100vh - 100px);
|
|
|
- grid-template-rows: 270px 1fr;
|
|
|
+ grid-template-rows: 290px 1fr;
|
|
|
}
|
|
|
|
|
|
.import-div {
|