diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..35410ca
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,8 @@
+# 默认忽略的文件
+/shelf/
+/workspace.xml
+# 基于编辑器的 HTTP 客户端请求
+/httpRequests/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Common/PersonCenter/PersonCenterAddFace.js b/src/components/Common/PersonCenter/PersonCenterAddFace.js
index 3d99653..f291b34 100644
--- a/src/components/Common/PersonCenter/PersonCenterAddFace.js
+++ b/src/components/Common/PersonCenter/PersonCenterAddFace.js
@@ -25,7 +25,7 @@ const PersonCenterAddFace = Form.create({
className={styles.changePwd}
>
-
+
11
diff --git a/src/components/FaceDetect/index.js b/src/components/FaceDetect/index.js
index 8e10990..52c6add 100644
--- a/src/components/FaceDetect/index.js
+++ b/src/components/FaceDetect/index.js
@@ -29,6 +29,7 @@ class FaceDetect extends Component {
componentWillReceiveProps(nextProps, nextContext) {
if (nextProps.masterData) {
+ console.log('ssss', nextProps.masterData);
this.user_id = nextProps.masterData.sEmployeeNo;
this.user_info = JSON.stringify(
{
@@ -203,19 +204,35 @@ class FaceDetect extends Component {
} else {
_this.changeStatusContent('人脸采集成功');
let img = _this.getFace();
- const userinfo = this.props.app.userinfo;
+ let userinfo = this.props.app.userinfo;
+ const sBrandId = userinfo?.sBrandsId;
+ const sSubsidiaryId = userinfo?.sSubsidiaryId;
+ if(this.props.bClickSource?.includes('BtnAddFace') ){
+ userinfo = {
+ sUserName: this.props.masterData?.sEmployeeName,
+ sEmployeeNo: this.props.masterData?.sEmployeeNo,
+ sEmployeeId : this.props.masterData?.sEmployeeId,
+ sDepartName: this.props.masterData?.sDepartName,
+ sId :this.props.masterData?.sId
+ }
+ console.log('userinfo', userinfo);
+ }
+
let item = {
"image": img.split(',')[1],
"image_type": "BASE64",
"sParentId": userinfo.sId,
- "sEmployeeId": userinfo.sEmployeeId,
+ "sEmployeeId": userinfo.sId,
+ "sEmployeeName": userinfo.sUserName,
+ "sEmployeeNo": userinfo.sEmployeeNo,
"sUserName": userinfo.sUserName,
- "sBrandsId": userinfo.sBrandsId,
- "sSubsidiaryId": userinfo.sSubsidiaryId,
+ "sBrandsId": sBrandId,
+ "sSubsidiaryId": sSubsidiaryId,
"quality_control": "NORMAL",
"liveness_control": "LOW",
"face_field": "feature"
}
+ console.log('item', item);
//保存URL
const url = this.urlpre + `/face/faceAdd`;
_this.changeStatusContent('人脸数据处理中,请稍等');