Skip to content

F
founder_vue
Commit ca9aaeaf by 张超军
Options

正/倒查掌纹对接

parent 537f7dd3
Showing with 333 additions and 69 deletions
src/components/ImageEd.vue
<!--
* @Author: your name
* @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-16 13:31:05
* @LastEditTime: 2021-12-16 21:33:05
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
......@@ -1917,9 +1917,11 @@ export default {
*/
this.$bus.on("changImageEdit", (sourceImage) => {
if(sourceImage == 'xxx') {
self.targetIsDelete = false
self.targetDelTime = ''
if (sourceImage == 'xxx') {
// 暂无图片
imageEditor.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then().catch(err => {})
imageEditor.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then().catch(err => { })
self.zwtp_source = true
return;
} else {
......@@ -1936,8 +1938,10 @@ export default {
});
});
this.$bus.on("changImageEditTarget", (targetImage) => {
if(targetImage == 'xxx') {
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then().catch(err => {})
self.targetIsDelete = false
self.targetDelTime = ''
if (targetImage == 'xxx') {
imageEditor2.loadImageFromURL("data:image/jpeg;base64," + targetImage, "SampleImage").then().catch(err => { })
self.zwtp_target = true
return;
} else {
......@@ -1986,6 +1990,8 @@ export default {
self.isDelete = true
self.delTime = obj.delTime
self.sourceImage = null;
self.zwtp_source = false
self.zwtp_target = false
imageEditor.loadImageFromURL("xxx.jpg", "SampleImage").then(function (sizeValue) {
// //console.log(sizeValue);
imageEditor.clearUndoStack();
......@@ -1997,7 +2003,7 @@ export default {
imageEditor2.clearUndoStack();
}).catch(err => {
console.log(err);
});;
});
} else {
self.isDelete = false
self.delMsg = ''
......@@ -2010,12 +2016,14 @@ export default {
self.targetIsDelete = true
self.targetDelTime = obj.delTime
self.targetImage = null;
self.zwtp_source = false
self.zwtp_target = false
imageEditor2.loadImageFromURL("xxx.jpg", "SampleImage").then(function (sizeValue) {
// //console.log(sizeValue);
imageEditor2.clearUndoStack();
}).catch(err => {
console.log(err);
});;
});
} else {
self.targetIsDelete = false
self.targetDelTime = ''
......@@ -5812,7 +5820,7 @@ export default {
// }
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
},
},
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-16 14:42:05
* @LastEditTime: 2021-12-16 21:04:31
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -3624,7 +3624,7 @@ export default {
// 自动提取特征数组
if (res.data.code === 0) {
// self.autoTzdArr = res.data.ret.minutiaSet.minutia;
if (res.data.ret.minutiaSet.minutia && res.data.ret.minutiaSet.minutia.length > 0) {
if (res.data.ret.minutiaSet && res.data.ret.minutiaSet.minutia && res.data.ret.minutiaSet.minutia.length > 0) {
res.data.ret.minutiaSet.minutia.forEach(item => {
self.autoTzdArr.push({
xczw_zwtzd_tzxzb: item.xczw_zwtzd_tzxzb * self.width_ratio,
......@@ -6484,8 +6484,8 @@ export default {
self.Fcanvasarr.forEach((itemarr) => {
itemarr.forEach((item) => {
Fcanvasarr_s.push({
zdytq_tzdxzb: item.x,
zdytq_tzdyzb: item.y
zdytq_tzdxzb: item.x / self.width_ratio,
zdytq_tzdyzb: item.y / self.height_ratio
});
});
Fcanvasarr_t.push({
......@@ -6498,8 +6498,8 @@ export default {
self.autoFcanvas.forEach((itemarr) => {
itemarr.forEach((item) => {
Fcanvasarr_s.push({
zdytq_tzdxzb: item.x,
zdytq_tzdyzb: item.y
zdytq_tzdxzb: item.x / self.width_ratio,
zdytq_tzdyzb: item.y / self.height_ratio
});
});
Fcanvasarr_t.push({
......@@ -6531,8 +6531,8 @@ export default {
-angle
);
Fcanvasarr_s.push({
zdytq_tzdxzb: x / self.width_ratio,
zdytq_tzdyzb: y / self.height_ratio
zdytq_tzdxzb: x,
zdytq_tzdyzb: y
});
})
Fcanvasarr_t2.push({
......@@ -6614,7 +6614,7 @@ export default {
"Content-Type": "application/json;charset=UTF-8"
},
url:
"/api/upload/trait/case?barcode=" +
"/api/upload/trait/case/palm?barcode=" +
self.barcode +
"&fingerPosition=" + tj_lr_finger +
"&seq=" +
......
src/views/cxyrd/LT.vue
......@@ -179,7 +179,7 @@ export default {
let self = this
this.qid = this.$route.query.rowData;
//console.log("源qid====>", this.qid);
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......
src/views/cxyrd/TL.vue
......@@ -171,7 +171,10 @@ export default {
};
},
created () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo')).user
},
mounted () {
this.userInfo = JSON.parse(localStorage.getItem('userInfo'))
console.log(this.userInfo);
if(this.userInfo) {
this.bzr = this.userInfo.name
......@@ -180,8 +183,6 @@ export default {
this.bzrsfzh = this.userInfo.idCard
this.phone = this.userInfo.phoneNumber
}
},
mounted () {
let self = this
this.$bus.on('bzJudgeTL', (val) => {
self.bzData = val
......
src/views/cxyrd/modules/LTCandidate.vue
......@@ -131,7 +131,7 @@
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<!-- 被删除 -->
<span v-if="scope.row.removeFlag===1">
<del>{{ scope.row.destbarcode }}</del>
</span>
......@@ -329,6 +329,7 @@ export default {
})
} else {
self.$bus.emit('bzJudge', null)
this.$bus.emit("changImageEditTarget", 'xxx');
}
});
},
......@@ -1185,12 +1186,23 @@ export default {
let self = this;
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudge', val)
if(val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
if (self.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
// this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return;
} else {
//console.log(val);
......@@ -1203,10 +1215,10 @@ export default {
sessionStorage.setItem("destseqno", val.destseqno);
// self.$store.commit('loading/setLoading', true)
// 平面 --- 换压缩图
if (val.destseqno > 10) {
if (val.destseqno > 10 && val.destseqno <= 20) {
this.$axios({
method: 'post',
url: '/api/png/plainByBarcode/barcode/seq',
url: '/api/png/plain/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1216,11 +1228,11 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
} else if(val.destseqno >= 1 && val.destseqno <= 10) {
// 滚动 --- 换压缩图
this.$axios({
method: 'post',
url: '/api/png/rollByBarcode/barcode/seq',
url: '/api/png/roll/barcode/seq',
data: {
barcode: val.destbarcode,
seqno: val.destseqno,
......@@ -1230,6 +1242,19 @@ export default {
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
} else {
// 掌纹
this.$axios({
method: 'post',
url: '/api/png/palm/barcode/seq',
data: {
barcode: val.destbarcode,
hpseqno: val.destseqno,
},
loading: true
}).then(response => {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
})
}
} else {
this.$bus.emit("changImageEditTarget", 'xxx');
......
src/views/cxyrd/modules/TLCandidate.vue
......@@ -9,10 +9,41 @@
<el-checkbox v-model="checked">显示已比中候选</el-checkbox>
</div>
<el-table ref="singleTable" highlight-current-row @current-change="handleCurrentChange" class="lt_candidate_table" :data="tableData" :row-class-name="tableRowClassName">
<el-table-column label="排名" type="index" :width="width1"></el-table-column>
<el-table-column prop="score" label="得分" :width="width1"></el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1"></el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')"></el-table-column>
<el-table-column label="排名" type="index" :width="width1">
</el-table-column>
<el-table-column prop="score" label="得分" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.score}}</del>
</span>
<span v-else>
{{scope.row.score}}
</span>
</template>
</el-table-column>
<el-table-column label="序号" prop="destseqno" :width="width1">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destseqno}}</del>
</span>
<span v-else>
{{scope.row.destseqno}}
</span>
</template>
</el-table-column>
<el-table-column prop="destbarcode" label="目标条码号" width="auto" v-if="roleArr.includes('C-1-7')">
<template slot-scope="scope">
<!-- 被删除-->
<span v-if="scope.row.removeFlag==1">
<del>{{scope.row.destbarcode}}</del>
</span>
<span v-else>
{{scope.row.destbarcode}}
</span>
</template>
</el-table-column>
</el-table>
<div class="lt_candidate_bottom">
<span>共计<span>{{ total }}条</span>数据</span>
......@@ -79,6 +110,11 @@ export default {
});
} else {
self.$bus.emit('bzJudgeTL', null)
if (self.isDelete) {
// self.$bus.emit('changImageEditTarget', 'xxx')
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}
});
// 比中，认定完成之后更新列表数据
......@@ -122,12 +158,23 @@ export default {
console.log(val);
// 传递当前行的数据，判断是否被比中，如比中就不会弹窗比中
this.$bus.emit('bzJudgeTL', val)
if (val.removeFlag == 1) {
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
if (this.isDelete) {
// 存储目标条码号
sessionStorage.setItem("destbarcode", val.destbarcode);
// 存储目的数据序号
sessionStorage.setItem("destseqno", val.destseqno);
this.$bus.emit("changImageEditTarget", 'xxx');
self.$bus.emit('targetDeleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
return
}
const CancelToken = axios.CancelToken;
const source = CancelToken.source();
......@@ -142,22 +189,44 @@ export default {
sessionStorage.setItem("backcheckXh", val.destseqno);
// this.$axios.get(`/api/api/org/plainByBarcode/R1100002487002018050034/1/`)
if (!self.isFirstMounted) {
self.$store.commit('loading/setLoadingSd', true)
// self.$store.commit('loading/setLoadingSd', true)
}
if (val.destseqno < 100) {
// 获取案件指纹
this.$axios
.post("/api/org/case/barcode/seqNo", {
barcode: val.destbarcode,
seqno: val.destseqno,
qqid: val.qqid
}, { loading: false, cancelToken: source.token }).then(response => {
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
self.$bus.emit("changImageEditTarget", 'xxx');
}
});
} else {
// 获取案件掌纹
// TODO
this.$axios
.post("/api/org/case/palm/barcode/seq", {
barcode: val.destbarcode,
hpseqno: val.destseqno,
}, { loading: true, cancelToken: source.token }).then(response => {
//console.log(response);
if (response.data.code === 0) {
self.$bus.emit("changImageEditTarget", response.data.ret.image);
if (!self.isFirstMounted) {
clearTimeout(self.timer)
self.timer = setTimeout(() => {
self.$store.commit('loading/setLoadingSd', false)
// self.$store.commit('loading/setLoadingSd', false)
}, 500);
}
} else {
......@@ -165,6 +234,7 @@ export default {
}
});
}
}
else {
self.$bus.emit("changImageEditTarget", 'xxx');
// 存储目标条码号 --- 置空
......@@ -202,7 +272,7 @@ export default {
}
},
computed: {
roleArr() {
roleArr () {
return this.$store.state.layout.Menu;
}
},
......
src/views/cxyrd/modules/TLSrc.vue
......@@ -45,11 +45,11 @@
<div class="btns">
<div class="btn" @click="switchRoll" :class="{active: fingerShowType == 'roll'}">滚动</div>
<div class="line"></div>
<div class="btn" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面
</div>
<div class="btn" v-show="!isDelete" @click="switchPain" :class="{active: fingerShowType == 'pain', isHasData: !painFlag}">平面</div>
<div class="btn isDelete" v-show="isDelete">平面</div>
<div class="line"></div>
<div class="btn" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹
</div>
<div class="btn" v-show="!isDelete" @click="switchZw" :class="{active: fingerShowType == 'zhangwen'}">掌纹</div>
<div v-show="isDelete" class="btn isDelete">掌纹</div>
</div>
<!-- 滚动 -->
<div class="fingers" v-if="fingerShowType=='roll'">
......@@ -284,7 +284,6 @@
</div>
</div>
</div>
</div>
<!-- 掌纹 -->
<div class="fingers" v-else>
......@@ -336,7 +335,8 @@
</div>
</div>
<div class="bottom">
<span>该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span>
<span v-show="fingerShowType=='roll' || fingerShowType=='pain'">该查询ID共计<b>{{ fingerTotal }}</b>枚指纹</span>
<span v-show="fingerShowType=='zhangwen'">该查询ID共计<b>{{ handTotal }}</b>枚掌纹</span>
</div>
</div>
</div>
......@@ -382,6 +382,14 @@ export default {
qid: "",
// 默认第一张掌纹图
hand: {},
handTotal: 0,
// 掌纹被删除的情况下
handList2: [
{ name: '右侧掌', code: 33, image: '' },
{ name: '右半掌', code: 31, image: '' },
{ name: '左侧掌', code: 34, image: '' },
{ name: '左半掌', code: 32, image: '' },
],
handList: [
{ name: '右侧掌', code: 33, image: '' },
{ name: '右半掌', code: 31, image: '' },
......@@ -452,7 +460,8 @@ export default {
loading: null,
timer: null,
// 判断是否被删除
isDelete: false
isDelete: false,
deletaObj: {}
};
},
mounted () {
......@@ -502,11 +511,19 @@ export default {
* 切换到掌纹
*/
async switchZw () {
let self = this
this.fingerShowType = "zhangwen";
if (this.isDelete) {
// 被删除
await this.findHand()
this.changeStyleHand(0, this.hand)
this.$bus.emit('deleteMessage', self.deletaObj)
return;
}
await this.findHand()
if(this.hand) {
if (this.hand) {
this.changeStyleHand(0, this.hand)
}else {
} else {
this.$bus.emit('changImageEdit', 'xxx')
}
},
......@@ -517,14 +534,19 @@ export default {
let self = this
console.log(self.barcode);
// 掌纹数据初始化
self.handTotal = 0
this.handList.forEach(item => {
item.image = ''
item.clickLog = ''
item.affirmstatus = ''
})
this.$axios({
method: 'post',
url: '/api/png/palm/barcode',
url: '/api/check/png/palm/barcode',
data: {
barcode: self.barcode
barcode: self.barcode,
querytype: 1,
qqid: self.qqid
}
}).then(res => {
console.log(res);
......@@ -533,6 +555,9 @@ export default {
res.data.ret.forEach(item2 => {
if (item2.seq == item.code) {
item.image = item2.image
self.$set(item, "clickLog", item2.clickLog);
self.$set(item, "affirmstatus", item2.affirmstatus);
self.handTotal++
}
})
})
......@@ -586,9 +611,13 @@ export default {
self.isDelete = true
self.$bus.emit('deleteMessage', {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('lll')
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
})
self.$bus.emit("changImageEdit", 'xxx');
self.deletaObj = {
msg: '该条数据已删除！',
delTime: self.$moment(val.removeTime).format('YYYY.MM.DD HH:mm')
}
// self.$bus.emit("changImageEdit", 'xxx');
// 清空目标table表
self.$bus.emit("initTLCandidate", []);
// 保存qqid和qid
......@@ -648,6 +677,32 @@ export default {
self.$set(itemH, "clickLog", "");
self.$set(itemH, "affirmstatus", "");
})
self.handList2.forEach(itemH => {
self.$set(itemH, "image", "");
self.$set(itemH, "clickLog", "");
self.$set(itemH, "affirmstatus", "");
})
// self.getHandsData()
this.$axios({
method: 'post',
url: '/api/png/palm/barcode',
data: {
barcode: self.barcode
}
}).then(res => {
if (res.data.code === 0) {
self.handList2.forEach(item => {
res.data.ret.forEach(item2 => {
if (item2.seq == item.code) {
item.image = item2.image
self.$set(item, "clickLog", item2.clickLog);
self.$set(item, "affirmstatus", item2.affirmstatus);
}
})
})
}
})
NProgress.start();
// 平面
......@@ -789,6 +844,11 @@ export default {
} else {
// 未删除
self.isDelete = false
// 没有被删除
self.$bus.emit('deleteMessage', {
msg: null,
delTime: null
})
// 改变数据为点击状态
this.$set(val, "clickLog", "1");
this.currentRow = val;
......@@ -1347,6 +1407,7 @@ export default {
const source = CancelToken.source();
//console.log(imageInfo);
let self = this;
if (imageInfo.image) {
// 改变数据为点击状态
self.$set(imageInfo, "clickLog", "1");
......@@ -2248,4 +2309,10 @@ del {
text-decoration: underline wavy red; /*红色波浪形下划线*/
text-decoration: line-through red; /*红色删除线*/
}
.isDelete {
background: #ECEDF1 !important;
font-size: 14px;
font-family: MicrosoftYaHei;
color: #AEAFB4 !important;
}
</style>
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-16 10:56:08
* @LastEditTime: 2021-12-16 21:07:42
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -90,8 +90,8 @@ module.exports = {
proxy: {
"/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://192.168.128.166:8099/", // 张 认定
target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.166:8099/", // 张 认定
// target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://192.168.128.118:8764", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
......
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