Commit aa7cb576 by 李萌萌

Merge branch 'dev_zwpt' of http://47.92.108.28/changchao/founder_vue into dev_zwpt

parents 4a028eea 621c9967
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 12:12:25
* @LastEditTime: 2021-12-13 12:16:34
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -972,6 +972,8 @@ export default {
isExchangeTzdNumber: false,
handDataX: 0,
handDataY: 0,
// 掌纹缩略图蓝色框,鼠标抬起时设Null,停止平移
dragableDiv: null
};
},
computed: {
......@@ -1281,11 +1283,11 @@ export default {
}
});
$(".tui-image-editor").mouseup(function(e) {
e.stopPropagation();
$(".tzdDrawing").css("z-index", `9999`);
self.mouseEnlarge = false;
});
// $(".tui-image-editor").mouseup(function (e) {
// e.stopPropagation();
// $(".tzdDrawing").css("z-index", `9999`);
// self.mouseEnlarge = false;
// });
// 下载
$btnDownload.on("click", function(e) {
......@@ -1521,7 +1523,6 @@ export default {
// 更新newHeight和newWidth
self.newHeight = sizeValue.newHeight;
self.newWidth = sizeValue.newWidth;
// //console.log(sizeValue);
// 切换指纹图片时,清空特征点数组
self.tzdnumber = 0;
self.tzdArr = [];
......@@ -1618,12 +1619,7 @@ export default {
// 清空特征点数量
this.$bus.on("ryzwbjTDZ", () => {
// self.tzdArr = [];
// self.tzdnumber = 0;
// self.isHandTZD = false;
// $(".tzdDom").remove();
// $(".auto_tzdDom").remove();
self.clearALL();
self.clearALL()
});
$(document).keydown(function(event) {
......@@ -1639,7 +1635,6 @@ export default {
var ins = null;
var originPointer = {};
//console.log(document.querySelector(".tzdDrawing"));
document
.querySelector(".tzdDrawing")
.addEventListener("mousedown", function(e) {
......@@ -2112,6 +2107,15 @@ export default {
self.preangle = angle;
direction_flag = false;
}
// 去掉蓝框移动事件
if(self.dragableDiv != null) {
self.dragableDiv['onmousemove'] = null
}
// 去掉拖拽事件
self.startHand = false;
// 去掉放大事件
self.mouseEnlarge = false;
});
/**
......@@ -3940,7 +3944,8 @@ export default {
x,
y,
p = "onmousemove";
o.onmousedown = function(e) {
self.dragableDiv = o
o.onmousedown = function (e) {
e = e || event;
x = e.clientX - o.offsetLeft;
y = e.clientY - o.offsetTop;
......
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