Skip to content

F
founder_vue
Commit 0d7c8bc6 by 张超军
Options

特征点将-4存储回显时出现误差，所有将-4剔除，在回显时自己手动加（目的是将圆球的中心和鼠标点击的位置相同）

parent aba23224
Showing with 51 additions and 35 deletions
src/views/Editor/modules/ajzwbjLeft.scss
......@@ -18,6 +18,10 @@
align-items: center;
span {
margin-right: 10px;
width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
img {
cursor: pointer;
......
src/views/Editor/modules/ajzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-16 11:20:20
* @LastEditTime: 2021-12-20 10:54:43
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -10,7 +10,7 @@
<div class="ryzwbjLeft">
<div class="title">案事件编号：</div>
<div class="asjbh">
<span>{{barcode}}</span>
<span :title="barcode">{{barcode}}</span>
<img src="@/assets/img/message.png" alt="" @click="daxxChange">
<div class="desc" @click="daxxChange">档案信息</div>
</div>
......@@ -138,6 +138,7 @@ export default {
// 更新图片列表
self.$bus.on('updateList', () => {
// self.$store.commit('loading/setLoadingSd', true)
debugger
self.getCaseFinger()
// setTimeout(() => {
// self.$store.commit('loading/setLoadingSd', false)
......@@ -186,7 +187,7 @@ export default {
barcode: self.barcode,
dealFlag: 1,
fingerPosition: 1
}
},
})
console.log(res);
// 初始化图片
......@@ -278,6 +279,7 @@ export default {
dealFlag: 1,
fingerPosition: 1
},
loading: true
}).then(res => {
console.log(res);
if (res.data.code === 0) {
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-20 00:42:28
* @LastEditTime: 2021-12-20 13:42:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -290,7 +290,7 @@
<el-radio-group v-model="rtxys">
<el-radio label="1">白色</el-radio>
<el-radio label="2">黑色</el-radio>
<el-radio label="3">其他</el-radio>
<el-radio label="9">其他</el-radio>
</el-radio-group>
</div>
<div class="line4"></div>
......@@ -2431,8 +2431,8 @@ export default {
$(`#tzd${self.tzdId}`).css("top", (y - 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = y - 4
item.x = self.canvasBox_width - (x)
item.y = y
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && !self.imageEditor._graphics.getCanvasImage().flipX) {
......@@ -2440,8 +2440,8 @@ export default {
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = x - 4
item.y = self.canvasBox_height - (y + 4)
item.x = x
item.y = self.canvasBox_height - (y)
}
})
} else if (self.imageEditor._graphics.getCanvasImage().flipY && self.imageEditor._graphics.getCanvasImage().flipX) {
......@@ -2449,8 +2449,8 @@ export default {
$(`#tzd${self.tzdId}`).css("top", self.canvasBox_height - (y + 4) + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = self.canvasBox_width - (x + 4)
item.y = self.canvasBox_height - (y + 4)
item.x = self.canvasBox_width - (x)
item.y = self.canvasBox_height - (y)
}
})
} else {
......@@ -2458,8 +2458,8 @@ export default {
$(`#tzd${self.tzdId}`).css("top", y - 4 + "px");
self.tzdArr.forEach(item => {
if (item.id == self.tzdId) {
item.x = x-4
item.y = y-4
item.x = x
item.y = y
}
})
}
......@@ -2921,7 +2921,7 @@ export default {
//cos
let cos = heng / distance;
//角度
self.deg = (Math.acos(cos) * 180) / Math.PI;
self.deg = parseInt((Math.acos(cos) * 180) / Math.PI);
//根据象限判断
if (e.clientX >= this.originX && e.clientY <= this.originY) {
......@@ -3682,8 +3682,8 @@ export default {
// console.log(item.xczw_zwtzd_tzxzb);
// console.log(item.xczw_zwtzd_tzyzb);
// console.log(item.xczw_zwtzd_tzfx);
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb-4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb-4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$(`#auto_tzdDom${self.tzdId}`).css("transform", `rotate(${-item.xczw_zwtzd_tzfx}deg)`);
self.tzdId++;
......@@ -3818,8 +3818,8 @@ export default {
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,
xczw_zwtzd_tzyzb: item.xczw_zwtzd_tzyzb * self.height_ratio,
xczw_zwtzd_tzxzb: (item.xczw_zwtzd_tzxzb) * self.width_ratio,
xczw_zwtzd_tzyzb: (item.xczw_zwtzd_tzyzb) * self.height_ratio,
xczw_zwtzd_tzfx: item.xczw_zwtzd_tzfx
})
})
......@@ -3844,8 +3844,8 @@ export default {
$(".auto_tzdDom .direction").css("height", "2px");
$(".auto_tzdDom .direction").css("background-color", "#FFFD0F");
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("left", (item.xczw_zwtzd_tzxzb-4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("top", (item.xczw_zwtzd_tzyzb-4) / self.zoomLevel + "px");
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$(`#auto_tzdDom${self.tzdId}`).css("transform", `rotate(${-item.xczw_zwtzd_tzfx}deg)`);
self.tzdId++;
......@@ -3988,11 +3988,11 @@ export default {
$(`#auto_tzdDom${self.tzdId}`).css(
"left",
(item.xczw_zwtzd_tzxzb) / self.zoomLevel + "px"
(item.xczw_zwtzd_tzxzb-4) / self.zoomLevel + "px"
);
$(`#auto_tzdDom${self.tzdId}`).css(
"top",
(item.xczw_zwtzd_tzyzb) / self.zoomLevel + "px"
(item.xczw_zwtzd_tzyzb-4) / self.zoomLevel + "px"
);
$(`#auto_tzdDom${self.tzdId}`).css("box-sizing", "border-box");
$(`#auto_tzdDom${self.tzdId}`).css(
......@@ -6665,7 +6665,7 @@ export default {
let deg = Number(item.xczw_zwtzd_tzfx) - tzdDrawing_angle + 180
if (deg > 360) {
deg = deg - 360
}else if (deg < 0) {
} else if (deg < 0) {
deg = deg + 360
}
self.tzdall2.push({
......@@ -6919,7 +6919,8 @@ export default {
"&fingerPosition=" + tj_lr_finger +
"&seq=" +
self.seq,
data: JSON.stringify(handFpt5)
data: JSON.stringify(handFpt5),
loading: true
}).then(res => {
if (res.data.code == 0) {
self.$message.success("保存成功！");
......@@ -6935,14 +6936,17 @@ export default {
this.$axios({
method: 'post',
// /api/upload/trait/case/image?angle=0&barcode=A4301125000002021090002&hpseqno=1&turnX=1&turnY=1
url: `/api/upload/trait/case/palm/image?angle=${angle}&barcode=${self.barcode}&hpseqno=${self.seq}&turnX=${flipX}&turnY=${flipY}&bmpHeight=${self.newHeight}&bmpWidth=${self.newWidth}`
url: `/api/upload/trait/case/palm/image?angle=${angle}&barcode=${self.barcode}&hpseqno=${self.seq}&turnX=${flipX}&turnY=${flipY}&bmpHeight=${self.newHeight}&bmpWidth=${self.newWidth}`,
// url: `/api/upload/trait/case/palm/image?angle=${angle}&barcode=${self.barcode}&hpseqno=${self.seq}&bmpHeight=${self.newHeight}&bmpWidth=${self.newWidth}`
loading: true
}).then(res => {
if (res.data.code === 0) {
self.$message.success("图片保存成功！");
} else {
self.$message.error("图片保存失败！");
}
sessionStorage.clear()
self.$bus.emit('updateList_hand')
}).catch(err => { })
} else {
// 指纹
......@@ -6996,7 +7000,7 @@ export default {
method: "post",
// url: `/api/upload/trait/case/image?angle=${canvasImage_angle}&barcode=${self.barcode}&hpseqno=${self.seq}`,
url: `/api/upload/trait/case/image?angle=${canvasImage_angle}&barcode=${self.barcode}&hpseqno=${self.seq}&turnX=${flipX}&turnY=${flipY}&bmpHeight=${512}&bmpWidth=${512}`,
loading: false
loading: true
}).then((res) => {
console.log(res);
if (res.data.code === 0) {
......@@ -7004,12 +7008,12 @@ export default {
} else {
self.$message.error("图片保存失败！");
}
self.$store.commit('loading/setLoadingSd', false)
// self.$store.commit('loading/setLoadingSd', false)
// 更新列表
sessionStorage.clear()
self.$bus.emit('updateList')
}).catch(err => { });
}
// ================================================
// canvas图片自处理 --- 后端压缩需要将透明的补成白色背景
/*let canvas_imgSave = document.querySelector('.tui-image-editor-canvas-container .lower-canvas');
......@@ -8226,6 +8230,8 @@ export default {
this.$bus.off('ajzwbjType');
this.$bus.off('changImageEdit');
this.$bus.off('zwType');
// this.$bus.off('updateList_hand')
// this.$bus.off('updateList')
// let sessionArr = [];
// var sessionKeys = Object.keys(sessionStorage);
......
src/views/Editor/modules/ryzwbjLeft.scss
......@@ -18,6 +18,10 @@
align-items: center;
span {
margin-right: 10px;
width: 200px;
overflow: hidden;
white-space: nowrap;
text-overflow: ellipsis;
}
img {
cursor: pointer;
......
src/views/Editor/modules/ryzwbjLeft.vue
<!--
* @Author: your name
* @Date: 2021-10-22 09:42:07
* @LastEditTime: 2021-12-17 17:12:54
* @LastEditTime: 2021-12-20 10:54:17
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\ryzwbjLeft.vue
......@@ -10,7 +10,7 @@
<div class="ryzwbjLeft">
<div class="title">人员编号：</div>
<div class="rybh">
<span>{{barcode}}</span>
<span :title="barcode">{{barcode}}</span>
<img src="@/assets/img/message.png" alt="" @click="daxxChange">
<div class="desc" @click="daxxChange">档案信息</div>
</div>
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-19 20:21:04
* @LastEditTime: 2021-12-20 10:44:08
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,14 +91,14 @@ module.exports = {
"/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.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
// target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
target:"http://zwpt.xzclub.top:9333/",
// target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: 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