Skip to content

F
founder_vue
Commit 923f33f9 by li_hongchao
Options

Merge remote-tracking branch 'origin/dev_zwpt' into dev_zwpt

parents 7c289665 81a12d4d
Showing with 147 additions and 80 deletions
babel.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-18 10:27:58
* @LastEditors: your name
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\babel.config.js
*/
// module.exports = {
// presets: ["@vue/cli-plugin-babel/preset"]
// };
let plugins = [];
if (process.env.NODE_ENV === "production") { // todo if判断是否打包,打包环境下控制台去掉console.log,也可去掉if判断，整个项目不会出现console.log(不建议)
plugins.push("transform-remove-console");
}
module.exports = {
presets: ["@vue/cli-plugin-babel/preset"]
presets: ["@vue/cli-plugin-babel/preset"],
plugins: plugins
};
package-lock.json
......@@ -2050,6 +2050,37 @@
"webpack-merge": "^4.2.2"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://registry.nlark.com/ansi-styles/download/ansi-styles-4.3.0.tgz?cache=0&sync_timestamp=1618995625950&other_urls=https%3A%2F%2Fregistry.nlark.com%2Fansi-styles%2Fdownload%2Fansi-styles-4.3.0.tgz",
"integrity": "sha1-7dgDYornHATIWuegkG7a00tkiTc=",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://registry.npmmirror.com/chalk/download/chalk-4.1.2.tgz",
"integrity": "sha1-qsTit3NKdAhnrrFr8CqtVWoeegE=",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://registry.npm.taobao.org/color-convert/download/color-convert-2.0.1.tgz",
"integrity": "sha1-ctOmjVmMm9s68q0ehPIdiWq9TeM=",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"debug": {
"version": "4.2.0",
"resolved": "https://registry.npm.taobao.org/debug/download/debug-4.2.0.tgz?cache=0&sync_timestamp=1600502871403&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fdebug%2Fdownload%2Fdebug-4.2.0.tgz",
......@@ -2059,11 +2090,35 @@
"ms": "2.1.2"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://registry.npmmirror.com/loader-utils/download/loader-utils-2.0.2.tgz?cache=0&sync_timestamp=1636687934969&other_urls=https%3A%2F%2Fregistry.npmmirror.com%2Floader-utils%2Fdownload%2Floader-utils-2.0.2.tgz",
"integrity": "sha1-1uO0+4GHByGuTghoqxHdY4NowSk=",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
},
"ms": {
"version": "2.1.2",
"resolved": "https://registry.npm.taobao.org/ms/download/ms-2.1.2.tgz",
"integrity": "sha1-0J0fNXtEP0kzgqjrPM0YOHKuYAk=",
"dev": true
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://registry.npmmirror.com/vue-loader/download/vue-loader-16.8.3.tgz",
"integrity": "sha1-1D5nXe9bqTRdbH8FkUwT2GGZcIc=",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
}
}
}
},
......@@ -2922,6 +2977,12 @@
"object.assign": "^4.1.0"
}
},
"babel-plugin-transform-remove-console": {
"version": "6.9.4",
"resolved": "https://registry.npm.taobao.org/babel-plugin-transform-remove-console/download/babel-plugin-transform-remove-console-6.9.4.tgz",
"integrity": "sha1-uYA2DAZzhOJLNXpYjYB9PINSd4A=",
"dev": true
},
"babel-runtime": {
"version": "6.26.0",
"resolved": "https://registry.npmjs.org/babel-runtime/-/babel-runtime-6.26.0.tgz",
......@@ -13902,63 +13963,6 @@
}
}
},
"vue-loader-v16": {
"version": "npm:vue-loader@16.8.3",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/vue-loader/-/vue-loader-16.8.3.tgz",
"integrity": "sha512-7vKN45IxsKxe5GcVCbc2qFU5aWzyiLrYJyUuMz4BQLKctCj/fmCa0w6fGiiQ2cLFetNcek1ppGJQDCup0c1hpA==",
"dev": true,
"optional": true,
"requires": {
"chalk": "^4.1.0",
"hash-sum": "^2.0.0",
"loader-utils": "^2.0.0"
},
"dependencies": {
"ansi-styles": {
"version": "4.3.0",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"optional": true,
"requires": {
"color-convert": "^2.0.1"
}
},
"chalk": {
"version": "4.1.2",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"optional": true,
"requires": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
}
},
"color-convert": {
"version": "2.0.1",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"optional": true,
"requires": {
"color-name": "~1.1.4"
}
},
"loader-utils": {
"version": "2.0.2",
"resolved": "https://mirrors.huaweicloud.com/repository/npm/loader-utils/-/loader-utils-2.0.2.tgz",
"integrity": "sha512-TM57VeHptv569d/GKh6TAYdzKblwDNiumOdkFnejjD0XwTH87K90w3O7AiJRqdQoXygvi1VQTJTLGhJl7WqA7A==",
"dev": true,
"optional": true,
"requires": {
"big.js": "^5.2.2",
"emojis-list": "^3.0.0",
"json5": "^2.1.2"
}
}
}
},
"vue-router": {
"version": "3.4.6",
"resolved": "https://registry.npm.taobao.org/vue-router/download/vue-router-3.4.6.tgz?cache=0&sync_timestamp=1602077426782&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fvue-router%2Fdownload%2Fvue-router-3.4.6.tgz",
......
package.json
......@@ -51,6 +51,7 @@
"@vue/eslint-config-prettier": "^6.0.0",
"axios": "^0.23.0",
"babel-eslint": "^10.1.0",
"babel-plugin-transform-remove-console": "^6.9.4",
"docdash": "^1.2.0",
"eslint": "^6.7.2",
"eslint-plugin-prettier": "^3.1.3",
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -873,6 +873,7 @@ $canvasWidth: var(--canvasWidth, 670px);
z-index: 9999;
display: flex;
align-items: center;
justify-content: center;
// justify-content: center;
.small-drawing2 {
width: 180px;
......@@ -954,8 +955,8 @@ $canvasWidth: var(--canvasWidth, 670px);
border-top: 1px solid #e02020;
.tui-image-editor {
box-sizing: content-box;
width: 670px !important;
height: 670px !important;
width: 670px;
height: 670px;
position: relative;
}
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-17 22:37:51
* @LastEditTime: 2021-12-18 14:15:46
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -1025,6 +1025,7 @@ export default {
}
// 获取barcode，seq
// console.log(this.$route)
this.barcode = this.$route.params.barcode;
if (this.$route.params.id != 'xz') {
this.id = this.$route.params.id;
......@@ -2175,6 +2176,13 @@ export default {
self.canvasBox_height = $('.lower-canvas').height()
console.log(self.canvasBox_width);
console.log(self.canvasBox_height);
// 设置tui的宽高
console.log($('.tui-image-editor'));
$('.tui-image-editor').css('width', self.canvasBox_width + 'px')
$('.tui-image-editor').css('height', self.canvasBox_height + 'px')
// 小指纹框的small-drawing2
// $('.small-drawing2').css('width', self.canvasBox_width/(670/180) + 'px')
// $('.small-drawing2').css('height', self.canvasBox_height/670/180 + 'px')
// 设置特征点图层的宽度和高度
$('.tzdDrawing').css('width', self.canvasBox_width + 'px')
$('.tzdDrawing').css('height', self.canvasBox_height + 'px')
......@@ -2202,19 +2210,52 @@ export default {
imageEditor.clearUndoStack();
// 重置图像编辑器
self.zoomLevel = 1
imageEditor.rotate(0)
imageEditor.zoom({
x: self.newWidth / 2,
y: self.newHeight / 2,
zoomLevel: 1
});
imageEditor._graphics.setImageProperties({
left: 0,
top: 0,
originX: 'left',
originY: 'top'
}, true)
if (self.zwType == '指纹') {
self.zoomLevel = 1
imageEditor.rotate(0)
imageEditor.zoom({
x: self.newWidth / 2,
y: self.newHeight / 2,
zoomLevel: 1
});
imageEditor._graphics.setImageProperties({
left: 0,
top: 0,
originX: 'left',
originY: 'top'
}, true)
} else {
// 计算canvas图像宽高和实际图片的比例，将图片放大
self.zoomLevel = self.newHeight / self.canvasHeight
self.zoomLevel_origin = self.newHeight / self.canvasHeight
console.log(self.zoomLevel);
imageEditor.rotate(0)
// imageEditor.zoom({
// x: self.newWidth / 2,
// y: self.newHeight / 2,
// zoomLevel: self.zoomLevel_origin
// });
self.zoomImage(self.zoomLevel_origin)
// imageEditor._graphics.setImageProperties({
// left: 0,
// top: 0,
// originX: 'left',
// originY: 'top'
// }, true)
// self.zoomLevel = 1
// imageEditor.rotate(0)
// imageEditor.zoom({
// x: self.newWidth / 2,
// y: self.newHeight / 2,
// zoomLevel: 1
// });
// imageEditor._graphics.setImageProperties({
// left: 0,
// top: 0,
// originX: 'left',
// originY: 'top'
// }, true)
}
self.changeTzdDrawing()
// Fcanvas.absolutePan({
......@@ -4476,8 +4517,11 @@ export default {
let frame_max = (this.line_distance / this.rule_num) * 117; // 2304px == 117mm
console.log(frame_min);
console.log(frame_max);
this.frame_min_bb = this.minCanvasHeightOrWidth / frame_min;
this.frame_max_bb = this.minCanvasHeightOrWidth / frame_max;
this.frame_min_bb = this.minCanvasHeightOrWidth / frame_min * self.zoomLevel_origin;
this.frame_max_bb = this.minCanvasHeightOrWidth / frame_max * self.zoomLevel_origin;
console.log(this.frame_min_bb);
console.log(this.frame_max_bb);
// 记住缩放比例
self.zoomLevel = self.frame_max_bb;
......@@ -4489,6 +4533,7 @@ export default {
// zoomLevel: self.frame_max_bb
// });
this.zoomImage(self.zoomLevel);
console.log(self.imageEditor._graphics.getCanvasImage());
// 掌纹框的最大宽度范围
self.maxLength = this.canvasHeight;
......
vue.config.js
/*
* @Author: your name
* @Date: 2021-09-07 09:57:48
* @LastEditTime: 2021-12-16 14:43:29
* @LastEditTime: 2021-12-18 14:32:24
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\vue.config.js
......@@ -91,8 +91,7 @@ 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.121: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
......@@ -100,7 +99,7 @@ module.exports = {
// target: "http://47.92.225.109:5602",
// target: "http://www.meetfood.cn:2390", // 湖南-线上
// target:"http://zwpt.xzclub.top:9333/",
target: "http://192.168.128.115:8099", // 江
// target: "http://192.168.128.115:8099", // 江
ws: true,
changeOrigin: true,
pathRewrite: {
......
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