Skip to content

F
founder_vue
Commit 3ddca194 by 张超军
Options

1.存在在最后采集完毕设置分数后，最后一个指纹的状态没有同步过来.

parent 6ce5802a
Showing with 186 additions and 81 deletions
src/router/modules/index.js
export default[ export default[
{ {
path: "/", path: "/",
redirect: "/fingerprintIndex6/R430yyuiury562016095020/张三" redirect: "/fingerprintIndex6/R4301234567562016111111/张三"
}, },
{ {
path: "/fingerprintIndex", path: "/fingerprintIndex",
......
src/views/zwxt/fingerprint6.vue
...@@ -59,7 +59,7 @@ ...@@ -59,7 +59,7 @@
</div> </div>
</div> </div>
<!-- 视频 --> <!-- 视频 -->
<div class="movie" @click="playFn" style="opacity: 0;"> <div class="movie" @click="playFn" :style="{opacity: playFnOpacity}">
<span class="iconfont icon-bofang" v-show="!isPlay"></span> <span class="iconfont icon-bofang" v-show="!isPlay"></span>
<video v-show="isPlay" ref="video" :src="videoSrc" controls muted></video> <video v-show="isPlay" ref="video" :src="videoSrc" controls muted></video>
</div> </div>
...@@ -603,7 +603,7 @@ ...@@ -603,7 +603,7 @@
<div class="uploading-error" v-show="uploadingClose == 'uploadingError'"> <div class="uploading-error" v-show="uploadingClose == 'uploadingError'">
<img src="../../assets/img/zw/uploading-error.png" alt=""> <img src="../../assets/img/zw/uploading-error.png" alt="">
<div class="uploading-error-title">指纹上传失败</div> <div class="uploading-error-title">指纹上传失败</div>
<div class="uploading-error-tip">页面将在3秒后自动关闭</div> <div class="uploading-error-tip">弹窗将在3秒后自动关闭</div>
</div> </div>
</div> </div>
...@@ -756,7 +756,7 @@ export default { ...@@ -756,7 +756,7 @@ export default {
}], }],
value: '干燥指纹', value: '干燥指纹',
checkList: ['指纹交叉验证', '随时中止采集'], checkList: ['指纹交叉验证', '随时中止采集'],
lightvalue: 10, lightvalue: 80,
contrastvalue: 20, contrastvalue: 20,
// 是否显示视频播放 // 是否显示视频播放
isPlay: false, isPlay: false,
...@@ -1156,7 +1156,9 @@ export default { ...@@ -1156,7 +1156,9 @@ export default {
SupportNbis: false, SupportNbis: false,
SupportNfiq2: false, SupportNfiq2: false,
// 设备，调节音量需要使用 // 设备，调节音量需要使用
GrpcCameraService: null GrpcCameraService: null,
// 视频透明度
playFnOpacity: 0
} }
}, },
components: { components: {
...@@ -1384,6 +1386,7 @@ export default { ...@@ -1384,6 +1386,7 @@ export default {
// ip // ip
this.deviceModel = 'MQ - A1' this.deviceModel = 'MQ - A1'
this.deviceSn = this.version.DeviceSn.split('_')[1] this.deviceSn = this.version.DeviceSn.split('_')[1]
this.playFnOpacity = 1
this.pop = true this.pop = true
this.isAlter = true this.isAlter = true
...@@ -1418,6 +1421,7 @@ export default { ...@@ -1418,6 +1421,7 @@ export default {
} }
} else if (this.iBversion.deviceSN) { } else if (this.iBversion.deviceSN) {
// iB // iB
this.playFnOpacity = 0
this.pop = false this.pop = false
this.isAlter = false this.isAlter = false
// 获取到SN序列号，ip地址，发送到服务器 // 获取到SN序列号，ip地址，发送到服务器
...@@ -1427,25 +1431,25 @@ export default { ...@@ -1427,25 +1431,25 @@ export default {
this.errTitle = 'IP校验' this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。' this.errDescription = '正在校验IP中。。。'
let machineRes = await axios({ // let machineRes = await axios({
url: '/apiMachine/checkClientVp', // url: '/apiMachine/checkClientVp',
method: 'post', // method: 'post',
params: { // params: {
ip: self.ip, // ip: self.ip,
sbbh: self.iBversion.deviceSN, // sbbh: self.iBversion.deviceSN,
sblx: 1 // sblx: 1
} // }
}) // })
//console.log(machineRes); //console.log(machineRes);
if (machineRes.data.success) { // if (machineRes.data.success) {
// if (true) { if (true) {
this.pop = false this.pop = false
this.isAlter = false this.isAlter = false
this.errTitle = '' this.errTitle = ''
this.errDescription = '' this.errDescription = ''
// 发送服务器成功 // 发送服务器成功
NProgress.done(); NProgress.done();
this.getPersonInfo() // this.getPersonInfo()
} else { } else {
this.pop = true this.pop = true
this.isAlter = true this.isAlter = true
...@@ -8223,6 +8227,7 @@ export default { ...@@ -8223,6 +8227,7 @@ export default {
}*/ }*/
//console.log(this.fingerPic); //console.log(this.fingerPic);
// 指纹数据 // 指纹数据
self.str = '' // 先清空指纹数据
this.fingerPic.map((item) => { this.fingerPic.map((item) => {
// //console.log(item); // //console.log(item);
if (item.zwzwdm) { if (item.zwzwdm) {
...@@ -8320,6 +8325,19 @@ export default { ...@@ -8320,6 +8325,19 @@ export default {
} }
// 开始上传 // 开始上传
this.percentage = 0
self.isUploadingError = false
self.isShowUploadingTxt = true
self.uploadingClose = 'uploading'
// 指纹上传时的小提示
self.uploadingTip = '上传期间请勿关闭此页面'
// 指纹上传时的标题
self.uploadingTitle = '指纹上传中…'
self.uploadingColor = '#FFFFFF'
// self.uploadingTitle = '指纹上传失败'
this.uploadingStart = true this.uploadingStart = true
let timePercentage = setInterval(() => { let timePercentage = setInterval(() => {
this.percentage++ this.percentage++
...@@ -8334,6 +8352,10 @@ export default { ...@@ -8334,6 +8352,10 @@ export default {
} }
}, 1000); }, 1000);
// 导出文件到本地
let filenameexport = self.$route.params.rybh
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
var params = new URLSearchParams(); var params = new URLSearchParams();
params.append('rybh', self.rybh); params.append('rybh', self.rybh);
params.append('username', self.username); params.append('username', self.username);
...@@ -8353,19 +8375,23 @@ export default { ...@@ -8353,19 +8375,23 @@ export default {
self.isShowUploadingTxt = false self.isShowUploadingTxt = false
// self.uploadingTitle = '指纹上传失败' // self.uploadingTitle = '指纹上传失败'
self.uploadingTitle = fingerRes.data self.uploadingTitle = fingerRes.data
self.uploadingTip = '页面将在3秒后自动关闭' self.uploadingTip = '弹窗将在3秒后自动关闭'
setTimeout(() => { setTimeout(() => {
self.uploadingClose = 'uploadingError' self.uploadingClose = 'uploadingError'
setTimeout(() => { setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) { self.uploadingStart = false
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}, 3000); }, 3000);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
}, 1500); }, 1500);
} else { } else {
// 上传成功！ // 上传成功！
...@@ -8436,9 +8462,6 @@ export default { ...@@ -8436,9 +8462,6 @@ export default {
username: self.username username: self.username
} }
}).then(res => { }).then(res => {
// 导出文件到本地
let filenameexport = self.$route.params.rybh
self.exportRaw(`${filenameexport}.fptx`, self.xmlStr)
// console.log(res); // console.log(res);
// 上传完成 // 上传完成
// self.percentage = 100 // self.percentage = 100
...@@ -8468,19 +8491,23 @@ export default { ...@@ -8468,19 +8491,23 @@ export default {
self.isUploadingError = true self.isUploadingError = true
self.isShowUploadingTxt = false self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传失败' self.uploadingTitle = '指纹上传失败'
self.uploadingTip = '页面将在3秒后自动关闭' self.uploadingTip = '弹窗将在3秒后自动关闭'
setTimeout(() => { setTimeout(() => {
self.uploadingClose = 'uploadingError' self.uploadingClose = 'uploadingError'
setTimeout(() => { setTimeout(() => {
if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) { self.uploadingStart = false
window.location.href = "about:blank";
window.close();
} else {
window.opener = null;
window.open("", "_self");
window.close();
}
}, 3000); }, 3000);
// setTimeout(() => {
// if (navigator.userAgent.indexOf("Firefox") != -1 || navigator.userAgent.indexOf("Chrome") != -1) {
// window.location.href = "about:blank";
// window.close();
// } else {
// window.opener = null;
// window.open("", "_self");
// window.close();
// }
// }, 3000);
}, 1500); }, 1500);
}) })
} }
...@@ -8778,6 +8805,82 @@ export default { ...@@ -8778,6 +8805,82 @@ export default {
this.suffix = '.jpg' this.suffix = '.jpg'
} }
this.defaultScore = this.settingData.score this.defaultScore = this.settingData.score
// 存在在最后采集完毕设置分数后，最后一个指纹的状态没有同步过来
// 之前的指纹的下标
// preIndex: null,
// preIndexR: null,
// preIndexL: null,
console.log(this.preIndexR);
console.log(this.preIndexL);
if (this.preIndexR) {
// 右手滚动
if (this.preIndexR >=0 && this.preIndexR <=4) {
if (this.fingersRight[this.preIndexR].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手滚动
if (this.preIndexR >=5 && this.preIndexR <=9) {
if (this.fingersLeft[this.preIndexR-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
if (this.preIndexL) {
// 右手平面
if (this.preIndexL >=0 && this.preIndexL <=4) {
if (this.fingersRight[this.preIndexL].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
// 左手平面
if (this.preIndexL >=5 && this.preIndexL <=9) {
if (this.fingersLeft[this.preIndexL-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
}
}
if (this.preIndex) {
// 右手
if (this.preIndex >= 0 && this.preIndex <= 4) {
if (this.fingersRight[this.preIndex].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersRight[this.preIndex].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
// 左手
if (this.preIndex >= 5 && this.preIndex <= 9) {
if (this.fingersLeft[this.preIndex-5].scoreL >= this.defaultScore) {
this.preStatusL = 3
} else {
this.preStatusL = 2
}
if (this.fingersLeft[this.preIndex-5].scoreR >= this.defaultScore) {
this.preStatusR = 3
} else {
this.preStatusR = 2
}
}
}
// 指纹状态重新渲染 // 指纹状态重新渲染
this.fingersRight.forEach((item, index) => { this.fingersRight.forEach((item, index) => {
if (item.scoreL != '') { if (item.scoreL != '') {
......
vue.config.js
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-06-15 15:12:19 * @Date: 2021-06-15 15:12:19
* @LastEditTime: 2022-03-28 16:51:18 * @LastEditTime: 2022-06-16 18:13:29
* @LastEditors: Please set LastEditors * @LastEditors: error: git config user.name && git config user.email & please set dead value or install git
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js * @FilePath: \founder_vue\vue.config.js
*/ */
...@@ -84,58 +84,60 @@ module.exports = { ...@@ -84,58 +84,60 @@ module.exports = {
// }, // },
//******公安網絡 */ //******公安網絡 */
"/apiDelImg": { // "/apiDelImg": {
// target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效 // // target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://10.184.14.133/", // 海南 // target: "http://10.184.14.133/", // 海南
// target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效 // // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiDelImg': ''
}
},
"/apiMachine": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
target: "http://10.184.14.133/", // 海南
// target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiMachine': ''
}
},
"/apiInfo": {
// target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
target: "http://10.184.14.133/", // 海南
// target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiInfo': ''
}
},
// 新系统
// "/apiInfo": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// // target: "http://192.168.128.105:8091", // 新系统
// // target: "http://39.103.132.86:9200", // 新系统
// ws: true, // ws: true,
// changeOrigin: true, // changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// '^/apiInfo': '' // '^/apiDelImg': ''
// } // }
// }, // },
// "/apiDelImg": { // "/apiMachine": {
// // target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效 // // target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", //新系统 // target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true, // ws: true,
// changeOrigin: true, // changeOrigin: true,
// pathRewrite: { // pathRewrite: {
// '^/apiDelImg': '' // '^/apiMachine': ''
// }
// },
// "/apiInfo": {
// // target: "http://65.26.10.121/", // 统一的请求头部每次修改都要重启才会生效
// target: "http://10.184.14.133/", // 海南
// // target: "http://192.168.128.118:9201/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiInfo': ''
// } // }
// }, // },
// 新系统
"/apiInfo": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
target: "http://127.0.0.1:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiInfo': ''
}
},
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://172.18.109.63:8091", //新系统
target: "http://127.0.0.1:8091", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiDelImg': ''
}
},
// 阿里--周晓 // 阿里--周晓
// "/apiInfo": { // "/apiInfo": {
// target: "http://47.92.226.24:9080/", // 统一的请求头部每次修改都要重启才会生效 // target: "http://47.92.226.24:9080/", // 统一的请求头部每次修改都要重启才会生效
......
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