Skip to content

F
founder_vue
Commit c07f82de by 张超军
Options

自动特征点删除

parent 1ec438df
Showing with 78 additions and 37 deletions
src/router/index.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-05 11:09:01
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\router\index.js
*/
import Vue from "vue";
import VueRouter from "vue-router";
import store from "../store";
......@@ -57,4 +65,13 @@ const router = new VueRouter({
// next();
// });
router.beforeEach((to, from, next) => {
console.log(from);
if(from.name === 'ryzwbj') {
// 清空session
sessionStorage.clear()
}
next()
})
export default router;
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-11-04 21:35:52
* @LastEditTime: 2021-11-05 11:37:49
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -200,14 +200,14 @@
<div class="zdtq-line"></div>
<div class="btns-bottom">
<div class="dp" @click="getAutoTzd"><img src="@/assets/img/rybj/dp.png" alt=""></div>
<!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>-->
<!-- <div class="clearConfirm" v-show="isShowClearDialog">-->
<!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>-->
<!-- <div class="btn-bottom">-->
<!-- <div class="btn-confirm" @click="delPic">确认</div>-->
<!-- <div class="btn-cancel" @click="cancelPic">取消</div>-->
<!-- </div>-->
<!-- </div>-->
<!-- <div class="clear" @click="clearChange"><img src="@/assets/img/rybj/clear.png" alt=""></div>-->
<!-- <div class="clearConfirm" v-show="isShowClearDialog">-->
<!-- <div class="tips">确认要清空操作吗？该操作无法撤消！</div>-->
<!-- <div class="btn-bottom">-->
<!-- <div class="btn-confirm" @click="delPic">确认</div>-->
<!-- <div class="btn-cancel" @click="cancelPic">取消</div>-->
<!-- </div>-->
<!-- </div>-->
</div>
<div class="save">
<div class="save-type" @click="saveTypeOptionsChange">选择保存类型<img src="@/assets/img/rybj/arrow_d.png" alt=""></div>
......@@ -1175,11 +1175,11 @@ export default {
self.getAutoTzd()
// 如果之前保留了特征点，则展示出来
if(sessionStorage.getItem(self.seq) != 'undefined') {
if (sessionStorage.getItem(self.seq) != 'undefined') {
console.log(sessionStorage.getItem(self.seq));
let preTzd = JSON.parse(sessionStorage.getItem(self.seq))
if(preTzd && preTzd.length > 0) {
preTzd.forEach((item,index) => {
if (preTzd && preTzd.length > 0) {
preTzd.forEach((item, index) => {
self.tzdArr.push({
id: self.tzdId,
x: item.zwzxd_tzxzb,
......@@ -1204,7 +1204,7 @@ export default {
$('.tzdDom .direction').css('height', '2px')
$('.tzdDom .direction').css('background-color', '#ffaa00')
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb-4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${item.zwtzd_tzfx}deg)`);
......@@ -1309,7 +1309,7 @@ export default {
}
// 鼠标右击
if (e.which === 3) {
// console.log(e);
console.log(e);
if (e.target.className == "head" || e.target.className == "direction") {
// 删除该特征点
let tdzindex = self.tzdArr.findIndex((item) => {
......@@ -1326,6 +1326,22 @@ export default {
}
self.tzdnumber = self.tzdArr.length
// console.log(self.tzdArr);
// 删除自动提取的特征点
console.log(self.autoTzdArr);
let auto_tzdindex = self.autoTzdArr.findIndex((item) => {
return item.id == e.target.parentNode.id;
})
console.log(auto_tzdindex);
if(auto_tzdindex != -1) {
self.autoTzdArr.splice(auto_tzdindex, 1)
$(e.target.parentNode).css('border', '2px solid red');
setTimeout(() => {
$(e.target.parentNode).remove();
}, 1000);
}
// auto_tzdDom
}
}
}
......@@ -1474,7 +1490,7 @@ export default {
// 为了数据回显（只保留手动的，自动的换图自动点击），每次追加一个特征点都保存到全局中去
if(self.tzdArr.length>0) {
if (self.tzdArr.length > 0) {
self.tzdArr.forEach(item => {
self.pretzdall.push({
zwtzd_tzfx: item.angle,
......@@ -1488,7 +1504,7 @@ export default {
// 全部数据保存
self.$store.commit('zwbj/setTzdall', self.pretzdall)
console.log(self.preTzdArr);
self.preTzdArr = []
self.pretzdall = []
}
}
if (e.which === 3) {
......@@ -1553,11 +1569,11 @@ export default {
* @param {*}
* @return {*}
*/
async getAutoTzd() {
async getAutoTzd () {
let self = this
console.log(this.seq);
if(self.autoTzdArr.length > 0) {
if($('.auto_tzdDom').css('display') == 'flex') {
if (self.autoTzdArr.length > 0) {
if ($('.auto_tzdDom').css('display') == 'flex') {
$('.auto_tzdDom').css('display', 'none')
} else {
$('.auto_tzdDom').css('display', 'flex')
......@@ -1566,12 +1582,15 @@ export default {
}
let res = await this.$axios({
method: 'get',
url: '/api/traint/export/xml/trait/'+this.barcode+'/'+this.seq
url: '/api/traint/export/xml/trait/' + this.barcode + '/' + this.seq
// url: 'http://www.meetfood.cn:2390/traint/export/xml/trait/' + this.barcode + '/' + this.seq
})
// 自动提取特征数组
self.autoTzdArr = res.data.fpt5FingerMsg.minutia
self.autoTzdArr.forEach((item) => {
self.autoTzdArr.forEach((item, index) => {
self.$set(self.autoTzdArr[index], 'id', 'tzd'+self.tzdId)
$(
`<div id="tzd${self.tzdId}" class="auto_tzdDom"><div class="head"></div><div class="direction"></div></div>`
).appendTo(".tzdDrawing");
......@@ -1589,12 +1608,14 @@ export default {
$('.auto_tzdDom .direction').css('height', '2px')
$('.auto_tzdDom .direction').css('background-color', '#ffaa00')
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb-4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("left", (item.zwzxd_tzxzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("top", (item.zwzxd_tzyzb - 4) / self.zoomLevel + "px");
$(`#tzd${self.tzdId}`).css("box-sizing", "border-box");
$("#tzd" + self.tzdId).css("transform", `rotate(${item.zwtzd_tzfx}deg)`);
self.tzdId++
})
// 将自动提取的特征点存入session中
sessionStorage.setItem(`auto${self.seq}`, JSON.stringify(self.autoTzdArr))
},
/**
* @description: 打开旋转操作
......@@ -1658,8 +1679,8 @@ export default {
this.isBoldActiveName = false
// 辅助线的id数组
this.lines = []
// 是否点击了圆标记
this.isActive_circle = false
// 是否点击了圆标记
this.isActive_circle = false
// 是否展示园标记弹出框
this.isCircleOptions = false
// 是否隐藏标记点
......@@ -1763,7 +1784,7 @@ export default {
async directionChange () {
let res = await this.$axios({
method: 'get',
url: '/api/traint/export/xml/trait/'+this.barcode+'/'+this.seq
url: '/api/traint/export/xml/trait/' + this.barcode + '/' + this.seq
})
console.log(res);
let deg = res.data.fpt5FingerMsg.zwfx_tzfx
......@@ -1771,7 +1792,7 @@ export default {
this.isdirection = !this.isdirection
if (this.isdirection) {
// 通过接口获取角度
document.getElementsByTagName('body')[0].style.setProperty('--directionRotate', deg+'deg');
document.getElementsByTagName('body')[0].style.setProperty('--directionRotate', deg + 'deg');
}
},
/**
......@@ -2324,7 +2345,7 @@ export default {
console.log('保存');
self.tzdall = []
// let tzdall = self.tzdArr.concat(self.autoTzdArr)
if(self.tzdArr.length>0) {
if (self.tzdArr.length > 0) {
self.tzdArr.forEach(item => {
self.tzdall.push({
zwtzd_tzfx: item.angle,
......@@ -2333,7 +2354,7 @@ export default {
})
})
}
if(self.autoTzdArr.length>0) {
if (self.autoTzdArr.length > 0) {
self.tzdall.concat(self.autoTzdArr)
}
console.log(self.tzdall);
......@@ -2351,11 +2372,12 @@ export default {
headers: {
'Content-Type': 'application/json;charset=UTF-8'
},
url: '/api/traint/upload/persontrait?barcode='+self.barcode+'&seq='+self.seq,
// url: 'http://www.meetfood.cn:2390/traint/upload/persontrait?barcode=' + self.barcode + '&seq=' + self.seq,
url: '/api/traint/upload/persontrait?barcode=' + self.barcode + '&seq=' + self.seq,
data: JSON.stringify(fpt5TraitMinutiaList)
}).then(res => {
console.log(res);
if(res.data.message == 'success') {
if (res.data.message == 'success') {
self.$message.success('保存成功！')
}
})
......@@ -3122,7 +3144,7 @@ export default {
inputRotationRange (newValue, oldValue) {
console.log(newValue)
let deg = newValue - this.startPlace;
if(!deg) deg = 0;
if (!deg) deg = 0;
// this.imageEditor.setAngle(0)['catch'](function () { });
this.imageEditor.rotate(deg)
let canvasImage = this.imageEditor._graphics.getCanvasImage()
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-11-04 21:35:22
* @LastEditTime: 2021-11-05 10:52:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -390,8 +390,10 @@ export default {
// 保存当前的指位特征点信息
// 直接覆盖之前的数据
console.log(self.preTzdArr);
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
if(self.preTzdArr && self.preTzdArr.length>=0) {
sessionStorage.setItem(this.preSeq, JSON.stringify(self.preTzdArr))
}
self.$store.commit('zwbj/setTzdall', null)
}
this.preSeq = finger.code
console.log(finger);
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-11-04 10:41:01
* @LastEditTime: 2021-11-05 10:29:38
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -92,8 +92,8 @@ module.exports = {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/
// target: "http://172.18.108.2:8099/", // 张 认定
// target: "http://192.168.128.112:8099", // 湖南-张
// target: "http://192.168.128.114:8099", // 湖南-马
target: "http://192.168.128.116:8099", // 湖南-王
target: "http://192.168.128.114:8099", // 湖南-马
// target: "http://192.168.128.116:8099", // 湖南-王
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
......
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