diff --git a/hangtag-ui/hangtag-ui-admin/.env b/hangtag-ui/hangtag-ui-admin/.env index 365e409..a3c8025 100644 --- a/hangtag-ui/hangtag-ui-admin/.env +++ b/hangtag-ui/hangtag-ui-admin/.env @@ -1,8 +1,8 @@ # 标题 -VITE_APP_TITLE=嘉晋OMS后台管理系统 +VITE_APP_TITLE=嘉晋OMS系统 # 项目本地运行端口号 -VITE_PORT=80 +VITE_PORT=3001 # open 运行 npm run dev 时自动打开浏览器 VITE_OPEN=true diff --git a/hangtag-ui/hangtag-ui-admin/.env.dev b/hangtag-ui/hangtag-ui-admin/.env.dev index 99722b7..7c5238c 100644 --- a/hangtag-ui/hangtag-ui-admin/.env.dev +++ b/hangtag-ui/hangtag-ui-admin/.env.dev @@ -4,12 +4,12 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://localhost:8080' +VITE_BASE_URL='http://127.0.0.1:48080' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server # 上传路径 -VITE_UPLOAD_URL='http://localhost:8080/admin-api/infra/file/upload' +VITE_UPLOAD_URL='http://api-dashboard.yudao.iocoder.cn/admin-api/infra/file/upload' # 接口地址 VITE_API_URL=/admin-api diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue index aaf69ca..9968de7 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/components/DesignPropEdit.vue @@ -1,6 +1,6 @@ diff --git a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts index 670dd14..df314c8 100644 --- a/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts +++ b/hangtag-ui/hangtag-ui-admin/src/components/DraftDesign/utils/Dpi.ts @@ -37,26 +37,22 @@ export function calcDpiFromSize( screenSize=16,opt = 'd'){ return calcDpi(widthValue, heightValue, screenSize, opt); } const tmpImage = {} -export function convertImageToBase64(url) { +export function convertImageToBase64(url:string) { return new Promise(async (resolve)=>{ - FileApi.getDomain().then(async (domain) => { - url = replaceDomain(domain, url) - if(tmpImage[url]){ - resolve(tmpImage[url]); - console.log('缓存') - return; - } - try { - const response = await fetch(url); - const blob = await response.blob(); - const base = `data:${response.headers.get('content-type')};base64,${btoa(String.fromCharCode(...new Uint8Array(await blob.arrayBuffer())))}` - tmpImage[url] = base - resolve(base) - }catch (e) { - resolve(url); - } - }) - + if(tmpImage[url]){ + resolve(tmpImage[url]); + console.log('缓存') + return; + } + try { + const response = await fetch(url); + const blob = await response.blob(); + const base = `data:${response.headers.get('content-type')};base64,${btoa(String.fromCharCode(...new Uint8Array(await blob.arrayBuffer())))}` + tmpImage[url] = base + resolve(base) + }catch (e) { + resolve(url); + } }) }