|
@@ -1,5 +1,5 @@
|
|
|
<template>
|
|
|
- <div style="height: 100%;">
|
|
|
+ <div style="height: 100%">
|
|
|
<div class="import-header">
|
|
|
<img src="./images/nav_images.png" alt="" />照片批量上传工具 -
|
|
|
{{ server }}
|
|
@@ -9,9 +9,7 @@
|
|
|
<div class="import-div">
|
|
|
<a href="javascript:;">
|
|
|
<!-- webkitdirectory-->
|
|
|
- <button class="import-btn" @click="importPhotos">
|
|
|
- 上传照片
|
|
|
- </button>
|
|
|
+ <button class="import-btn" @click="importPhotos">上传照片</button>
|
|
|
</a>
|
|
|
<div>
|
|
|
<input
|
|
@@ -33,29 +31,29 @@
|
|
|
<div>
|
|
|
<span>
|
|
|
成功(含跳过):
|
|
|
- <span style="color:green;">{{ successNum }}({{ skipNum }})</span
|
|
|
+ <span style="color: green">{{ successNum }}({{ skipNum }})</span
|
|
|
>/{{ allNum }}
|
|
|
</span>
|
|
|
<span>
|
|
|
失败:
|
|
|
- <span style="color:red;">{{ errorNum }}</span
|
|
|
+ <span style="color: red">{{ errorNum }}</span
|
|
|
>/{{ allNum }}
|
|
|
</span>
|
|
|
<span>
|
|
|
并发参数:
|
|
|
- <span style="color:black;">{{ batchConcurrency }}</span>
|
|
|
+ <span style="color: black">{{ batchConcurrency }}</span>
|
|
|
</span>
|
|
|
<span>
|
|
|
实时并发:
|
|
|
- <span style="color:black;">{{ reqNum }}</span>
|
|
|
+ <span style="color: black">{{ reqNum }}</span>
|
|
|
</span>
|
|
|
<span>
|
|
|
并发报警:
|
|
|
- <span style="color:red;">{{ faceppConcurrencyErrorNum }}</span>
|
|
|
+ <span style="color: red">{{ faceppConcurrencyErrorNum }}</span>
|
|
|
</span>
|
|
|
<span>
|
|
|
报警频率:
|
|
|
- <span style="color:red;"
|
|
|
+ <span style="color: red"
|
|
|
>{{ faceppConcurrencyErrorNumPerMinute }}个/分</span
|
|
|
>
|
|
|
</span>
|
|
@@ -66,12 +64,12 @@
|
|
|
<span>处理速度:{{ (1000 * processSpeed).toFixed(2) }}个/秒</span>
|
|
|
</div>
|
|
|
<div>
|
|
|
- <span v-show="completeShow" style="color: green;font-weight: bold;"
|
|
|
+ <span v-show="completeShow" style="color: green; font-weight: bold"
|
|
|
>全部处理完成</span
|
|
|
>
|
|
|
<span
|
|
|
v-show="!completeShow && (successNum > 0 || errorNum > 0)"
|
|
|
- style="color: red;font-weight: bold;"
|
|
|
+ style="color: red; font-weight: bold"
|
|
|
>处理中...</span
|
|
|
>
|
|
|
</div>
|
|
@@ -114,7 +112,7 @@ function readImageFiles(folderPath) {
|
|
|
const filesToRename = fs.readdirSync(folderPath);
|
|
|
filesToRename
|
|
|
.filter(isImageFile)
|
|
|
- .forEach(fileName =>
|
|
|
+ .forEach((fileName) =>
|
|
|
fs.renameSync(
|
|
|
folderPath + "/" + fileName,
|
|
|
folderPath +
|
|
@@ -131,7 +129,7 @@ function readImageFiles(folderPath) {
|
|
|
return files
|
|
|
.filter(isImageFile)
|
|
|
.sort()
|
|
|
- .map(fileName => folderPath + "/" + fileName);
|
|
|
+ .map((fileName) => folderPath + "/" + fileName);
|
|
|
}
|
|
|
|
|
|
let CONCURRENCY = 4; //同时处理的照片数量; 深夜增加并发
|
|
@@ -183,7 +181,7 @@ export default {
|
|
|
title: "选择照片所在目录",
|
|
|
properties: ["openDirectory"],
|
|
|
},
|
|
|
- folderPaths => {
|
|
|
+ (folderPaths) => {
|
|
|
if (folderPaths) {
|
|
|
this.photoList = readImageFiles(folderPaths[0]);
|
|
|
this.allNum = this.photoList.length;
|
|
@@ -335,7 +333,7 @@ export default {
|
|
|
"&identityNumber=" +
|
|
|
identityNumber
|
|
|
)
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
var studentFaceInfo = res.data;
|
|
|
if (studentFaceInfo && studentFaceInfo.id) {
|
|
|
resolve(studentFaceInfo.id);
|
|
@@ -343,7 +341,7 @@ export default {
|
|
|
reject("查询身份证不存在");
|
|
|
}
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
reject("根据身份证号码查询失败");
|
|
|
});
|
|
@@ -358,7 +356,7 @@ export default {
|
|
|
"&identityNumber=" +
|
|
|
identityNumber
|
|
|
)
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
var studentFaceInfo = res.data;
|
|
|
if (studentFaceInfo && studentFaceInfo.id) {
|
|
|
resolve(studentFaceInfo);
|
|
@@ -366,7 +364,7 @@ export default {
|
|
|
reject("查询身份证不存在");
|
|
|
}
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
reject("根据身份证号码查询失败");
|
|
|
});
|
|
@@ -389,7 +387,7 @@ export default {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
this.$http
|
|
|
.post("/api/ecs_outlet/facepp/add", formData, config)
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
// var data = res.data;
|
|
|
console.log(res);
|
|
|
// if (data) {
|
|
@@ -398,7 +396,7 @@ export default {
|
|
|
// reject("保存失败");
|
|
|
// }
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
if (err.response && err.response.data && err.response.data.desc) {
|
|
|
reject(err.response.data.desc);
|
|
@@ -424,7 +422,7 @@ export default {
|
|
|
"Content-Type": "image/jpeg",
|
|
|
},
|
|
|
};
|
|
|
- return this.$http.put(url, photoFile, headers).catch(err => {
|
|
|
+ return this.$http.put(url, photoFile, headers).catch((err) => {
|
|
|
console.log(err);
|
|
|
throw "saveImageToUpyun失败";
|
|
|
});
|
|
@@ -437,14 +435,14 @@ export default {
|
|
|
return new Promise((resolve, reject) => {
|
|
|
this.$http
|
|
|
.get("/api/ecs_core/face/getUsableFacesetList")
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
if (res.data.length < 1) {
|
|
|
reject("获取facesetToken失败: 没有可用的facesetToken");
|
|
|
} else {
|
|
|
resolve(res.data[0].facesetToken);
|
|
|
}
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
reject("获取facesetToken失败: 接口出错");
|
|
|
});
|
|
@@ -467,7 +465,7 @@ export default {
|
|
|
process.env.VUE_APP_FACEPP_API_URL + "/facepp/v3/faceset/addface",
|
|
|
formData_addface
|
|
|
)
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
// console.log(
|
|
|
// `res.data.face_added: ${
|
|
|
// res.data.face_added
|
|
@@ -488,7 +486,7 @@ export default {
|
|
|
}
|
|
|
resolve(res.data.face_count);
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
reject("faceToken加入faceSetToken失败: addface catch error");
|
|
|
});
|
|
@@ -510,14 +508,14 @@ export default {
|
|
|
process.env.VUE_APP_FACEPP_API_URL + "/facepp/v3/detect",
|
|
|
formData_face_token
|
|
|
)
|
|
|
- .then(res => {
|
|
|
+ .then((res) => {
|
|
|
if (res.data.faces.length >= 1) {
|
|
|
resolve(res.data.faces[0].face_token);
|
|
|
} else {
|
|
|
reject("face++没有检测到人脸;");
|
|
|
}
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
reject("调用face++检测人脸失败");
|
|
|
});
|
|
@@ -541,7 +539,7 @@ export default {
|
|
|
photoName,
|
|
|
operator: "客户端工具上传-" + localStorage.getItem("userName"),
|
|
|
})
|
|
|
- .catch(err => {
|
|
|
+ .catch((err) => {
|
|
|
console.log(err);
|
|
|
throw "saveStudentFaceInfoByPut失败";
|
|
|
});
|