Skip to content

F
founder_vue
Commit e968568d by 张超军
Options

1.墨奇手动采集修改。2.模板打印对接

parent 913d457f
Showing with 255 additions and 131 deletions
src/utils/sample-code2.js
......@@ -377,6 +377,7 @@ export class GrpcCameraService {
let result = new Promise((resolve, reject) => {
this.captureImageStream.on('data', (response) => {
if (response) {
cb(this)
const responseObject = response.toObject();
const status = responseObject.state;
if (status !== CaptureState.CAPTURE_OK) {
......
src/views/zwxt/fingerprint.scss
......@@ -893,6 +893,12 @@ $versionColor: var(--versionColor, #fff); // #000
left: -45px;
}
}
.Mask {
width: 96px;
height: 36px;
background-color: transparent;
z-index: 100;
}
}
.hands {
margin-left: 40px;
......@@ -902,9 +908,9 @@ $versionColor: var(--versionColor, #fff); // #000
background: $handsBg;
opacity: 1;
border-radius: 4px;
display: flex;
justify-content: space-between;
align-items: center;
// display: flex;
// justify-content: space-between;
// align-items: center;
padding: 16px 20px;
position: relative;
@keyframes pointerAnimate {
......@@ -990,11 +996,14 @@ $versionColor: var(--versionColor, #fff); // #000
height: 168px;
display: flex;
img {
width: 120px;
height: 168px;
object-fit: contain;
}
}
}
.right-hand {
float: right;
.txt {
margin-right: 0;
margin-left: 77px;
......@@ -1041,6 +1050,7 @@ $versionColor: var(--versionColor, #fff); // #000
}
}
.left-hand {
float: left;
.hand {
position: relative;
}
......@@ -2467,6 +2477,8 @@ $versionColor: var(--versionColor, #fff); // #000
height: 16px;
display: flex;
img {
width: 16px;
height: 16px;
object-fit: contain;
}
}
......@@ -2778,3 +2790,7 @@ $versionColor: var(--versionColor, #fff); // #000
}
}
}
img, button {
user-select: none;
}
src/views/zwxt/rymb.vue
......@@ -145,11 +145,11 @@
</div>
<div class="itemOnly">
<span class="label">复核人</span>
<span class="value"></span>
<span class="value">{{ ryInfo.fhryXm }}</span>
</div>
<div class="itemOnly">
<span class="label">公安局</span>
<span class="value"></span>
<span class="value">{{ ryInfo.gaCodeName }}</span>
</div>
</div>
</div>
......@@ -190,6 +190,7 @@
<script>
import html2Canvas from 'html2canvas'
import printJS from 'print-js'
import axios from 'axios';
export default {
name: 'rymb',
data () {
......@@ -237,7 +238,6 @@ export default {
{ name: '右侧像', code: 4, img: null },
{ name: '身份证', code: 11, img: null }
],
daCount: 0,
reqParam: {
// 请求参数
page: {
......@@ -256,7 +256,7 @@ export default {
},
watch: {},
created () {
console.log(this.$route.params)
// console.log(this.$route.params)
},
filters: {
dataFilter (val) {
......@@ -265,14 +265,64 @@ export default {
return val.split('T')[0]
}
},
mounted () {
// this.getRyinfo()
// this.getFaceByBarcode()
// this.getRollByBarcode()
// this.getPlainByBarcode()
// this.getPalmByBarcode()
async mounted () {
const loading = this.$loading({
lock: true,
text: '正在加载中···',
background: 'rgba(255, 255, 255, 0.7)'
});
this.getRyinfo()
this.getFaceByBarcode()
this.getPalmByBarcode()
await this.getRollByBarcode()
await this.getPlainByBarcode()
await this.getNewCollect()
loading.close();
},
methods: {
/**
* @description: 获取最新的采集的图片
* @return {*}
*/
async getNewCollect () {
let self = this
await axios({
method: 'get',
url: '/apiDelImg/getAllFingers/'+this.htmlTitle,
}).then((response) => {
if (response.data.length > 0) {
response.data.forEach((item) => {
self.resetImages(item)
})
}
})
},
/**
* @description: 重置最新的图片
* @param {*} image
* @return {*}
*/
resetImages(image){
// 滚动
if (image.seq >=1 && image.seq <= 10) {
this.RollImg.forEach((item) => {
if (item.code == image.seq) {
item.img = image.image
}
})
}
// 平面
if (image.seq >=11 && image.seq <= 20) {
this.PlainImg.forEach((item) => {
if (item.code == image.seq) {
item.img = image.image
}
})
}
// 去掉加载状态
this.PlainImgfingerLoading = false
this.RollImgfingerLoading = false
},
// 打印
goPrint () {
this.isPrint = true
......@@ -295,114 +345,129 @@ export default {
// 获取档案信息
getRyinfo () {
let self = this
if (self.daCount > 0) return
self.daCount++
this.$axios
.post('/api/personstore/person/list', this.reqParam)
.then(response => {
if (response.data.code === 0) {
self.ryInfo = response.data.ret.list[0]
} else {
self.$message.error(response.data.message)
}
})
axios({
method: 'post',
url: '/apizzwxxk/personstore/person/list',
params: {
zwbh: self.htmlTitle
}
}).then(response => {
self.ryInfo = response.data
}).catch(err => {
console.log(err);
})
},
// 获取人像
getFaceByBarcode () {
let self = this
window.NetUtil.ryxxk.getFaceByBarcode({ barcode: this.htmlTitle })
.then((response) => {
if (response.code == 0) {
response.ret.forEach((element) => {
self.FaceImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image
}
})
axios({
method: 'post',
url: '/apizzwxxk/org/face/barcode',
params: {
zwbh: this.htmlTitle
}
}).then((response) => {
if (response.data.code == 0) {
response.data.ret.forEach((element) => {
self.FaceImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image
}
})
// 去掉加载状态
self.FaceLoading = false
} else if (response.code == 4) {
// 去掉加载状态
self.FaceLoading = false
}
})
})
// 去掉加载状态
self.FaceLoading = false
} else if (response.data.code == 4) {
// 去掉加载状态
self.FaceLoading = false
}
})
},
// 获取掌纹
getPalmByBarcode () {
let self = this
if (self.PalmCount > 0) return
self.PalmCount++
this.PalmImgNum = 0
window.NetUtil.ryxxk.getPalmByBarcode({ barcode: this.htmlTitle })
.then((response) => {
if (response.code == 0) {
response.ret.forEach((element) => {
self.PlamImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image
this.PalmImgNum++
}
})
})
// 去掉加载状态
self.PlamLoading = false
} else if (response.code == 4) {
// 去掉加载状态
self.PlamLoading = false
axios({
method: 'post',
url: '/apizzwxxk/png/palm/barcode',
params: {
zwbh: this.htmlTitle
}
}).then((response) => {
if (response.data.code == 0) {
response.data.ret.forEach((element) => {
self.PlamImg.forEach((item) => {
item.img = ''
this.PalmImgNum++
if (item.code == element.seq) {
item.img = element.image
}
})
}
})
})
// 去掉加载状态
self.PlamLoading = false
} else if (response.data.code == 4) {
// 去掉加载状态
self.PlamLoading = false
self.PlamImg.forEach((item) => {
item.img = ''
})
}
})
},
// 人员平面压缩图
getPlainByBarcode () {
async getPlainByBarcode () {
let self = this
window.NetUtil.ryxxk.getPlainByBarcode({ barcode: this.htmlTitle })
.then((response) => {
if (response.code == 0) {
response.ret.forEach((element) => {
self.PlainImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image
}
})
})
// 去掉加载状态
self.PlainImgfingerLoading = false
} else if (response.code == 4) {
// 去掉加载状态
self.PlainImgfingerLoading = false
await axios({
method: 'post',
url: '/apizzwxxk/png/plain/barcode',
params: {
zwbh: this.htmlTitle
}
}).then((response) => {
if (response.data.code == 0) {
response.data.ret.forEach((element) => {
self.PlainImg.forEach((item) => {
item.img = ''
if (item.code == element.seq) {
item.img = element.image
}
})
}
})
})
// 去掉加载状态
self.PlainImgfingerLoading = false
} else if (response.data.code == 4) {
// 去掉加载状态
self.PlainImgfingerLoading = false
self.PlainImg.forEach((item) => {
item.img = ''
})
}
})
},
// 人员滚动压缩图
getRollByBarcode () {
window.NetUtil.ryxxk.getRollByBarcode({ barcode: this.htmlTitle })
.then((response) => {
if (response.code == 0) {
// 去掉加载状态
this.RollImgfingerLoading = false
response.ret.forEach((element) => {
this.RollImg.forEach((item) => {
if (item.code == element.seq) {
item.img = element.image
}
})
})
} else if (response.code == 4) {
// 去掉加载状态
this.RollImgfingerLoading = false
async getRollByBarcode () {
await axios({
method: 'post',
url: '/apizzwxxk/png/roll/barcode',
params: {
zwbh: this.htmlTitle
}
}).then((response) => {
if (response.data.code == 0) {
// 去掉加载状态
this.RollImgfingerLoading = false
response.data.ret.forEach((element) => {
this.RollImg.forEach((item) => {
item.img = ''
if (item.code == element.seq) {
item.img = element.image
}
})
}
})
})
} else if (response.data.code == 4) {
// 去掉加载状态
this.RollImgfingerLoading = false
this.RollImg.forEach((item) => {
item.img = ''
})
}
})
}
}
}
......@@ -449,6 +514,7 @@ export default {
padding: 20px;
overflow: auto;
background-color: #eee;
box-sizing: border-box;
.pdfContent {
width: 1240px;
......@@ -761,4 +827,12 @@ export default {
}
}
</style>
<style>
.el-loading-spinner .path{
stroke: #044cb9;
}
.el-loading-spinner .el-loading-text{
color: #044cb9;
font-size: 26px;
}
</style>
vue.config.js
/*
* @Author: your name
* @Date: 2021-06-15 15:12:19
* @LastEditTime: 2022-07-20 10:40:27
* @LastEditTime: 2022-08-22 16:12:49
* @LastEditors: zhangchaojun 893499851@qq.com
* @Description: In User Settings Edit
* @FilePath: \founder_vue\vue.config.js
......@@ -113,6 +113,17 @@ module.exports = {
// },
// 新系统
"/apizzwxxk": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
// target: "http://39.103.132.86:9200", // 新系统
target: "http://65.26.10.121:9102", //新系统
ws: true,
changeOrigin: true,
pathRewrite: {
'^/apizzwxxk': ''
}
},
"/apiInfo": {
// target: "http://47.92.226.24:9080/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", // 新系统
......@@ -127,8 +138,8 @@ module.exports = {
"/apiDelImg": {
// target: "http://47.92.226.24:8091/", //统一的请求头部每次修改都要重启才会生效
// target: "http://192.168.128.105:8091", //新系统
// target: "http://172.18.109.63:8091", //新系统
target: "http://127.0.0.1:8091", //新系统
target: "http://172.18.116.16:8091", //新系统
// target: "http://127.0.0.1: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