aidlab/aida_front
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix

Browse Source
This commit is contained in:
X1627315083
2024-10-14 17:53:06 +08:00
parent 403222c385
commit f173f090bb
3 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/component/modules/generalMiniCanvas.vue
View File

@@ -2,7 +2,7 @@
<div class="generalMiniCanvas"> <div class="generalMiniCanvas">
<div class="addDetails_canvasCenter"> <div class="addDetails_canvasCenter">
<div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}"> <div class="generalMiniCanvas_input generalMiniCanvas_item" :class="{spread:spreadState}">
<div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition')"> <div class="generalMiniCanvas_input_item" v-show="(canvasState != 'move' && canvasState != 'liquidation' && canvasState != 'movePosition' && canvasState != 'zoomIn' && canvasState != 'zoomOut')">
<span>{{ $t('exportModel.Size') }}</span> <span>{{ $t('exportModel.Size') }}</span>
<input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]"> <input type="range" @input="setPencilWidth" min="1" max="50" v-model="canvasPencilWidth[canvasState]">
</div> </div>
@@ -303,8 +303,8 @@ export default defineComponent({
let setCanvasDown = (event)=>{ let setCanvasDown = (event)=>{
if(canvasBtn.canvasState == 'movePosition'){ if(canvasBtn.canvasState == 'movePosition'){
isMovePostion = true; isMovePostion = true;
lastPosX = event.e.clientX; lastPosX = event.pointer.x;
lastPosY = event.e.clientY; lastPosY = event.pointer.y;
return return
} }
if(canvasBtn.canvasState == 'zoomIn' || canvasBtn.canvasState == 'zoomOut'){ if(canvasBtn.canvasState == 'zoomIn' || canvasBtn.canvasState == 'zoomOut'){
@@ -313,15 +313,15 @@ export default defineComponent({
} }
} }
let setCanvasPosition = (event)=>{ let setCanvasPosition = (event)=>{
const e = event.e; const e = event;
const vpt = canvas.viewportTransform; const vpt = canvas.viewportTransform;
vpt[4] += e.clientX - lastPosX; // 更新水平偏移 vpt[4] += e.pointer.x - lastPosX; // 更新水平偏移
vpt[5] += e.clientY - lastPosY; // 更新垂直偏移 vpt[5] += e.pointer.y - lastPosY; // 更新垂直偏移
canvas.requestRenderAll(); // 请求重绘画布 canvas.requestRenderAll(); // 请求重绘画布
lastPosX = e.clientX; lastPosX = e.pointer.x;
lastPosY = e.clientY; lastPosY = e.pointer.y;
} }
let setCanvasZoom = (opt)=>{ let setCanvasZoom = (opt)=>{
let zoom = canvas.getZoom() // 获取画布当前缩放值 let zoom = canvas.getZoom() // 获取画布当前缩放值
@@ -333,8 +333,8 @@ export default defineComponent({
// console.log(zoom); // console.log(zoom);
canvas.zoomToPoint( canvas.zoomToPoint(
{ // 关键点 { // 关键点
x: opt.e.offsetX, x: opt.pointer.x,
y: opt.e.offsetY y: opt.pointer.y
}, },
zoom zoom
) )
@@ -456,7 +456,9 @@ export default defineComponent({
setPencilWidth() setPencilWidth()
} }
let upDataPencilWidth = (zoom)=>{ let upDataPencilWidth = (zoom)=>{
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom; if(canvasBtn.canvasPencilWidth[canvasBtn?.canvasState]){
canvas.freeDrawingBrush.width = Number(canvasBtn.canvasPencilWidth[canvasBtn.canvasState]) / zoom;
}
} }
let deleteObj = ()=> { let deleteObj = ()=> {
// if(!canvas.getActiveObjects()){ // if(!canvas.getActiveObjects()){

4
src/views/HomeMain.vue
View File

@@ -640,11 +640,11 @@ export default defineComponent({
.homeMain_max{ .homeMain_max{
position: relative; position: relative;
display: flex; display: flex;
height: 100vh; height: 100%;
flex-direction: column; flex-direction: column;
.homeMain_content_body{ .homeMain_content_body{
flex: 1; flex: 1;
height: calc(100vh - 7rem); height: calc(100% - 7rem);
} }
} }
.homeMain_heade { .homeMain_heade {

1
src/views/HomeView/HomeView.vue
View File

@@ -1161,6 +1161,7 @@ export default defineComponent({
display: flex; display: flex;
// padding-left: 0.7rem; // padding-left: 0.7rem;
box-sizing: border-box; box-sizing: border-box;
overflow: hidden;calc(100vh - 7rem)
.home_page_left { .home_page_left {
// width: 44.4rem; // width: 44.4rem;