Skip to content

F
founder_vue
Commit cf3e6ac5 by 张超军
Options

墨奇改

parent b3239471
Showing with 502 additions and 31 deletions
src/views/zwxt/fingerprint6.vue
......@@ -1059,7 +1059,14 @@ export default {
finishFingers: [],
// 缺指的指位
errorFingers: [],
ip: ''
// 本机ip地址
ip: '',
// 滚动指位信息
rGdzw: [],
// 平面指位信息
rPmzw: [],
// 上传的重复指位
cfFingerIndex: null
}
},
components: {
......@@ -1233,6 +1240,12 @@ export default {
// ip
this.deviceModel = 'MQ - A1'
this.deviceSn = this.version.DeviceSn.split('_')[1]
this.pop = true
this.isAlter = true
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
let machineRes = await axios({
url: '/apiMachine/checkClientVp',
method: 'post',
......@@ -1242,10 +1255,6 @@ export default {
sblx: 1
}
})
this.pop = true
this.isAlter = true
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
// console.log(machineRes);
if (machineRes.data.success) {
this.pop = false
......@@ -1267,6 +1276,11 @@ export default {
this.isAlter = false
// 获取到SN序列号，ip地址，发送到服务器
// TODO
this.pop = true
this.isAlter = true
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
let machineRes = await axios({
url: '/apiMachine/checkClientVp',
method: 'post',
......@@ -1276,13 +1290,9 @@ export default {
sblx: 1
}
})
this.pop = true
this.isAlter = true
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
console.log(machineRes);
// console.log(machineRes);
if (machineRes.data.success) {
// if(true){
// if (true) {
this.pop = false
this.isAlter = false
this.errTitle = ''
......@@ -1308,6 +1318,21 @@ export default {
},
methods: {
/**
* @description: 找出重复的指纹的位置
* @param {*} fingerZwzwdm
* @return {*}
*/
findCF (fingerZwzwdm) {
let self = this
self.cfFingerIndex = null
this.fingerPic.forEach((item, index) => {
if (item.zwzwdm == fingerZwzwdm) {
self.cfFingerIndex = index
}
})
return self.cfFingerIndex
},
/**
* @description: 关闭未获取设备弹窗
* @param {*}
* @return {*}
......@@ -1337,6 +1362,14 @@ export default {
// 20210812100029
// 2020-06-04 00:06:00
let data = res.data.data
if (data.rGdzw) {
self.rGdzw = data.rGdzw.split('-')
}
if (data.rPmzw) {
self.rPmzw = data.rPmzw.split('-')
}
console.log(self.rGdzw);
console.log(self.rPmzw);
let time = null
if (data.csrqQsrqStr) {
time = data.csrqQsrqStr.substr(0, 4) + data.csrqQsrqStr.substr(5, 2) + data.csrqQsrqStr.substr(8, 2)
......@@ -1364,9 +1397,42 @@ export default {
if (res.data.code == 1000) {
self.isFace = true
}
self.dealIsGetFinger()
console.log(self.fingersRight);
console.log(self.fingersLeft);
})
},
/**
* @description: 处理补采相关的信息
* @param {*}
* @return {*}
*/
dealIsGetFinger () {
let self = this
if (this.rGdzw.length > 0) {
this.rGdzw.forEach((item, index) => {
if (item != 1) {
if (index < 5) {
self.$set(self.fingersRight[index], 'statusR', 6)
} else {
self.$set(self.fingersLeft[index - 5], 'statusR', 6)
}
}
})
}
if (this.rPmzw.length > 0) {
this.rPmzw.forEach((item, index) => {
if (item != 1) {
if (index < 5) {
self.$set(self.fingersRight[index], 'statusL', 6)
} else {
self.$set(self.fingersLeft[index - 5], 'statusL', 6)
}
}
})
}
},
/**
* @name: 小采集器获取设备信息
* @param {*}
* @return {*}
......@@ -1410,7 +1476,7 @@ export default {
this.GrpcCameraService.getVideoStream(code, (imageUrlList, status) => {
// console.log(imageUrlList);
self.fingerImg = [imageUrlList]
console.log(status);
// console.log(status);
// 采集结束，变化采集预览图片
if (status == 0) {
self.loading = true
......@@ -1420,7 +1486,7 @@ export default {
}
})
let captureImage = await this.GrpcCameraService.captureImage2(code)
console.log(captureImage)
// console.log(captureImage)
if (captureImage) {
// 右手
if (type == 'r') {
......@@ -1498,7 +1564,16 @@ export default {
},
data: paramsDelL
}).then(res => {
let cf = self.findCF(Number(self.fingersRight[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(self.fingersRight[index].code) + 10,
zw_txsj: res.data,
zw_txzl: self.fingersRight[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(self.fingersRight[index].code) + 10, zw_txsj: res.data, zw_txzl: self.fingersRight[index].scoreL })
}
})
// 滚动
let imgDelR = self.fingersRight[index].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
......@@ -1514,7 +1589,16 @@ export default {
},
data: paramsDelR
}).then(res => {
let cf = self.findCF((Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)),
zw_txsj: res.data,
zw_txzl: self.fingersRight[index].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)), zw_txsj: res.data, zw_txzl: self.fingersRight[index].scoreR })
}
})
if (self.fingersRight[index].scoreR > self.defaultScore) {
......@@ -1632,7 +1716,16 @@ export default {
},
data: paramsDelL
}).then(res => {
let cf = self.findCF(Number(self.fingersLeft[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(self.fingersLeft[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: self.fingersLeft[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(self.fingersLeft[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: self.fingersLeft[index - 5].scoreL })
}
})
// 滚动
let imgDelR = self.fingersLeft[index - 5].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
......@@ -1648,7 +1741,16 @@ export default {
},
data: paramsDelR
}).then(res => {
let cf = self.findCF((Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)),
zw_txsj: res.data,
zw_txzl: self.fingersLeft[index - 5].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)), zw_txsj: res.data, zw_txzl: self.fingersLeft[index - 5].scoreR })
}
})
// 滚动
......@@ -1743,6 +1845,10 @@ export default {
* @return {*}
*/
oddAndDouble (finger, index, type) {
// 如果有补采信息传入
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
console.log(finger);
if (finger.statusL != 6 && finger.statusR != 6 && finger.statusL != 1 && finger.statusR != 1 && finger.statusL != 2 && finger.statusR != 2 && finger.statusL != 3 && finger.statusR != 3 && finger.statusL != 4 && finger.statusR != 4) return;
clearTimeout(time); // 清除定时器
let self = this
self.clickTimes++;
......@@ -1760,6 +1866,25 @@ export default {
// alert(2)
self.changeSelect(finger, index, type)
}
} else {
clearTimeout(time); // 清除定时器
let self = this
self.clickTimes++;
time = setTimeout(function () {
if (self.clickTimes === 1) {
self.clickTimes = 0; // 单击清零
// 触发单击事件...
// alert(1)
self.lookFinger(finger, index, type)
}
}, 300)
if (self.clickTimes === 2) { //当点击次数为2
self.clickTimes = 0; //记得清零
// 触发双击事件...
// alert(2)
self.changeSelect(finger, index, type)
}
}
},
/**
* @name: 重新录制单个指纹
......@@ -1918,7 +2043,16 @@ export default {
},
data: paramsDelL
}).then(res => {
let cf = self.findCF(Number(self.fingersRight[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(self.fingersRight[index].code) + 10,
zw_txsj: res.data,
zw_txzl: self.fingersRight[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(self.fingersRight[index].code) + 10, zw_txsj: res.data, zw_txzl: self.fingersRight[index].scoreL })
}
})
// 滚动
let imgDelR = self.fingersRight[index].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
......@@ -1934,7 +2068,16 @@ export default {
},
data: paramsDelR
}).then(res => {
let cf = self.findCF((Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)),
zw_txsj: res.data,
zw_txzl: self.fingersRight[index].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(self.fingersRight[index].code) > 9) ? Number(self.fingersRight[index].code) : ('0' + Number(self.fingersRight[index].code)), zw_txsj: res.data, zw_txzl: self.fingersRight[index].scoreR })
}
})
// 滚动
......@@ -2128,7 +2271,16 @@ export default {
},
data: paramsDelL
}).then(res => {
let cf = self.findCF(Number(self.fingersLeft[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(self.fingersLeft[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: self.fingersLeft[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(self.fingersLeft[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: self.fingersLeft[index - 5].scoreL })
}
})
// 滚动
let imgDelR = self.fingersLeft[index - 5].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
......@@ -2144,7 +2296,16 @@ export default {
},
data: paramsDelR
}).then(res => {
let cf = self.findCF((Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)),
zw_txsj: res.data,
zw_txzl: self.fingersLeft[index - 5].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(self.fingersLeft[index - 5].code) > 9) ? Number(self.fingersLeft[index - 5].code) : ('0' + Number(self.fingersLeft[index - 5].code)), zw_txsj: res.data, zw_txzl: self.fingersLeft[index - 5].scoreR })
}
})
// 滚动
......@@ -3282,7 +3443,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
......@@ -3364,7 +3534,7 @@ export default {
if (temporaryImage) {
objectURL.revokeObjectURL(temporaryImage);
}
var imageDataBlob = self.convertDataURIToBlob("data:image/bmp;base64," + data.singleFlatFinger.saveImage[0]);
var imageDataBlob = self.convertDataURIToBlob("data:image/bmp;base64," + data.previewImage);
temporaryImage = objectURL.createObjectURL(imageDataBlob);
// self.fingerImg = temporaryImage;
self.frameImage = true
......@@ -3416,6 +3586,7 @@ export default {
self.$set(leftList[index - 5], 'imgSrcL', 'data:image/bmp;base64,' + data.singleFlatFinger.saveImage[0])
// 获取图片处理的结果
let img = leftList[index - 5].imgSrcL.replace(/^data:image\/\w+;base64,/, "");
// let img = item.imgSrcL
......@@ -3432,7 +3603,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data, zw_txzl:
leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
......@@ -3631,7 +3811,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
......@@ -3696,7 +3885,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
......@@ -3773,7 +3971,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(rightList[index].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(rightList[index].code) + 10,
zw_txsj: res.data,
zw_txzl: rightList[index].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(rightList[index].code) + 10, zw_txsj: res.data, zw_txzl: rightList[index].scoreL })
}
})
setTimeout(() => {
......@@ -3951,7 +4158,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
......@@ -4016,7 +4232,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
......@@ -4093,7 +4318,17 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF(Number(leftList[index - 5].code) + 10)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: Number(leftList[index - 5].code) + 10,
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreL
}
} else {
self.fingerPic.push({ zwzwdm: Number(leftList[index - 5].code) + 10, zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreL })
}
})
setTimeout(() => {
......@@ -4291,7 +4526,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF((Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)),
zw_txsj: res.data,
zw_txzl: rightList[index].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)), zw_txsj: res.data, zw_txzl: rightList[index].scoreR })
}
})
setTimeout(() => {
......@@ -4354,7 +4598,17 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF((Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)),
zw_txsj: res.data,
zw_txzl: rightList[index].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)), zw_txsj: res.data, zw_txzl: rightList[index].scoreR })
}
})
setTimeout(() => {
......@@ -4529,7 +4783,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF((Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)),
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)), zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreR })
}
})
setTimeout(() => {
......@@ -4591,7 +4854,16 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF((Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)),
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)), zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreR })
}
})
setTimeout(() => {
......@@ -4763,7 +5035,18 @@ export default {
},
data: params
}).then(res => {
let cf = self.findCF((Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)))
console.log(cf)
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)),
zw_txsj: res.data,
zw_txzl: rightList[index].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)), zw_txsj: res.data, zw_txzl: rightList[index].scoreR })
}
console.log(self.fingerPic)
})
setTimeout(() => {
......@@ -4897,7 +5180,7 @@ export default {
})
// 获取处理后的图片
let img = rightList[index].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
let img = leftList[index - 5].imgSrcR.replace(/^data:image\/\w+;base64,/, "");
let md5str = self.checkMd5(img)
let params = new URLSearchParams();
......@@ -4911,7 +5194,16 @@ export default {
},
data: params
}).then(res => {
self.fingerPic.push({ zwzwdm: (Number(rightList[index].code) > 9) ? Number(rightList[index].code) : ('0' + Number(rightList[index].code)), zw_txsj: res.data, zw_txzl: rightList[index].scoreR })
let cf = self.findCF((Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)))
if (cf != null) {
self.fingerPic[cf] = {
zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)),
zw_txsj: res.data,
zw_txzl: leftList[index - 5].scoreR
}
} else {
self.fingerPic.push({ zwzwdm: (Number(leftList[index - 5].code) > 9) ? Number(leftList[index - 5].code) : ('0' + Number(leftList[index - 5].code)), zw_txsj: res.data, zw_txzl: leftList[index - 5].scoreR })
}
})
setTimeout(() => {
......@@ -5289,6 +5581,7 @@ export default {
* @return {*}
*/
smallLackFinger () {
let self = this
// 停止采集
let data = {};
data["cmd"] = 102;
......@@ -5311,6 +5604,14 @@ export default {
this.fingerImg = ''
self.frameImage = false
this.preStatusR = 4
let cf = self.findCF((Number(this.fingersRight[indexR].code) > 9) ? Number(this.fingersRight[indexR].code) : ('0' + Number(this.fingersRight[indexR].code)))
console.log(cf)
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
}
} else {
this.$set(this.fingersRight[indexR], 'isLackFingerR', false)
this.$set(this.fingersRight[indexR], 'statusR', 0)
......@@ -5337,6 +5638,13 @@ export default {
this.preStatusR = 4
this.fingerImg = ''
self.frameImage = false
let cf = self.findCF((Number(this.fingersLeft[indexR - 5].code) > 9) ? Number(this.fingersLeft[indexR - 5].code) : ('0' + Number(this.fingersLeft[indexR - 5].code)))
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
}
} else {
this.$set(this.fingersLeft[indexR - 5], 'isLackFingerR', false)
this.$set(this.fingersLeft[indexR - 5], 'statusR', 0)
......@@ -5365,6 +5673,13 @@ export default {
this.fingerImg = ''
self.frameImage = false
this.preStatusL = 4
let cf = self.findCF(Number(this.fingersRight[indexL]).code+10)
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
}
} else {
this.$set(this.fingersRight[indexL], 'isLackFingerL', false)
this.$set(this.fingersRight[indexL], 'statusL', 0)
......@@ -5391,6 +5706,13 @@ export default {
this.preStatusL = 4
this.fingerImg = ''
self.frameImage = false
let cf = self.findCF(Number(this.fingersLeft[indexL - 5]).code+10)
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
}
} else {
this.$set(this.fingersLeft[indexL - 5], 'isLackFingerL', false)
this.$set(this.fingersLeft[indexL - 5], 'statusL', 0)
......@@ -5430,17 +5752,37 @@ export default {
* @return {*}
*/
finishCollection () {
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
this.fingersRight.forEach(item => {
if ((item.statusL == 6 || item.statusR == 6)) {
this.flag = false
this.fingersRightNo.push(item)
}
})
this.fingersLeft.forEach(item => {
if ((item.statusL == 6 || item.statusR == 6)) {
this.flag = false
this.fingersLeftNo.push(item)
}
})
if (this.flag) {
this.finishVisible = true
} else {
this.failVisible = true
}
return;
}
// 遍历手指，查看是否有未录入指纹的
// 若有未录入的，弹出失败对话框，并将未录入的存入数组中
// 若全部录入，则弹出成功对话框
this.fingersRight.forEach(item => {
if ((item.imgSrcR == '' || item.imgSrcL == '') && (!item.isLackFinger && !item.isLackFingerL && !item.isLackFingerR)) {
if ((item.imgSrcR == '' || item.imgSrcL == '') && (!item.isLackFinger && (!item.isLackFingerL || !item.isLackFingerR))) {
this.flag = false
this.fingersRightNo.push(item)
}
})
this.fingersLeft.forEach(item => {
if ((item.imgSrcR == '' || item.imgSrcL == '') && (!item.isLackFinger && !item.isLackFingerL && !item.isLackFingerR)) {
if ((item.imgSrcR == '' || item.imgSrcL == '') && (!item.isLackFinger && (!item.isLackFingerL || !item.isLackFingerR))) {
this.flag = false
this.fingersLeftNo.push(item)
}
......@@ -5517,8 +5859,10 @@ export default {
console.log(this.fingerPic);
// 指纹数据
this.fingerPic.forEach((item) => {
if(item.zwzwdm) {
let fingerIndex = (Number(item.zwzwdm) > 9) ? Number(item.zwzwdm) : ('0' + Number(item.zwzwdm))
self.str += `<fingerMsg><zwzwdm>${fingerIndex}</zwzwdm><zzhwtztqfsdm>${this.fingerMsg.zzhwtztqfsdm}</zzhwtztqfsdm><zzhwqsqkdm>${this.fingerMsg.zzhwqsqkdm}</zzhwqsqkdm><zwwxzfl_zwwxdm>${this.fingerMsg.zwwxzfl_zwwxdm}</zwwxzfl_zwwxdm><zwwxffl_zwwxdm>${this.fingerMsg.zwwxffl_zwwxdm}</zwwxffl_zwwxdm><zwfx_tzfx>${this.fingerMsg.zwfx_tzfx}</zwfx_tzfx><zwfx_tzfxfw>${this.fingerMsg.zwfx_tzfxfw}</zwfx_tzfxfw><zwzxd_tzxzb>${this.fingerMsg.zwzxd_tzxzb}</zwzxd_tzxzb><zwzxd_tzyzb>${this.fingerMsg.zwzxd_tzyzb}</zwzxd_tzyzb><zwzxd_tzzbfw>${this.fingerMsg.zwzxd_tzzbfw}</zwzxd_tzzbfw><zwzxd_tzfx>${this.fingerMsg.zwzxd_tzfx}</zwzxd_tzfx><zwzxd_tzfxfw>${this.fingerMsg.zwzxd_tzfxfw}</zwzxd_tzfxfw><zwzxd_tzkkd>${this.fingerMsg.zwzxd_tzkkd}</zwzxd_tzkkd><zwfzx_tzxzb>${this.fingerMsg.zwfzx_tzxzb}</zwfzx_tzxzb><zwfzx_tzyzb>${this.fingerMsg.zwfzx_tzyzb}</zwfzx_tzyzb><zwfzx_tzzbfw>${this.fingerMsg.zwfzx_tzzbfw}</zwfzx_tzzbfw><zwfzx_tzfx>${this.fingerMsg.zwfzx_tzfx}</zwfzx_tzfx><zwfzx_tzfxfw>${this.fingerMsg.zwfzx_tzfxfw}</zwfzx_tzfxfw><zwfzx_tzkkd>${this.fingerMsg.zwfzx_tzkkd}</zwfzx_tzkkd><zwzsj_tzxzb>${this.fingerMsg.zwzsj_tzxzb}</zwzsj_tzxzb><zwzsj_tzyzb>${this.fingerMsg.zwzsj_tzyzb}</zwzsj_tzyzb><zwzsj_tzzbfw>${this.fingerMsg.zwzsj_tzzbfw}</zwzsj_tzzbfw><zwzsj_tzfx>${this.fingerMsg.zwzsj_tzfx}</zwzsj_tzfx><zwzsj_tzfxfw>${this.fingerMsg.zwzsj_tzfxfw}</zwzsj_tzfxfw><zwzsj_tzkkd>${this.fingerMsg.zwzsj_tzkkd}</zwzsj_tzkkd><zwysj_tzxzb>${this.fingerMsg.zwysj_tzxzb}</zwysj_tzxzb><zwysj_tzyzb>${this.fingerMsg.zwysj_tzyzb}</zwysj_tzyzb><zwysj_tzzbfw>${this.fingerMsg.zwysj_tzzbfw}</zwysj_tzzbfw><zwysj_tzfx>${this.fingerMsg.zwysj_tzfx}</zwysj_tzfx><zwysj_tzfxfw>${this.fingerMsg.zwysj_tzfxfw}</zwysj_tzfxfw><zwysj_tzkkd>${this.fingerMsg.zwysj_tzkkd}</zwysj_tzkkd><minutiaSet><minutia><zwtzd_tzxzb>${this.fingerMsg.zwtzd_tzxzb}</zwtzd_tzxzb><zwtzd_tzyzb>${this.fingerMsg.zwtzd_tzyzb}</zwtzd_tzyzb><zwtzd_tzfx>${this.fingerMsg.zwtzd_tzfx}</zwtzd_tzfx><zwtzd_tzzl>${this.fingerMsg.zwtzd_tzzl}</zwtzd_tzzl></minutia></minutiaSet><zw_zdyxx>${this.fingerMsg.zw_zdyxx}</zw_zdyxx><zw_txspfxcd>${this.fingerMsg.zw_txspfxcd}</zw_txspfxcd><zw_txczfxcd>${this.fingerMsg.zw_txczfxcd}</zw_txczfxcd><zw_txfbl>${this.fingerMsg.zw_txfbl}</zw_txfbl><zw_txysffms>${this.fingerMsg.zw_txysffms}</zw_txysffms><zw_txzl>${item.zw_txzl}</zw_txzl><zw_txsj>${item.zw_txsj}</zw_txsj></fingerMsg>`
}
})
// 人脸数据
self.faces = ''
......@@ -5617,6 +5961,75 @@ export default {
data: params
})
console.log(fingerRes);
// 返回数据给后台
// 滚动
let zwfkxx = 'A1'
this.zwfkxxFingerR = 'B'
this.fingersRight.forEach((item, index) => {
if (item.imgSrcR == '' && item.statusR == 4) {
this.zwfkxxFingerR = this.zwfkxxFingerR.concat('0')
} else {
this.zwfkxxFingerR = this.zwfkxxFingerR.concat('1')
}
})
this.fingersLeft.forEach((item, index) => {
if (item.imgSrcR == '' && item.statusR == 4) {
this.zwfkxxFingerR = this.zwfkxxFingerR.concat('0')
} else {
this.zwfkxxFingerR = this.zwfkxxFingerR.concat('1')
}
})
// 平面
this.zwfkxxFingerL = 'C'
this.fingersRight.forEach((item, index) => {
if (item.imgSrcL == '' && item.statusL == 4) {
this.zwfkxxFingerL = this.zwfkxxFingerL.concat(0)
} else {
this.zwfkxxFingerL = this.zwfkxxFingerL.concat(1)
}
})
this.fingersLeft.forEach((item, index) => {
if (item.imgSrcL == '' && item.statusL == 4) {
this.zwfkxxFingerL = this.zwfkxxFingerL.concat(0)
} else {
this.zwfkxxFingerL = this.zwfkxxFingerL.concat(1)
}
})
this.zwfkxxFace1 = ''
this.zwfkxxFace2 = ''
this.zwfkxxFace4 = ''
if (this.zmzpStr64) {
this.zwfkxxFace1 = 'F10000000'
} else {
this.zwfkxxFace1 = 'F00000000'
}
if (this.cmzpStr64) {
this.zwfkxxFace2 = 'G10000000'
} else {
this.zwfkxxFace2 = 'G00000000'
}
if (this.ycmzpStr64) {
this.zwfkxxFace4 = 'H10000000'
} else {
this.zwfkxxFace4 = 'H00000000'
}
zwfkxx = zwfkxx.concat(this.zwfkxxFingerR).concat(this.zwfkxxFingerL).concat('D0E00').concat(this.zwfkxxFace1).concat(this.zwfkxxFace2).concat(this.zwfkxxFace4)
console.log(zwfkxx);
axios({
method: 'post',
url: '/apiInfo/insertZwbhAndZwfkxxByRybh',
params: {
rybh: self.rybh,
zwbh: self.rybh,
zwfkxx: zwfkxx
}
}).then(res => {
console.log(res);
}).catch(err => {
console.log(err);
})
NProgress.done();
this.$message.success(fingerRes.data)
......@@ -5659,6 +6072,63 @@ export default {
*/
setFinger () {
this.failVisible = false
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
if (this.fingersRightNo.length != 0) {
this.preIndex = null
this.preStatusR = null
this.preStatusL = null
this.fingersRightNo.forEach((item, index) => {
if ((item.statusR == 6) && (item.statusL == 6)) {
this.fingersRight[item.code - 1].statusR = 4
this.fingersRight[item.code - 1].statusL = 4
this.fingersRight[item.code - 1].isLackFinger = true
this.cur = item.code + 5
this.$refs.rightFinger.children[item.code - 1].setAttribute('src', this.fingerArr[item.code - 1 + 20])
console.log(item.code - 1);
} else {
if (item.statusR == 6) {
this.fingersRight[item.code - 1].statusR = 4
this.fingersRight[item.code - 1].isLackFingerR = true
this.cur = item.code + 5
this.$refs.rightFinger.children[item.code - 1].setAttribute('src', this.fingerArr[item.code - 1 + 20])
}
if (item.statusL == 6) {
this.fingersRight[item.code - 1].statusL = 4
this.fingersRight[item.code - 1].isLackFingerL = true
this.cur = item.code + 5
this.$refs.rightFinger.children[item.code - 1].setAttribute('src', this.fingerArr[item.code - 1 + 20])
}
}
})
}
if (this.fingersLeftNo.length != 0) {
this.preIndex = null
this.preStatusR = null
this.preStatusL = null
this.fingersLeftNo.forEach((item, index) => {
if ((item.statusR == 6) && (item.statusL == 6)) {
this.fingersLeft[item.code - 1 - 5].statusR = 4
this.fingersLeft[item.code - 1 - 5].statusL = 4
this.fingersLeft[item.code - 1 - 5].isLackFinger = true
this.cur = item.code - 5
this.$refs.leftFinger.children[item.code - 1 - 5].setAttribute('src', this.fingerArr[item.code - 1 - 5 + 5 + 20])
} else {
if (item.statusR == 6) {
this.fingersLeft[item.code - 1 - 5].statusR = 4
this.fingersLeft[item.code - 1 - 5].isLackFingerR = true
this.cur = item.code - 5
this.$refs.leftFinger.children[item.code - 1 - 5].setAttribute('src', this.fingerArr[item.code - 1 - 5 + 5 + 20])
}
if (item.statusL == 6) {
this.fingersLeft[item.code - 1 - 5].statusL = 4
this.fingersLeft[item.code - 1 - 5].isLackFingerL = true
this.cur = item.code - 5
this.$refs.leftFinger.children[item.code - 1 - 5].setAttribute('src', this.fingerArr[item.code - 1 - 5 + 5 + 20])
}
}
})
}
} else {
if (this.fingersRightNo.length != 0) {
this.preIndex = null
this.preStatusR = null
......@@ -5685,7 +6155,6 @@ export default {
this.$refs.rightFinger.children[item.code - 1].setAttribute('src', this.fingerArr[item.code - 1 + 20])
}
}
})
}
if (this.fingersLeftNo.length != 0) {
......@@ -5715,6 +6184,8 @@ export default {
}
})
}
}
// 关闭设备
if (this.GrpcCameraService) {
this.GrpcCameraService.stopVideoStream()
......@@ -5759,27 +6230,27 @@ export default {
// 保存成功的标志位
let self = this
console.log('保存图片');
this.fingerPic = []
this.fingerPic2 = []
// 提取图片数据
// 滚动
this.fingersLeft.forEach((item) => {
this.fingerPic.push(item.imgSrcR)
})
this.fingersRight.forEach((item) => {
this.fingerPic.push(item.imgSrcR)
this.fingerPic2.push(item.imgSrcR)
})
// 平面
this.fingersLeft.forEach((item) => {
this.fingerPic.push(item.imgSrcL)
this.fingerPic2.push(item.imgSrcR)
})
// 平面
this.fingersRight.forEach((item) => {
this.fingerPic.push(item.imgSrcL)
this.fingerPic2.push(item.imgSrcL)
})
this.fingersLeft.forEach((item) => {
this.fingerPic2.push(item.imgSrcL)
})
// 开始压缩
NProgress.start();
const zip = new JSZip()
let i = 1
this.fingerPic.forEach(item => {
this.fingerPic2.forEach(item => {
if (item !== '') {
let result = self.dataURLtoFile(item, 'filebmg')
console.log(result);
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-16 18:34:14
* @LastEditTime: 2021-09-17 19:04:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
......@@ -80,7 +80,7 @@ module.exports = {
}
},
"/apiMachine": {
target: "http://65.26.10.49/", //统一的请求头部每次修改都要重启才会生效
target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
......@@ -88,7 +88,7 @@ module.exports = {
}
},
"/apiInfo": {
target: "http://65.26.10.49/", //统一的请求头部每次修改都要重启才会生效
target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment