From 1c257a36bd34932fff54a5a9e3515701bdf492c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?LAPTOP-S9HJSOEB=5C=E6=98=8A=E5=A4=A9?= Date: Thu, 21 Aug 2025 11:04:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E4=B8=AAbug=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.dev | 3 +- .env.prod | 1 + .env.stage | 1 + .env.test | 1 + src/api/logistics/home/index.ts | 4 + src/api/logistics/street/index.ts | 5 + src/components/camera/ptz.vue | 2 +- src/config/axios/config.ts | 8 +- src/views/Home/Index.vue | 33 +++---- src/views/bpm/model/ModelImportForm.vue | 3 +- src/views/infra/druid/index.vue | 2 +- src/views/infra/server/index.vue | 2 +- src/views/infra/swagger/index.vue | 3 +- src/views/infra/webSocket/index.vue | 2 +- src/views/logistics/checklog/index.vue | 57 +++++++---- src/views/logistics/stock/index.vue | 67 +++++++------ src/views/logistics/stock/stock.vue | 5 +- src/views/logistics/street/index.vue | 95 ++++++++++++++++++- .../wx-reply/components/TabImage.vue | 2 +- .../wx-reply/components/TabMusic.vue | 2 +- .../wx-reply/components/TabVideo.vue | 2 +- .../wx-reply/components/TabVoice.vue | 2 +- src/views/mp/draft/components/CoverSelect.vue | 2 +- src/views/mp/draft/components/NewsForm.vue | 2 +- src/views/mp/material/components/upload.ts | 2 +- src/views/report/jmreport/index.vue | 2 +- src/views/system/user/UserImportForm.vue | 2 +- types/env.d.ts | 1 + 28 files changed, 214 insertions(+), 99 deletions(-) diff --git a/.env.dev b/.env.dev index b6a3c8a..5879789 100644 --- a/.env.dev +++ b/.env.dev @@ -4,7 +4,8 @@ NODE_ENV=production VITE_DEV=true # 请求路径 -VITE_BASE_URL='http://192.168.2.162:48080' +VITE_BASE_URL='http://127.0.0.1:48080' +VITE_BASE_PORT='48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/.env.prod b/.env.prod index e7326b1..3bde575 100644 --- a/.env.prod +++ b/.env.prod @@ -5,6 +5,7 @@ VITE_DEV=false # 请求路径 VITE_BASE_URL='http://192.168.0.162:48080' +VITE_BASE_PORT='48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/.env.stage b/.env.stage index 1bd48a0..dbab68c 100644 --- a/.env.stage +++ b/.env.stage @@ -5,6 +5,7 @@ VITE_DEV=false # 请求路径 VITE_BASE_URL='http://192.168.0.162:48080' +VITE_BASE_PORT='48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/.env.test b/.env.test index 99f433c..b8dbe05 100644 --- a/.env.test +++ b/.env.test @@ -5,6 +5,7 @@ VITE_DEV=false # 请求路径 VITE_BASE_URL='http://192.168.0.162:48080' +VITE_BASE_PORT='48081' # 文件上传类型:server - 后端上传, client - 前端直连上传,仅支持S3服务 VITE_UPLOAD_TYPE=server diff --git a/src/api/logistics/home/index.ts b/src/api/logistics/home/index.ts index 5be1dee..4f01fa0 100644 --- a/src/api/logistics/home/index.ts +++ b/src/api/logistics/home/index.ts @@ -21,5 +21,9 @@ export const homeApi = { stockLaneInventoryStatistics: async () => { return await request.post({ url: `/logistics/stock/laneInventoryStatistics` }) }, + // 首页巷道盘点统计 + stockLaneInventoryStatisticsPie: async () => { + return await request.post({ url: `/logistics/stock/laneInventoryStatisticsPie` }) + }, } diff --git a/src/api/logistics/street/index.ts b/src/api/logistics/street/index.ts index bc8b896..1c0ac04 100644 --- a/src/api/logistics/street/index.ts +++ b/src/api/logistics/street/index.ts @@ -55,6 +55,11 @@ export const StreetApi = { return await request.delete({ url: `/logistics/street/delete?id=` + id }) }, + // 删除巷道 + linkCheck: async (id: number) => { + return await request.get({ url: `/logistics/street/linkCheck?id=` + id }) + }, + // 导出巷道 Excel exportStreet: async (params) => { return await request.download({ url: `/logistics/street/export-excel`, params }) diff --git a/src/components/camera/ptz.vue b/src/components/camera/ptz.vue index 406e84b..afa45b4 100644 --- a/src/components/camera/ptz.vue +++ b/src/components/camera/ptz.vue @@ -149,9 +149,9 @@ diff --git a/src/views/system/user/UserImportForm.vue b/src/views/system/user/UserImportForm.vue index 6b34c41..5c72029 100644 --- a/src/views/system/user/UserImportForm.vue +++ b/src/views/system/user/UserImportForm.vue @@ -52,7 +52,7 @@ const dialogVisible = ref(false) // 弹窗的是否展示 const formLoading = ref(false) // 表单的加载中 const uploadRef = ref() const importUrl = - import.meta.env.VITE_BASE_URL + import.meta.env.VITE_API_URL + '/system/user/import' + window.location.protocol + '//' + window.location.hostname+":"+import.meta.env.VITE_BASE_PORT + import.meta.env.VITE_API_URL + '/system/user/import' const uploadHeaders = ref() // 上传 Header 头 const fileList = ref([]) // 文件列表 const updateSupport = ref(0) // 是否更新已经存在的用户数据 diff --git a/types/env.d.ts b/types/env.d.ts index f3a1aae..7d539cd 100644 --- a/types/env.d.ts +++ b/types/env.d.ts @@ -17,6 +17,7 @@ interface ImportMetaEnv { readonly VITE_APP_DEFAULT_LOGIN_PASSWORD: string readonly VITE_APP_DOCALERT_ENABLE: string readonly VITE_BASE_URL: string + readonly VITE_BASE_PORT: string readonly VITE_UPLOAD_URL: string readonly VITE_API_URL: string readonly VITE_BASE_PATH: string