From ae4977abd90c0d009bd484030d565574bdc323db Mon Sep 17 00:00:00 2001 From: X1627315083 <1627315083@qq.com> Date: Fri, 9 May 2025 16:00:50 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=94=BB=E5=B8=83=E5=9B=BE?= =?UTF-8?q?=E7=89=87=E5=8A=A0=E8=BD=BD=E4=B8=8D=E5=87=BA=E6=9D=A5=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 2 +- src/component/HomePage/ExportModel.vue | 4 ++-- src/component/modules/generalCanvas.vue | 4 ++-- src/tool/canvasGeneralCopy.js | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.env.dev b/.env.dev index 070bec3a..8b660130 100644 --- a/.env.dev +++ b/.env.dev @@ -6,7 +6,7 @@ NODE_ENV = 'development' VUE_APP_BASE_URL = 'https://develop.api.aida.com.hk' # VUE_APP_BASE_URL = 'https://www.api.aida.com.hk' # 徐佩 -# VUE_APP_BASE_URL = 'http://192.168.1.4:5567' +VUE_APP_BASE_URL = 'http://192.168.31.118:5567' # 海波 # VUE_APP_BASE_URL = 'http://192.168.1.2:5567' diff --git a/src/component/HomePage/ExportModel.vue b/src/component/HomePage/ExportModel.vue index 70c68bd2..f480f701 100644 --- a/src/component/HomePage/ExportModel.vue +++ b/src/component/HomePage/ExportModel.vue @@ -755,8 +755,8 @@ export default defineComponent({ if(key == 'upImgFiles')imgWidth[key] = setImageWidth(key,img); let url = imgUrl.split('?')[0] - var match = url.match(/:(\d+)\/(.*)/); - minioUrl = match[2] + var match = url.match(/^(?:https?:\/\/[^\/]+)\/(.*)/); + minioUrl = match[1] // let id = let proportion = img.height / img.width; //计算图形宽高比例 // let imgWidth = setImageWidth(key) diff --git a/src/component/modules/generalCanvas.vue b/src/component/modules/generalCanvas.vue index b827995d..447baae4 100644 --- a/src/component/modules/generalCanvas.vue +++ b/src/component/modules/generalCanvas.vue @@ -296,8 +296,8 @@ export default defineComponent({ } let url = imgUrl.split('?')[0] - var match = url.match(/:(\d+)\/(.*)/); - minioUrl = match[2] + var match = url.match(/^(?:https?:\/\/[^\/]+)\/(.*)/); + minioUrl = match[1] // let id = let proportion = img.height / img.width; //计算图形宽高比例 let scaleWH = imgWidth[key] / img.width; //计算放到画布上缩小倍率 diff --git a/src/tool/canvasGeneralCopy.js b/src/tool/canvasGeneralCopy.js index 73a586a0..0f5f2a55 100644 --- a/src/tool/canvasGeneralCopy.js +++ b/src/tool/canvasGeneralCopy.js @@ -1148,8 +1148,8 @@ class MyCanvas { let imgWidth = await this.setImageWidth(key,img); if(imgUrl?.split('?')){ let url = imgUrl.split('?')[0] - var match = url.match(/:(\d+)\/(.*)/); - minioUrl = match[2] + var match = url.match(/^(?:https?:\/\/[^\/]+)\/(.*)/); + minioUrl = match[1] } let proportion = img.height / img.width; //计算图形宽高比例 let scaleWH = imgWidth / img.width; //计算放到画布上缩小倍率