From 226e183f5221360a2afd1ada7aeeb9fe470c9a72 Mon Sep 17 00:00:00 2001
From: X1627315083 <1627315083@qq.com>
Date: Fri, 16 Jan 2026 14:57:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=8D=B0=E8=8A=B1=E7=94=BB?=
 =?UTF-8?q?=E5=B8=83=E4=B8=8D=E5=90=8C=E6=AD=A5=E9=97=AE=E9=A2=98=E5=92=8C?=
 =?UTF-8?q?overall=E6=A8=A1=E5=BC=8F=E5=A4=A7=E5=B0=8F=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/component/Detail/DesignDetail.vue         | 23 ++-----------------
 .../Detail/detailRight/editPrintElement.vue   |  3 ++-
 2 files changed, 4 insertions(+), 22 deletions(-)

diff --git a/src/component/Detail/DesignDetail.vue b/src/component/Detail/DesignDetail.vue
index f12d3154..c2f32f13 100644
--- a/src/component/Detail/DesignDetail.vue
+++ b/src/component/Detail/DesignDetail.vue
@@ -358,25 +358,6 @@ export default defineComponent({
 					detailData.selectDetail.maskUrl = ''
 					detailData.selectDetail.maskMinioUrl = ''
 				}
-				function isNetworkPath(str) {
-					if (typeof str !== 'string' || str.trim() === '') {
-					return false;
-					}
-					const urlPatterns = [
-					/^https?:\/\//i,           // http:// 或 https://
-					/^ftp:\/\//i,              // ftp://
-					/^ws:\/\//i,               // ws://
-					/^wss:\/\//i,              // wss://
-					/^\/\//,                   // 协议相对路径 //example.com
-					/^data:/i,                 // data:image/png;base64,...（这是Base64，不是网络路径）
-					];
-					// 排除data:URL（这实际上是Base64）
-					if (str.startsWith('data:')) {
-						return false;
-					}
-
-					return urlPatterns.some(pattern => pattern.test(str));
-				}
 				const printObjectToJSON = (list:any)=>{
 					if(list?.length > 0){
 						list.forEach((item:any)=>{
@@ -417,8 +398,8 @@ export default defineComponent({
 				if(!data.partialDesign.partialDesignMinioPath){
 					data.partialDesign.partialDesignMinioPath = data.path
 				}
-				data.printObject.prints = printObjectToJSON(data.printObject.prints)
-				data.trims.prints = printObjectToJSON(data.trims.prints)
+				printObjectToJSON(data.printObject.prints)
+				printObjectToJSON(data.trims.prints)
 				if((detailData.isEditPattern.value && list[i].color?.gradient) || (!detailData.isEditPattern.value && (list[i].newDetail?.color?.gradient || list[i].color?.gradient))){
 					gradient = list[i].newDetail?.color?.gradient || list[i].color.gradient
 					gradient.colorImg = await setGradual(gradient,320,700)
diff --git a/src/component/Detail/detailRight/editPrintElement.vue b/src/component/Detail/detailRight/editPrintElement.vue
index 0ceee854..4b926521 100644
--- a/src/component/Detail/detailRight/editPrintElement.vue
+++ b/src/component/Detail/detailRight/editPrintElement.vue
@@ -277,7 +277,7 @@ export default defineComponent({
 					let x = Number(style.left.replace(/px/g,''))
 					let y = Number(style.top.replace(/px/g,''))
 					location = [(x*sketchWH[0]) ,(y*sketchWH[1])]
-					scale =[ editPrintElementData.systemDesignerPercentage/100, editPrintElementData.systemDesignerPercentage/100]
+					scale = item.scale
 					// scale = [item.pattern.style.width/item.pattern.style.height,item.pattern.style.height/item.pattern.style.width]
 					// location = [item.pattern.style.left,item.pattern.style.top]
 				}
@@ -911,6 +911,7 @@ export default defineComponent({
 		}
 		const inputFillScale = (scale:any)=>{
 			let arr = editPrintElementData.printStyleList[props.type].overall
+			console.log(arr,scale,editPrintElementData.imgDomIndex)
 			arr[editPrintElementData.imgDomIndex].scale = [scale,scale]
 			editPrintElementDom.pingpuRef.updataList([
 				{