Skip to content

F
founder_vue
Commit 01d299a2 by 张超军
Options

宽度+高度改670

parent cca13487
Showing with 68 additions and 50 deletions
src/views/Editor/modules/imageEd.scss
......@@ -954,21 +954,42 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
.body-container {
position: relative;
width: 640px;
height: 640px;
width: 672px;
height: 672px;
background: #ffffff;
display: flex;
justify-content: center;
align-items: center;
border: 1px solid #055fe7;
border-top: 1px solid #e02020;
.tui-image-editor {
width: 640px !important;
height: 640px !important;
}
/deep/.tui-image-editor-canvas-container,
/deep/.lower-canvas,
/deep/.upper-canvas {
max-height: 640px !important;
max-width: 640px !important;
box-sizing: content-box;
width: 670px !important;
height: 670px !important;
position: relative;
}
/deep/ .tui-image-editor-canvas-container {
height: 100% !important;
width: 100% !important;
max-height: 670px !important;
max-width: 670px !important;
position: relative;
}
/deep/ .lower-canvas,
/deep/ .upper-canvas {
position: absolute;
left: 0;
right: 0;
bottom: 0;
top: 0;
margin: auto;
max-height: 670px !important;
max-width: 670px !important;
height: 670px !important;
width: 670px !important;
// height: auto !important;
// width: auto !important;
display: flex !important;
justify-content: center !important;
align-items: center !important;
......@@ -1027,22 +1048,22 @@ $transOrigin: var(--transOrigin, 0px, 0px);
}
}
.tzdDrawing {
width: 640px;
height: 640px;
width: 670px;
height: 670px;
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
transform-origin: 335px 335px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
}
.tzdDrawing_2 {
width: 640px;
height: 640px;
width: 670px;
height: 670px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
transform-origin: 335px 335px;
}
}
.preview-source {
......
src/views/Editor/modules/imageEd.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 12:16:34
* @LastEditTime: 2021-12-13 17:13:29
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......@@ -727,8 +727,8 @@ export default {
tzdDrawing_top: 0,
zwType: "指纹",
xsType: "yuantu",
canvasWidth: 640,
canvasHeight: 640,
canvasWidth: 670,
canvasHeight: 670,
// 对比度
inputContrastRange: 0,
// 特征点id
......@@ -947,8 +947,8 @@ export default {
isHandSpace: false,
//旋转之前的度数
startPlace: 0,
newHeight: 640,
newWidth: 640,
newHeight: 670,
newWidth: 670,
// tzdDrawing 的移动距离
tzdDrawingLeft: 0,
tzdDrawingTop: 0,
......@@ -1848,8 +1848,6 @@ export default {
let canvasImage = imageEditor._graphics.getCanvasImage();
// 移动图片
const offsetx = canvasImage.getCenterPoint().x - 320;
const offsety = canvasImage.getCenterPoint().y - 320;
const leftNew =
originPointer.left +
((x2 - x1) * self.newWidth) / self.canvasWidth / self.zoomLevel;
......@@ -2642,8 +2640,8 @@ export default {
this.issize = false;
this.ismoderate = true;
this.imageEditor.zoom({
x: 320,
y: 320,
x: this.imageEditor._graphics.getCanvasImage().width/2,
y: this.imageEditor._graphics.getCanvasImage().height/2,
zoomLevel: 1.2,
});
this.zoomLevel = 1.2;
......
src/views/Editor/modules/imageEdAJ.scss
......@@ -10,8 +10,8 @@ $BJDcolor: var(--BJDcolor, #e60012); // #e60012
$directionRotate: var(--directionRotate, 0deg);
// canvas的宽度
$canvasHeight: var(--canvasHeight, 640px);
$canvasWidth: var(--canvasWidth, 640px);
$canvasHeight: var(--canvasHeight, 670px);
$canvasWidth: var(--canvasWidth, 670px);
.imageBox {
display: flex;
......@@ -943,19 +943,20 @@ $canvasWidth: var(--canvasWidth, 640px);
.body-container {
position: relative;
width: 670px;
height: 670px;
width: 672px;
height: 672px;
background: #ffffff;
display: flex;
filter: "FlipV";
justify-content: center;
align-items: center;
border: 1px solid #055fe7;
border-top: 1px solid #e02020;
.tui-image-editor {
box-sizing: content-box;
width: 670px !important;
height: 670px !important;
position: relative;
border: 1px solid #055FE7;
border-top: 1px solid #E02020;
}
/deep/ .tui-image-editor-canvas-container {
......@@ -971,7 +972,7 @@ $canvasWidth: var(--canvasWidth, 640px);
left: 0;
right: 0;
bottom: 0;
top:0;
top: 0;
margin: auto;
max-height: 670px !important;
max-width: 670px !important;
......@@ -1060,7 +1061,7 @@ $canvasWidth: var(--canvasWidth, 640px);
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
transform-origin: 335px 335px;
z-index: 9999;
// transform-origin: $transOrigin;
// background-color: #999;
......@@ -1071,7 +1072,7 @@ $canvasWidth: var(--canvasWidth, 640px);
height: 670px;
position: absolute;
background: transparent;
transform-origin: 320px 320px;
transform-origin: 335px 335px;
}
.irregular {
......@@ -1080,7 +1081,7 @@ $canvasWidth: var(--canvasWidth, 640px);
position: absolute;
background: transparent;
overflow: hidden;
transform-origin: 320px 320px;
transform-origin: 335px 335px;
}
.rule_line {
......
src/views/Editor/modules/imageEdAJ.vue
<!--
* @Author: your name
* @Date: 2021-10-22 11:36:10
* @LastEditTime: 2021-12-13 15:57:15
* @LastEditTime: 2021-12-13 17:01:09
* @LastEditors: Please set LastEditors
* @Description: In User Settings Edit
* @FilePath: \指纹系统\founder_vue\src\views\Editor\modules\imageEd.vue
......
src/views/bzxxgl/bzxxfh.vue
<!--
* @Author: your name
* @Date: 2021-12-01 15:25:22
* @LastEditTime: 2021-12-13 14:35:24
* @LastEditTime: 2021-12-13 16:50:22
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\AllPersonnelBase\bzxxfh.vue
......@@ -411,9 +411,6 @@ export default {
// 正查
let routeUrl = this.$router.resolve({
path: "fhxxLT/"+rowData.id,
query: {
rowData: JSON.stringify(rowData)
}
});
window.open(routeUrl.href, "_blank");
} else if (rowData.querytype == '3') {
......@@ -431,11 +428,12 @@ export default {
let self = this
this.$axios({
method: 'post',
url: '/api/hit/updateCx',
params: {
url: '/api/hit/update',
data: {
querytype: this.rowData.querytype,
id: this.rowData.id,
des: this.textarea
des: this.textarea,
status: 0
}
}).then(res => {
console.log(res);
......
src/views/bzxxgl/fhxxLT.vue
<!--
* @Author: your name
* @Date: 2021-12-03 15:35:26
* @LastEditTime: 2021-12-13 15:03:49
* @LastEditTime: 2021-12-13 16:45:51
* @LastEditors: Please set LastEditors
* @Description: 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @FilePath: \指纹系统\founder_vue\src\views\bzxxgl\fhxxLT.vue
......@@ -238,7 +238,7 @@ export default {
created () {
console.log(this.$route);
this.id = this.$route.params.id
console.log(JSON.parse(this.$route.query.rowData));
// console.log(JSON.parse(this.$route.query.rowData));
this.getData()
},
methods: {
......@@ -250,7 +250,7 @@ export default {
this.$axios({
method: 'post',
url: '/api/hit/delete',
data: {
params: {
querytype: 2,
ids: Number(self.id),
}
......@@ -269,8 +269,8 @@ export default {
data: {
querytype: 2,
id: Number(self.id),
reviewStatus: 1,
fhyj: self.fhyj
status: 1,
des: self.fhyj
}
}).then(res => {
console.log(res);
......@@ -287,8 +287,8 @@ export default {
data: {
querytype: 2,
id: Number(self.id),
reviewStatus: 2,
fhyj: self.fhyj
status: 2,
des: self.fhyj
}
}).then(res => {
console.log(res);
......
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