From 82e062dfe85c3a0e691db1d95c1fb404c630cfbb Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Wed, 5 Feb 2025 17:07:13 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4detail=20overall=E5=8D=B0?=
 =?UTF-8?q?=E8=8A=B1=E4=B8=AD=E5=BF=83=E7=82=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignPrintOperation.vue | 17 +++++++++++------
 src/views/HomeView/library.vue                |  7 +++----
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/component/Detail/DesignPrintOperation.vue b/src/component/Detail/DesignPrintOperation.vue
index 018056a9..48193fe2 100644
--- a/src/component/Detail/DesignPrintOperation.vue
+++ b/src/component/Detail/DesignPrintOperation.vue
@@ -122,7 +122,11 @@
 							<ul v-if="!overallSingle && printStyleList[stateOverallSingle][0]" class="designOpenrtion_Mouoverall active" :style="'left:'+printStyleList[stateOverallSingle][0]?.style?.left+';top:'+printStyleList[stateOverallSingle][0]?.style?.top+';'" @mousedown.stop="itemMoveMousedown(0,getMousePosition($event,false))" @touchstart.passive="itemMoveMousedown(0,getMousePosition($event,true))">
 								<i class="fi fi-rr-arrows animtion1"></i>
 								<i class="fi fi-rr-arrows animtion2"></i>
-								<li class="designOpenrtion_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li>
+								
+								<!-- <li class="designOpenrtion_rotote" v-rotote.stop="[0,printStyleList[stateOverallSingle][0].transform]"></li> -->
+
+
+
 								<!-- <li class="designOpenrtion_delete" @click="deletePrint">
 									<img src="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAACXBIWXMAAACxAAAAsQHGLUmNAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAdBJREFUSImt1r1uU0EQBeDPFh1pgBQEEwFVAg9BROhCAh1FAg1gkMA8DA0oKOEB3IEIRQgF4SEQBIUC6ENSGgPFXaPx+udeSxxppPXOzJnZ8e7MrRmPWdzANZxPv+EbvmILL/G9hGcADayjgz8l0kUb56qSX8dhBeJcDrFSRv44ZRQdt3EPczieZB5NvB1ymta4zCP5J1yucOIFfM6CDJykob8s73GiAnkPJ7Eb/H9iJhpsZJlPQh6D7AWe9Z5iFr+CIpalhjWspnXZ/pXA01FURkv/HxpxK+g2UE+yGfZXM5+doHt4DEtB2R5dAXdD9nfG2LVxNa2XKGreiziXGefZ5rKZbCLmg/4jHIWNqSEZ1fC0IrnE0bM5qqdFGWoV92RBf/P/S3RRVqI3YaOZGd8eQpgHXMt8HgTd67qi5fZwMzOO5XuREmim9ShEji04q78tLwSDSR/aYuD599DgeVDsY3pMhqOQt4pnUXlGf7PbTQ5VcQofgv8BTudGK/rb9Z6it5RhEV+CX1cxYoeiZXDg7OC+4vpNJbmkuC3vMtsuHpVltKzo55OOzINxmeeYxhPVhn5H0ftnhhGNeu49NBSjdBkX9H+27Cvu+Sv8GEXwF9+O3b1zwZqdAAAAAElFTkSuQmCC" alt="">
 								</li> -->
@@ -798,15 +802,16 @@ export default defineComponent({
 				for (let index = 0; index < arr.length; index++) {
 					if(!this.overallSingle){
 						scale = this.systemDesignerPercentage/100
-						console.log(this.print);
 						let overallScale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
 						let x = Number(arr[index].style.left.replace(/px/g,''))
 						let y = Number(arr[index].style.top.replace(/px/g,''))
-						let width = Number(this.print.width.replace(/px/g,''))
-						let height = Number(this.print.height.replace(/px/g,''))
+						// let x = (Number(arr[index].style.left.replace(/px/g,'')) + Number(arr[index].style.width.replace(/px/g,''))/2)*sketchNum
+						// let y = (Number(arr[index].style.top.replace(/px/g,'')) + Number(arr[index].style.height.replace(/px/g,''))/2)*sketchNum
+						let width = Number(this.print.width.replace(/px/g,''))*scale/5/2
+						let height = Number(this.print.height.replace(/px/g,''))*scale/5/2
 						
-						// location = [arr[index].style.left.replace(/px/g,'')*sketchNum+this.print.width.replace(/px/g,'')/2-7,arr[index].style.top.replace(/px/g,'')*sketchNum+this.print.height.replace(/px/g,'')/2-7]
-						location = [(x)*sketchNum ,(y )*sketchNum]
+						// location = [(x*sketchNum) ,(y*sketchNum)]
+						location = [(x*sketchNum) - width/sketchNum/2 ,(y*sketchNum) - height/sketchNum/2]
 					}else{
 						await this.setPrintWH(this.exhibitionOpenrtionList[this.stateOverallSingle][index].path)
 						scale = (arr[index].style.width.replace(/px/g,'')*sketchNum/this.print.width.replace(/px/g,''))
diff --git a/src/views/HomeView/library.vue b/src/views/HomeView/library.vue
index 48594ec2..f90d552b 100644
--- a/src/views/HomeView/library.vue
+++ b/src/views/HomeView/library.vue
@@ -307,8 +307,8 @@
 												<i v-show="!isTextarea" class="fi fi-br-expand" @click.stop="setTextareaShow"></i>
 												<i v-show="isTextarea" class="fi fi-bs-compress" @click.stop="setTextareaShow"></i>
 											</div>
-											<div class="input_box_btnBox" v-else>
-												<div class="upload_item">
+											<div class="input_box_btnBox sketch" v-else>
+												<div class="upload_item"  v-show="selectGenerateList.length > 0">
 													<div
 														class="upload_file_item"
 														v-for="(file, index) in selectGenerateList"
@@ -927,7 +927,7 @@ export default defineComponent({
 							return this.store.state.UserHabit.Position;
 						});
 						this.printModelList = JSON.parse(JSON.stringify(this.store.state.UserHabit.SketchStyle))
-						let imgList = ['/image/sketch/sketch-fine.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-thick.jpg']
+						let imgList = ['/image/sketch/sketch-thick.jpg','/image/sketch/sketch-medium.jpg','/image/sketch/sketch-fine.jpg']
 						this.printModelList.forEach((item:any,index:number)=>{
 							item.img = imgList[index]
 						})
@@ -2017,7 +2017,6 @@ export default defineComponent({
 										.input_box_btnBox{
 											background: #fff;
 											align-items: center;
-											padding: 2rem;
 											.search_input{
 												height: 3rem;
 											}