Skip to content

F
founder_vue
Commit 54239a68 by 张超军
Options

1.去掉fptx默认字段。2.优化采集完成按钮，直到最后一个指纹图片处理完毕。

parent 629da991
Showing with 119 additions and 85 deletions
package-lock.json
......@@ -1920,7 +1920,7 @@
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.2.0",
"version": "npm:vue-loader-v16@16.2.0",
"resolved": "https://registry.nlark.com/vue-loader/download/vue-loader-16.2.0.tgz",
"integrity": "sha1-BGpTMI3Ufljv4g3ewe3sAnzjtG4=",
"dev": true,
......
src/main.js
......@@ -28,7 +28,28 @@ import axios from 'axios'
axios.defaults.retry = 9;
axios.defaults.retryDelay = 1000;
axios.interceptors.response.use(undefined, function axiosRetryInterceptor (err) {
axios.interceptors.request.use(
function (config) {
if (config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 1)
}
console.log(1);
return config;
},
function (error) {
// NProgress.start();
// Do something with request error
return Promise.reject(error);
}
);
axios.interceptors.response.use(function(response) {
if (response.config.url == '/apiDelImg/dealImgStr') {
sessionStorage.setItem('dealImgStr', 0)
console.log(0);
}
return response;
}, function axiosRetryInterceptor (err) {
var config = err.config;
// If config does not exist or the retry option is not set, reject
if (!config || !config.retry) return Promise.reject(err);
......
src/views/zwxt/fingerprint6.vue
......@@ -1047,87 +1047,87 @@ export default {
// 文件参数
packageHeader: {
version: 'FPT0500',
createTime: '20210812100029',
createTime: '',
originSystem: 'AFIS',
fsdw_gajgjgdm: '122222222222',
fsdw_gajgjgdm: '',
fsdw_gajgmc: '方正',
fsdw_xtlx: '2900',
fsr_xm: '张三',
fsr_gmsfhm: '130148888222115551',
fsr_lxdh: '17703263321'
fsr_xm: '',
fsr_gmsfhm: '',
fsr_lxdh: ''
},
collectInfoMsg: {
zwbdxtlxms: '2900',
nydw_gajgjgdm: '140926000000',
nydw_gajgmc: '静乐县公安局',
nyry_xm: '李志宏',
nyry_gmsfhm: '140123197510240014',
nyry_lxdh: '13363514840',
nysj: '20210318000000'
zwbdxtlxms: '',
nydw_gajgjgdm: '',
nydw_gajgmc: '',
nyry_xm: '',
nyry_gmsfhm: '',
nyry_lxdh: '',
nysj: ''
},
descriptiveMsg: {
ysxt_asjxgrybh: this.$route.params.rybh,
jzrybh: '',
asjxgrybh: this.$route.params.rybh,
zzhwkbh: this.$route.params.rybh,
hjdz_xzqhdm: '1',
hjdz_dzmc: '1',
xzz_xzqhdm: '1',
xzz_dzmc: '1',
xm: 'qq',
bmch: '1',
xbdm: '1',
csrq: '20210812100029',
gjdm: '1',
hjdz_xzqhdm: '',
hjdz_dzmc: '',
xzz_xzqhdm: '',
xzz_dzmc: '',
xm: '',
bmch: '',
xbdm: '',
csrq: '',
gjdm: '',
mzdm: '',
cyzjdm: '',
zjhm: '130481199801123225',
zjhm: '',
bz: '',
cjxxyydm: ''
},
fingerMsg: {
zzhwtztqfsdm: 'A',
zzhwqsqkdm: '0',
zwwxzfl_zwwxdm: '9',
zwwxffl_zwwxdm: '9',
zwfx_tzfx: '9',
zwfx_tzfxfw: '9',
zwzxd_tzxzb: '9',
zwzxd_tzyzb: '9',
zwzxd_tzzbfw: '9',
zwzxd_tzfx: '9',
zwzxd_tzfxfw: '9',
zwzxd_tzkkd: '9',
zwfzx_tzxzb: '9',
zwfzx_tzyzb: '9',
zwfzx_tzzbfw: '9',
zwfzx_tzfx: '9',
zwfzx_tzfxfw: '9',
zwfzx_tzkkd: '9',
zwzsj_tzxzb: '9',
zwzsj_tzyzb: '9',
zwzsj_tzzbfw: '9',
zwzsj_tzfx: '9',
zwzsj_tzfxfw: '9',
zwzsj_tzkkd: '9',
zwysj_tzxzb: '9',
zwysj_tzyzb: '9',
zwysj_tzzbfw: '9',
zwysj_tzfx: '9',
zwysj_tzfxfw: '9',
zwysj_tzkkd: '9',
zzhwtztqfsdm: '',
zzhwqsqkdm: '',
zwwxzfl_zwwxdm: '',
zwwxffl_zwwxdm: '',
zwfx_tzfx: '',
zwfx_tzfxfw: '',
zwzxd_tzxzb: '',
zwzxd_tzyzb: '',
zwzxd_tzzbfw: '',
zwzxd_tzfx: '',
zwzxd_tzfxfw: '',
zwzxd_tzkkd: '',
zwfzx_tzxzb: '',
zwfzx_tzyzb: '',
zwfzx_tzzbfw: '',
zwfzx_tzfx: '',
zwfzx_tzfxfw: '',
zwfzx_tzkkd: '',
zwzsj_tzxzb: '',
zwzsj_tzyzb: '',
zwzsj_tzzbfw: '',
zwzsj_tzfx: '',
zwzsj_tzfxfw: '',
zwzsj_tzkkd: '',
zwysj_tzxzb: '',
zwysj_tzyzb: '',
zwysj_tzzbfw: '',
zwysj_tzfx: '',
zwysj_tzfxfw: '',
zwysj_tzkkd: '',
minutiaSet: '',
zw_zdyxx: '9',
zw_zdyxx: '',
zw_txspfxcd: '640',
zw_txczfxcd: '640',
zw_txfbl: '500',
zw_txysffms: '0000',
zw_txysffms: '',
// 图片打分
// zw_txzl: '9',
zwtzd_tzxzb: '9',
zwtzd_tzyzb: '640',
zwtzd_tzfx: '9',
zwtzd_tzzl: '9'
zwtzd_tzxzb: '',
zwtzd_tzyzb: '',
zwtzd_tzfx: '',
zwtzd_tzzl: ''
},
// 人员编号
rybh: this.$route.params.rybh,
......@@ -1213,6 +1213,11 @@ export default {
let self = this
/*********************** */
// 监听刷新，清除session
window.onbeforeunload = function (e) {
//清除sessionStorage值
sessionStorage.clear()
}
function getIPs (callback) {
var ip_dups = {};
//compatibility for firefox and chrome
......@@ -1385,24 +1390,25 @@ export default {
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
let machineRes = await axios({
url: '/apiMachine/checkClientVp',
method: 'post',
params: {
ip: self.ip,
sbbh: self.deviceSn,
sblx: 1
}
})
// let machineRes = await axios({
// url: '/apiMachine/checkClientVp',
// method: 'post',
// params: {
// ip: self.ip,
// sbbh: self.deviceSn,
// sblx: 1
// }
// })
// //console.log(machineRes);
if (machineRes.data.success) {
// if (true) {
// if (machineRes.data.success) {
if (true) {
this.pop = false
this.isAlter = false
this.errTitle = ''
this.errDescription = ''
// 发送服务器成功
NProgress.done();
// this.getPersonInfo()
} else {
this.pop = true
this.isAlter = true
......@@ -1421,24 +1427,25 @@ export default {
this.errTitle = 'IP校验'
this.errDescription = '正在校验IP中。。。'
// let machineRes = await axios({
// url: '/apiMachine/checkClientVp',
// method: 'post',
// params: {
// ip: self.ip,
// sbbh: self.iBversion.deviceSN,
// sblx: 1
// }
// })
let machineRes = await axios({
url: '/apiMachine/checkClientVp',
method: 'post',
params: {
ip: self.ip,
sbbh: self.iBversion.deviceSN,
sblx: 1
}
})
//console.log(machineRes);
// if (machineRes.data.success) {
if (true) {
if (machineRes.data.success) {
// if (true) {
this.pop = false
this.isAlter = false
this.errTitle = ''
this.errDescription = ''
// 发送服务器成功
NProgress.done();
this.getPersonInfo()
} else {
this.pop = true
this.isAlter = true
......@@ -1455,7 +1462,7 @@ export default {
this.errDescription = '无法获取到设备信息'
NProgress.done();
}
this.getPersonInfo()
// this.getPersonInfo()
},
methods: {
/**
......@@ -8092,6 +8099,10 @@ export default {
if (this.fingerPic.length == 0) {
return;
}
if (sessionStorage.getItem('dealImgStr') == 1) {
this.$message.warning('数据正在处理，请稍后再试！')
return;
}
this.fingersLeftNo = []
this.fingersRightNo = []
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
......@@ -8340,7 +8351,8 @@ export default {
self.uploadingColor = '#E82510'
self.isUploadingError = true
self.isShowUploadingTxt = false
self.uploadingTitle = '指纹上传失败'
// self.uploadingTitle = '指纹上传失败'
self.uploadingTitle = fingerRes.data
self.uploadingTip = '页面将在3秒后自动关闭'
setTimeout(() => {
self.uploadingClose = 'uploadingError'
......
vue.config.js
......@@ -125,7 +125,8 @@ module.exports = {
},
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
target: "http://192.168.128.105:8091", //新系统
// target: "http://192.168.128.105:8091", //新系统
target: "http://172.18.109.63:8091", //新系统
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