Commit 3c390e8c by 张超军

正查掌纹小图片比例调整

parent 43d80919
...@@ -1537,7 +1537,7 @@ div { ...@@ -1537,7 +1537,7 @@ div {
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
transform-origin: center center; transform-origin: center center;
border: 2px solid green; // border: 2px solid green;
.pointer { .pointer {
position: absolute; position: absolute;
right: 0; right: 0;
...@@ -1758,7 +1758,7 @@ div { ...@@ -1758,7 +1758,7 @@ div {
background: transparent; background: transparent;
overflow: hidden; overflow: hidden;
transform-origin: center center; transform-origin: center center;
border: 2px solid green; // border: 2px solid green;
.pointer { .pointer {
position: absolute; position: absolute;
right: 0; right: 0;
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-09-09 09:28:46 * @Date: 2021-09-09 09:28:46
* @LastEditTime: 2021-12-24 17:15:41 * @LastEditTime: 2021-12-26 18:57:44
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue * @FilePath: \指纹系统\founder_vue\src\views\cxyrd\LTz.vue
--> -->
...@@ -343,7 +343,7 @@ ...@@ -343,7 +343,7 @@
</div> </div>
<div class="tzdDrawing_2_source"></div> <div class="tzdDrawing_2_source"></div>
<div class="tzdDrawing_source"> <div class="tzdDrawing_source">
<div class="pointer"></div> <!-- <div class="pointer"></div> -->
</div> </div>
</div> </div>
<div class="edit" id="sourceEdit" v-show="!isFHxx" @click="sourceChange" v-if="roleArr.includes('C-1-9')">编辑</div> <div class="edit" id="sourceEdit" v-show="!isFHxx" @click="sourceChange" v-if="roleArr.includes('C-1-9')">编辑</div>
...@@ -385,7 +385,7 @@ ...@@ -385,7 +385,7 @@
</div> </div>
<div class="tzdDrawing_2_target"></div> <div class="tzdDrawing_2_target"></div>
<div class="tzdDrawing_target"> <div class="tzdDrawing_target">
<div class="pointer"></div> <!-- <div class="pointer"></div> -->
</div> </div>
</div> </div>
<div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div> <div class="edit" id="targetEdit" v-show="!isFHxx" @click="targetChange" v-if="roleArr.includes('C-1-9')">编辑</div>
...@@ -4742,6 +4742,8 @@ export default { ...@@ -4742,6 +4742,8 @@ export default {
$(".el-checkbox").css('opacity', '1') $(".el-checkbox").css('opacity', '1')
}); });
} else if (this.$route.name == 'fhxxLT' || this.$route.name == 'fhxxTL' || this.$route.name == 'fhxxLL') { } else if (this.$route.name == 'fhxxLT' || this.$route.name == 'fhxxTL' || this.$route.name == 'fhxxLL') {
$(".fhxx-top").css('box-shadow', 'none')
$(".el-textarea__inner").css('box-shadow', 'none')
html2canvas( html2canvas(
document.querySelector(".fhxxLT"), document.querySelector(".fhxxLT"),
{ {
...@@ -4764,6 +4766,8 @@ export default { ...@@ -4764,6 +4766,8 @@ export default {
a.href = canvas.toDataURL("image/jpeg"); a.href = canvas.toDataURL("image/jpeg");
a.download = "screenshot"; a.download = "screenshot";
a.click(); a.click();
$(".fhxx-top").css('box-shadow', '0px 1px 2px 0px rgba(5, 95, 231, 0.4),0px -1px 2px 0px rgba(5, 95, 231, 0.19);')
$(".el-textarea__inner").css('box-shadow', '0px 1px 2px 0px rgba(5, 95, 231, 0.18);')
}); });
} }
}, },
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-23 11:43:37 * @LastEditTime: 2021-12-25 16:12:58
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -1737,10 +1737,13 @@ export default { ...@@ -1737,10 +1737,13 @@ export default {
); );
//邻边 //邻边
let heng = Math.abs(this.originX - e.clientX); let heng = Math.abs(this.originX - e.clientX);
console.log("heng:-------",heng);
//cos //cos
let cos = heng / distance; let cos = heng / distance;
console.log("cos:--------",cos);
//角度 //角度
self.deg = parseInt((Math.acos(cos) * 180) / Math.PI); self.deg = parseInt((Math.acos(cos) * 180) / Math.PI);
console.log("deg:--------",self.deg);
// 根据象限判断 // 根据象限判断
if (e.clientX >= this.originX && e.clientY <= this.originY) { if (e.clientX >= this.originX && e.clientY <= this.originY) {
// console.log(self.deg); // console.log(self.deg);
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-10-22 11:36:10 * @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-22 15:03:21 * @LastEditTime: 2021-12-25 14:26:32
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue * @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
...@@ -1897,6 +1897,17 @@ export default { ...@@ -1897,6 +1897,17 @@ export default {
self.tzdDrawing_left = 0 self.tzdDrawing_left = 0
self.tzdDrawing_top = 0 self.tzdDrawing_top = 0
self.startPlace = 0 self.startPlace = 0
// 遮罩层
self.isHideImageExport = false
// 隐藏手纹框
self.isSwk_flag = false;
self.isTpdr_flag = false
// 缩放改为1
self.bb = 1;
self.frame_max_bb = 1
self.frame_min_bb = 1
// 裁剪之后,小框框就不拖拽背景图,拖着大框移动
self.isCrop = true;
// 初始化缩略图 // 初始化缩略图
self.isShowSourcePrivew = false self.isShowSourcePrivew = false
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-24 17:20:45 * @LastEditTime: 2021-12-25 13:33:18
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -332,10 +332,14 @@ export default { ...@@ -332,10 +332,14 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image) self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
}) })
this.$axios({ this.$axios({
method: 'post', method: 'post',
...@@ -347,10 +351,14 @@ export default { ...@@ -347,10 +351,14 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image) self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}) })
}, },
/** /**
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-24 17:20:49 * @LastEditTime: 2021-12-25 13:32:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -325,10 +325,14 @@ export default { ...@@ -325,10 +325,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image) self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}) })
} else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) { } else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) {
// 滚动 // 滚动
...@@ -341,10 +345,14 @@ export default { ...@@ -341,10 +345,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image) self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}) })
} else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) { } else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) {
// 平面 // 平面
...@@ -357,10 +365,14 @@ export default { ...@@ -357,10 +365,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image) self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}) })
} }
} else { } else {
...@@ -383,10 +395,14 @@ export default { ...@@ -383,10 +395,14 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image) self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
}) })
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
......
<!-- <!--
* @Author: your name * @Author: your name
* @Date: 2021-12-03 15:35:26 * @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-24 17:20:58 * @LastEditTime: 2021-12-25 13:34:35
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE * @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue * @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
...@@ -344,10 +344,14 @@ export default { ...@@ -344,10 +344,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image) self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
}) })
} else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) { } else if (self.allData.bzxxZwXh >= 1 && self.allData.bzxxZwXh <= 10) {
// 滚动 // 滚动
...@@ -360,10 +364,14 @@ export default { ...@@ -360,10 +364,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image) self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
}) })
} else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) { } else if (self.allData.bzxxZwXh >= 11 && self.allData.bzxxZwXh <= 20) {
// 平面 // 平面
...@@ -376,10 +384,14 @@ export default { ...@@ -376,10 +384,14 @@ export default {
} }
}).then(res => { }).then(res => {
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEdit', res.data.ret.image) self.$bus.emit('changImageEdit', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEdit', 'xxx') self.$bus.emit('changImageEdit', 'xxx')
} }
} else {
self.$bus.emit('changImageEdit', 'xxx')
}
}) })
} }
} }
...@@ -399,10 +411,14 @@ export default { ...@@ -399,10 +411,14 @@ export default {
}).then(res => { }).then(res => {
console.log(res) console.log(res)
if (res.data.code === 0) { if (res.data.code === 0) {
if(res.data.ret.image != null) {
self.$bus.emit('changImageEditTarget', res.data.ret.image) self.$bus.emit('changImageEditTarget', res.data.ret.image)
} else { } else {
self.$bus.emit('changImageEditTarget', 'xxx') self.$bus.emit('changImageEditTarget', 'xxx')
} }
} else {
self.$bus.emit('changImageEditTarget', 'xxx')
}
}) })
}, },
/** /**
......
...@@ -59,7 +59,9 @@ ...@@ -59,7 +59,9 @@
<!-- {{ Number(index + 1) &lt; 9 ? ("0" + Number(index + 1)) : Number(index + 1) }} --> <!-- {{ Number(index + 1) &lt; 9 ? ("0" + Number(index + 1)) : Number(index + 1) }} -->
{{ Number(item.seq) &lt; 9 ? ("0" + Number(item.seq)) : Number(item.seq) }} {{ Number(item.seq) &lt; 9 ? ("0" + Number(item.seq)) : Number(item.seq) }}
</div> </div>
<div class="zw_img">
<img :src="'data:image/jpeg;base64,'+item.image" /> <img :src="'data:image/jpeg;base64,'+item.image" />
</div>
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -93,7 +95,9 @@ ...@@ -93,7 +95,9 @@
<div class="finger_print_number" :class="{ finger_print_number_active: item.seq === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }"> <div class="finger_print_number" :class="{ finger_print_number_active: item.seq === isActive, fingerLookNum: item.clickLog==1, fingerRDNum: item.affirmstatus==1, fingerBZNum:item.affirmstatus==2, fingerRBNum:item.affirmstatus==3 }">
{{ item.seq }} {{ item.seq }}
</div> </div>
<div class="zw_img">
<img :src="'data:image/jpeg;base64,'+item.image" /> <img :src="'data:image/jpeg;base64,'+item.image" />
</div>
<div class="finger-tips"> <div class="finger-tips">
<!-- 认定完成 --> <!-- 认定完成 -->
<div class="affirmstatus1" v-if="item.affirmstatus==1"> <div class="affirmstatus1" v-if="item.affirmstatus==1">
...@@ -772,10 +776,15 @@ const datas = [ ...@@ -772,10 +776,15 @@ const datas = [
border: 1px solid #999; border: 1px solid #999;
} }
.zw_img {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
margin-left: 0;
img { img {
position: absolute; object-fit: contain;
top: 0; }
left: 0;
} }
.finger_print_number { .finger_print_number {
...@@ -937,10 +946,15 @@ const datas = [ ...@@ -937,10 +946,15 @@ const datas = [
border: 1px solid #999; border: 1px solid #999;
} }
.zw_img {
width: 100%;
height: 100%;
display: flex;
justify-content: center;
margin-left: 0;
img { img {
position: absolute; object-fit: contain;
top: 0; }
left: 0;
} }
.finger_print_number { .finger_print_number {
......
...@@ -121,6 +121,7 @@ export default { ...@@ -121,6 +121,7 @@ export default {
/deep/ .el-input__inner { /deep/ .el-input__inner {
cursor: text; cursor: text;
/* height: 100%; */
width: 75%; width: 75%;
font-size: 16px; font-size: 16px;
color: #ffffff; color: #ffffff;
......
/* /*
* @Author: your name * @Author: your name
* @Date: 2021-09-07 09:57:48 * @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-25 13:19:44 * @LastEditTime: 2021-12-25 16:15:21
* @LastEditors: Please set LastEditors * @LastEditors: Please set LastEditors
* @Description: In User Settings Edit * @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js * @FilePath: \指纹系统\founder_vue\vue.config.js
...@@ -110,14 +110,14 @@ module.exports = { ...@@ -110,14 +110,14 @@ module.exports = {
"/api": { "/api": {
// target: "http://192.168.0.137:8080/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ // 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.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.116:8099", // 湖南-王
// target: "http://192.168.128.102:8099", // 湖南-张呈光 // target: "http://192.168.128.102:8099", // 湖南-张呈光
// target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma // target: "http://172.18.116.73:8099/", //统一的请求头部每次修改都要重启才会生效 http://39.99.224.27:8006/ ma
// target: "http://127.0.0.1:8099", // target: "http://127.0.0.1:8099",
// target: "http://47.92.225.109:5602", // target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上 // target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/", target:"http://zwpt.xzclub.top:9333/",
// target: "http://192.168.128.102:8099", // 江 // target: "http://192.168.128.102:8099", // 江
ws: true, ws: true,
changeOrigin: 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