diff --git a/hb_client/src/components/faceLogin/review.vue b/hb_client/src/components/faceLogin/review.vue
index 35be360..76a2b46 100644
--- a/hb_client/src/components/faceLogin/review.vue
+++ b/hb_client/src/components/faceLogin/review.vue
@@ -2,10 +2,10 @@
@@ -132,7 +132,7 @@
if(res.data.access){
let item= {name:res.data.name,token:res.data.access};
that.$emit('func',item);
- that.$message.success("身份认证成功!");
+ // that.$message.success("身份认证成功!");
this.closeCamera();
}else{
that.uploadLock = false;
@@ -165,7 +165,6 @@
beforeDestroy() {
let video = document.getElementById('video');
let stream = video.srcObject;
- // console.log(stream);
let tracks = stream.getTracks();
tracks.forEach(track => {
track.stop()
@@ -188,8 +187,7 @@
.video-box {
margin: auto;
position: relative;
- width: 500px;
- height: 500px;
+ width: 600px;
text-align: center;
}
diff --git a/hb_client/src/views/wpm/firstCheck.vue b/hb_client/src/views/wpm/firstCheck.vue
index 0b1e9c1..38c74a0 100644
--- a/hb_client/src/views/wpm/firstCheck.vue
+++ b/hb_client/src/views/wpm/firstCheck.vue
@@ -365,6 +365,7 @@
//首件审批
handleSelectclick(scope,index){
let that = this;
+ debugger;
this.reviewVisible = true;
that.planId = scope.row.id;
that.leader_1 = scope.row.leader_1_?scope.row.leader_1_.name:null;
@@ -479,6 +480,8 @@
that.checkParams = params;
that.limitedUserCheck = true;
},
+
+ //人脸识别获取人员信息后
checkSubmit(data){
let that =this;
let id = that.checkParams.id;
@@ -486,26 +489,35 @@
params.is_testok = that.checkParams.is_testok;
params.record_data = that.checkParams.record_data;
params.token = data.token;
+ let text = '确定以操作员'+data.name+'身份提交?';
if(data.token!==''&&data.token!==null&&data.token!==undefined) {
- putTestRecordItem(id, params).then((res) => {
- if (res.code >= 200) {
- subTestRecordItem(id, params).then((res) => {
- debugger;
- that.limitedUserCheck = false;
- if (res.code >= 200) {
- that.recordVisible = false;
- that.getTableData();
- }else{
- that.$message.error(res.msg)
- }
- }).catch(()=>{
- that.limitedUserCheck = false;
- });
- } else {
- that.$message.error(res.msg)
- }
- }).catch((err) => {
- that.$message.error(err);
+ this.$confirm(text, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ putTestRecordItem(id, params).then((res) => {
+ if (res.code >= 200) {
+ subTestRecordItem(id, params).then((res) => {
+ debugger;
+ that.limitedUserCheck = false;
+ if (res.code >= 200) {
+ that.recordVisible = false;
+ that.getTableData();
+ }else{
+ that.$message.error(res.msg)
+ }
+ }).catch(()=>{
+ that.limitedUserCheck = false;
+ });
+ } else {
+ that.$message.error(res.msg)
+ }
+ }).catch((err) => {
+ that.$message.error(err);
+ });
+ }).catch(() => {
+ that.limitedUserCheck = false;
});
}
},
diff --git a/hb_client/src/views/wpm/need.vue b/hb_client/src/views/wpm/need.vue
index 7bf8169..37dd99b 100644
--- a/hb_client/src/views/wpm/need.vue
+++ b/hb_client/src/views/wpm/need.vue
@@ -1544,33 +1544,40 @@
params.is_testok = that.params.is_testok;
params.record_data = that.params.record_data;
params.token = data.token;
+ let text = '确定以操作员'+data.name+'身份提交?';
if (data.token !== '' && data.token !== null && data.token !== undefined) {
- putTestRecordItem(id, params).then((res) => {
- if (res.code >= 200) {
- subTestRecordItem(id, params).then((res) => {
- debugger;
- that.limitedPhoto = false;
- if (res.code >= 200) {
- that.recordVisible = false;
- that.limitedReview = false;
- that.limitedCheckRecord = false;
- that.getList();
- that.getList2();
- that.getList1();
- that.getList3();
- that.refreshRecord();
- } else {
- that.$message.error(res.msg)
- }
- }).catch(() => {
- that.limitedPhoto = false;
- });
- } else {
- that.$message.error(res.msg)
- }
- }).catch((err) => {
- that.$message.error(err);
+ this.$confirm(text, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ that.limitedPhoto = false;
+ putTestRecordItem(id, params).then((res) => {
+ if (res.code >= 200) {
+ subTestRecordItem(id, params).then((res) => {
+ if (res.code >= 200) {
+ that.recordVisible = false;
+ that.limitedReview = false;
+ that.limitedCheckRecord = false;
+ that.getList();
+ that.getList2();
+ that.getList1();
+ that.getList3();
+ that.refreshRecord();
+ } else {
+ that.$message.error(res.msg)
+ }
+ }).catch(() => {});
+ } else {
+ that.$message.error(res.msg)
+ }
+ }).catch((err) => {
+ that.$message.error(err);
+ });
+ }).catch(() => {
+ that.limitedPhoto = false;
});
+
}
},
diff --git a/hb_client/src/views/wpm/operationdo.vue b/hb_client/src/views/wpm/operationdo.vue
index 0d74c7d..a85a9c0 100644
--- a/hb_client/src/views/wpm/operationdo.vue
+++ b/hb_client/src/views/wpm/operationdo.vue
@@ -1220,9 +1220,10 @@
getMsgFormSon(data) {
let that = this;
that.operationData.user = data.name;
+ let text = '确定以操作员'+data.name+'身份提交?';
if (data.token !== '' && data.token !== null && data.token !== undefined) {
if (that.inputData == "") {
- that.$confirm("没有消耗物料确定提交吗?", "提示", {
+ that.$confirm("没有消耗物料,"+text, "提示", {
confirmButtonText: "确认",
cancelButtonText: "取消",
type: "error",
@@ -1241,16 +1242,26 @@
that.limitedPhoto = false;
});
} else {
- submitOperation(that.id,{token:data.token}).then((res) => {
- if (res.code === 200) {
- that.$router.push({name: "operation"});
- that.$message.success("操作提交成功!");
- }else{
- that.$message.error(res.msg)
- }
- }).catch((err) => {
- that.$message.error(err);
+ this.$confirm(text, '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ that.limitedPhoto = false;
+ submitOperation(that.id,{token:data.token}).then((res) => {
+ if (res.code === 200) {
+ that.$router.push({name: "operation"});
+ that.$message.success("操作提交成功!");
+ }else{
+ that.$message.error(res.msg)
+ }
+ }).catch((err) => {
+ that.$message.error(err);
+ });
+ }).catch(() => {
+ that.limitedPhoto = false;
});
+
}
}
},
diff --git a/hb_client/src/views/wpm/productjy.vue b/hb_client/src/views/wpm/productjy.vue
index b046105..756ad2d 100644
--- a/hb_client/src/views/wpm/productjy.vue
+++ b/hb_client/src/views/wpm/productjy.vue
@@ -288,16 +288,27 @@
确 定
+
+
+ 操作人员确认
+
+
+
+