Skip to content

F
founder_vue
Commit b5b91f95 by 张超军
Options

补采修改

parent cf3e6ac5
Showing with 125 additions and 58 deletions
src/router/modules/index.js
export default[
{
path: "/",
redirect: "/fingerprintIndex6/R430yyuiury562016095020"
redirect: "/fingerprintIndex6/R430yyuiury562016095020/张三"
},
{
path: "/fingerprintIndex",
......@@ -31,7 +31,7 @@ export default[
component: () => import("@/views/zwxt/fingerprint3.vue")
},
{
path: "/fingerprintIndex6/:rybh",
path: "/fingerprintIndex6/:rybh/:username",
name: "fingerprintIndex6",
meta: {
title: '指纹界面',
......
src/views/zwxt/fingerprint6.vue
......@@ -189,7 +189,7 @@
<div v-show="item.scoreR && item.scoreR<defaultScore" class="score fail">
{{ item.scoreR }}
</div>
<img v-show="item.isLackFinger || item.isLackFingerR" src="../../assets/img/zw/anaphora.png" alt="">
<img v-show="(item.isLackFinger || item.isLackFingerR) && !item.imgSrcR" src="../../assets/img/zw/anaphora.png" alt="">
<div v-show="item.isGet" class="desc">补采</div>
</button>
<button v-else-if="item.statusR == 2" class="pic fail" @click="oddAndDouble(item, i, 'r')">
......@@ -228,7 +228,7 @@
<div v-show="item.scoreL && item.scoreL<defaultScore" class="score fail">
{{ item.scoreL }}
</div>
<img v-show="item.isLackFinger || item.isLackFingerL" src="../../assets/img/zw/anaphora.png" alt="">
<img v-show="(item.isLackFinger || item.isLackFingerL) && !item.imgSrcL" src="../../assets/img/zw/anaphora.png" alt="">
<div v-show="item.isGet" class="desc">补采</div>
</button>
<button v-else-if="item.statusL == 2" class="pic fail" @click="oddAndDouble(item, i, 'l')">
......@@ -268,7 +268,7 @@
<div v-show="item.scoreR && item.scoreR<defaultScore" class="score fail">
{{ item.scoreR }}
</div>
<img v-show="item.isLackFinger || item.isLackFingerR" src="../../assets/img/zw/anaphora.png" alt="">
<img v-show="(item.isLackFinger || item.isLackFingerR) && !item.imgSrcR" src="../../assets/img/zw/anaphora.png" alt="">
<div v-show="item.isGet" class="desc">补采</div>
</button>
<button v-else-if="item.statusR == 2" class="pic fail" @click="oddAndDouble(item, i+5, 'r')">
......@@ -306,7 +306,7 @@
<div v-show="item.scoreL && item.scoreL<defaultScore" class="score fail">
{{ item.scoreL }}
</div>
<img v-show="item.isLackFinger || item.isLackFingerL" src="../../assets/img/zw/anaphora.png" alt="">
<img v-show="(item.isLackFinger || item.isLackFingerL) && !item.imgSrcL" src="../../assets/img/zw/anaphora.png" alt="">
<div v-show="item.isGet" class="desc">补采</div>
</button>
<button v-else-if="item.statusL == 2" class="pic fail" @click="oddAndDouble(item, i+5, 'l')">
......@@ -347,16 +347,18 @@
<el-dialog title="提示" :visible.sync="finishVisible" width="480px" :modal-append-to-body='false'>
<span>当前页面所有指位均采集完成，是否确认上传？</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="finishVisible = false">取消</el-button>
<el-button type="primary" @click="uploadFinger">上传</el-button>
<el-button type="primary" @click="finishVisible = false">取消</el-button>
</span>
</el-dialog>
<!-- 采集不成功弹窗 -->
<el-dialog title="提示" :visible.sync="failVisible" width="480px" :modal-append-to-body='false'>
<span>当前页面有未采集指位，确定要结束采集吗？<br>选择“是”，未采集指位将被置为缺指。</span>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="failVisible = false">否</el-button>
<el-button type="primary" @click="setFinger">是</el-button>
<el-button type="primary" @click="failVisible = false">否</el-button>
</span>
</el-dialog>
</div>
......@@ -526,8 +528,9 @@
</div>
</div>
<span slot="footer" class="dialog-footer">
<el-button type="primary" @click="cancelSetting">取消</el-button>
<el-button type="primary" @click="settingConfirm">确定</el-button>
<el-button type="primary" @click="cancelSetting">取消</el-button>
</span>
</el-dialog>
</div>
......@@ -1047,6 +1050,8 @@ export default {
},
// 人员编号
rybh: this.$route.params.rybh,
// 用户名
username: this.$route.params.username,
// 是否生成人像数据
isFace: false,
// 人像-正面
......@@ -1255,8 +1260,9 @@ export default {
sblx: 1
}
})
// console.log(machineRes);
console.log(machineRes);
if (machineRes.data.success) {
// if(true) {
this.pop = false
this.isAlter = false
this.errTitle = ''
......@@ -1281,18 +1287,18 @@ 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 = ''
......@@ -1350,9 +1356,9 @@ export default {
this.rybh = this.$route.params.rybh
axios({
// 測試
// url: '/apiInfo/hmdataImport/getYthcjryxxByRybh',
url: '/apiInfo/hmdataImport/getYthcjryxxByRybh',
// 公安
url: '/apiInfo/getYthcjryxxByRybh',
// url: '/apiInfo/getYthcjryxxByRybh',
method: 'post',
params: {
rybh: self.rybh
......@@ -1370,6 +1376,7 @@ export default {
}
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)
......@@ -1400,6 +1407,7 @@ export default {
self.dealIsGetFinger()
console.log(self.fingersRight);
console.log(self.fingersLeft);
})
},
/**
......@@ -1847,8 +1855,14 @@ export default {
oddAndDouble (finger, index, type) {
// 如果有补采信息传入
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
// 滚动
if(type == 'r') {
if (finger.statusR == 0) return;
} else {
// 平面
if (finger.statusL == 0) return;
}
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++;
......@@ -2132,6 +2146,8 @@ export default {
self.tipType = 'warning'
self.showTip()
}
self.fingerImg = ''
self.loading = false
}
} else if (type == 'left') {
// 进入录制状态
......@@ -2360,6 +2376,8 @@ export default {
self.tipType = 'warning'
self.showTip()
}
self.fingerImg = ''
self.loading = false
}
}
// 采集结束
......@@ -5611,7 +5629,7 @@ export default {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
}
console.log(this.fingersRight[indexR]);
} else {
this.$set(this.fingersRight[indexR], 'isLackFingerR', false)
this.$set(this.fingersRight[indexR], 'statusR', 0)
......@@ -5674,7 +5692,7 @@ export default {
self.frameImage = false
this.preStatusL = 4
let cf = self.findCF(Number(this.fingersRight[indexL]).code+10)
let cf = self.findCF(Number(this.fingersRight[indexL]).code + 10)
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
......@@ -5707,7 +5725,7 @@ export default {
this.fingerImg = ''
self.frameImage = false
let cf = self.findCF(Number(this.fingersLeft[indexL - 5]).code+10)
let cf = self.findCF(Number(this.fingersLeft[indexL - 5]).code + 10)
if (cf != null) {
// self.fingerPic[cf] = {}
self.fingerPic.splice(cf, 1)
......@@ -5752,6 +5770,8 @@ export default {
* @return {*}
*/
finishCollection () {
this.fingersLeftNo = []
this.fingersRightNo = []
if (this.rGdzw.length > 0 || this.rPmzw.length > 0) {
this.fingersRight.forEach(item => {
if ((item.statusL == 6 || item.statusR == 6)) {
......@@ -5787,7 +5807,15 @@ export default {
this.fingersLeftNo.push(item)
}
})
console.log(this.fingersRight);
// console.log(this.fingersLeftNo);
// console.log(this.fingersRightNo);
console.log(this.flag);
if (this.fingersLeftNo.length > 0 || this.fingersRightNo.length > 0) {
this.flag = false
} else {
this.flag = true
}
if (this.flag) {
this.finishVisible = true
} else {
......@@ -5859,7 +5887,7 @@ export default {
console.log(this.fingerPic);
// 指纹数据
this.fingerPic.forEach((item) => {
if(item.zwzwdm) {
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>`
}
......@@ -6023,7 +6051,8 @@ export default {
params: {
rybh: self.rybh,
zwbh: self.rybh,
zwfkxx: zwfkxx
zwfkxx: zwfkxx,
username: self.username
}
}).then(res => {
console.log(res);
......@@ -6082,6 +6111,8 @@ export default {
this.fingersRight[item.code - 1].statusR = 4
this.fingersRight[item.code - 1].statusL = 4
this.fingersRight[item.code - 1].isLackFinger = true
this.fingersRight[item.code - 1].isLackFingerR = true
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])
console.log(item.code - 1);
......@@ -6138,6 +6169,8 @@ export default {
this.fingersRight[item.code - 1].statusR = 4
this.fingersRight[item.code - 1].statusL = 4
this.fingersRight[item.code - 1].isLackFinger = true
this.fingersRight[item.code - 1].isLackFingerR = true
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])
console.log(item.code - 1);
......@@ -6145,12 +6178,14 @@ export default {
if (item.imgSrcR == '') {
this.fingersRight[item.code - 1].statusR = 4
this.fingersRight[item.code - 1].isLackFingerR = true
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])
}
if (item.imgSrcL == '') {
this.fingersRight[item.code - 1].statusL = 4
this.fingersRight[item.code - 1].isLackFingerL = true
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])
}
......@@ -6166,18 +6201,22 @@ export default {
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.fingersLeft[item.code - 1 - 5].isLackFingerR = true
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 (item.imgSrcR == '') {
this.fingersLeft[item.code - 1 - 5].statusR = 4
this.fingersLeft[item.code - 1 - 5].isLackFingerR = true
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])
}
if (item.imgSrcL == '') {
this.fingersLeft[item.code - 1 - 5].statusL = 4
this.fingersLeft[item.code - 1 - 5].isLackFingerL = true
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])
}
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2021-09-17 19:04:09
* @LastEditTime: 2021-09-26 15:05:51
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
......@@ -15,6 +15,7 @@ const productionGzipExtensions = /\.(js|css|json|txt|html|ico|svg)(\?.*)?$/i;*/
// }
module.exports = {
// 若是上线环境，加./
publicPath: process.env.NODE_ENV === "development" ? "/" : "./",
assetsDir: "static",
configureWebpack: config => {
......@@ -70,48 +71,75 @@ module.exports = {
errors: false
},
proxy: {
//******公安網絡 */
"/apiDelImg": {
target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiDelImg': ''
}
},
"/apiMachine": {
target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiMachine': ''
}
},
"/apiInfo": {
target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiInfo': ''
}
},
// 公司--阿里
// "/apiDelImg": {
// target: "http://8.144.175.212:8091/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiDelImg': ''
// }
// },
// "/apiMachine": {
// target: "http://8.144.175.212/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiMachine': ''
// }
// },
// "/apiInfo": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://8.144.175.212/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiInfo': ''
// }
// },
//******公安網絡 */
// "/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://65.26.10.99:8091/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiDelImg': ''
// }
// },
// "/apiMachine": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiMachine': ''
// }
// },
// "/apiInfo": {
// target: "http://65.26.10.121/", //统一的请求头部每次修改都要重启才会生效
// ws: true,
// changeOrigin: true,
// pathRewrite: {
// '^/apiInfo': ''
// }
// },
// 阿里--周晓
"/apiInfo": {
target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiInfo': ''
}
},
"/apiDelImg": {
target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apiDelImg': ''
}
},
"/apiSaveImg": {
target: "http://localhost:8088/", //统一的请求头部每次修改都要重启才会生效
ws: true,
......
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