From 81f86c3217dfc014c77691d2c48ef3866b8021d5 Mon Sep 17 00:00:00 2001 From: xuhongjie <1943105267@qq.com> Date: Wed, 26 Mar 2025 09:27:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E4=B8=8D=E5=90=8C=E7=8E=AF?= =?UTF-8?q?=E5=A2=83=E4=B8=8B=E9=9C=80=E8=A6=81=E6=B3=A8=E9=87=8A=E4=BB=A3?= =?UTF-8?q?=E7=A0=81=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 ++++ .env.production | 3 +++ src/utils/request.js | 2 +- src/views/auditPages/assetsManagement/email.vue | 4 ++-- src/views/auditPages/assetsManagement/index.vue | 4 ++-- .../auditPages/assetsManagement/mobileApplication.vue | 6 ++++-- src/views/auditPages/assetsManagement/officialAccount.vue | 5 +++-- src/views/auditPages/assetsManagement/program.vue | 6 ++++-- src/views/components/myUpload/index.vue | 8 ++++---- 9 files changed, 27 insertions(+), 15 deletions(-) diff --git a/.env.development b/.env.development index 9cf57aa..43dde51 100644 --- a/.env.development +++ b/.env.development @@ -18,3 +18,7 @@ VUE_APP_BASE_API = 'http://192.168.0.125:9115' # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true + + +# test测试环境（公司服务器）/ official正式环境 +VUE_APP_HJ = 'test' diff --git a/.env.production b/.env.production index ffd1313..8ddebab 100644 --- a/.env.production +++ b/.env.production @@ -7,3 +7,6 @@ ENV = 'production' # 若依管理系统/生产环境 VUE_APP_BASE_API = 'http://39.101.188.84:9115' # VUE_APP_BASE_API = 'http://20.1.0.164/api' + +# test测试环境（公司服务器）/ official太仓正式环境 +VUE_APP_HJ = 'test' diff --git a/src/utils/request.js b/src/utils/request.js index 8123bad..245e220 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -16,7 +16,7 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' const service = axios.create({ // axios中请求配置有baseURL选项，表示请求URL公共部分 // baseURL: process.env.VUE_APP_BASE_API, - baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API, + baseURL: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API : location.origin + '/api' , // 超时 timeout: 50000 }) diff --git a/src/views/auditPages/assetsManagement/email.vue b/src/views/auditPages/assetsManagement/email.vue index 557c1b2..decc486 100644 --- a/src/views/auditPages/assetsManagement/email.vue +++ b/src/views/auditPages/assetsManagement/email.vue @@ -392,12 +392,12 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - // url: process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData" - url: location.origin + "/api/tc/assetEmail/importData", + url: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API + "/tc/assetEmail/importData" : location.origin + "/api/tc/assetEmail/importData", }, }; }, mounted() { + console.log() if (Object.keys(this.$route.params).length != 0) { this.formInline = this.$route.params; } else { diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue index 16be281..6659ab1 100644 --- a/src/views/auditPages/assetsManagement/index.vue +++ b/src/views/auditPages/assetsManagement/index.vue @@ -419,8 +419,8 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - // url: process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" - url: location.origin + "/api/tc/assetCurrent/importData", + + url: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API + "/tc/assetCurrent/import" : location.origin + "/api/tc/assetCurrent/importData", }, }; }, diff --git a/src/views/auditPages/assetsManagement/mobileApplication.vue b/src/views/auditPages/assetsManagement/mobileApplication.vue index 8247d0d..aa333cb 100644 --- a/src/views/auditPages/assetsManagement/mobileApplication.vue +++ b/src/views/auditPages/assetsManagement/mobileApplication.vue @@ -413,8 +413,10 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - // url: process.env.VUE_APP_BASE_API + "/tc/assetApp/importData" - url: location.origin + "/api/tc/assetApp/importData", + + + url: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API + "/tc/assetApp/importData" : location.origin + "/api/tc/assetApp/importData", + }, }; }, diff --git a/src/views/auditPages/assetsManagement/officialAccount.vue b/src/views/auditPages/assetsManagement/officialAccount.vue index 4f13bac..11c1fd1 100644 --- a/src/views/auditPages/assetsManagement/officialAccount.vue +++ b/src/views/auditPages/assetsManagement/officialAccount.vue @@ -412,8 +412,9 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - // url: process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData" - url: location.origin + "/api/tc/assetOfficialAccount/importData", + + + url: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API + "/tc/assetOfficialAccount/importData" : location.origin + "/api/tc/assetOfficialAccount/importData", }, }; }, diff --git a/src/views/auditPages/assetsManagement/program.vue b/src/views/auditPages/assetsManagement/program.vue index 1b633aa..db70c46 100644 --- a/src/views/auditPages/assetsManagement/program.vue +++ b/src/views/auditPages/assetsManagement/program.vue @@ -390,8 +390,10 @@ export default { // 设置上传的请求头部 headers: { Authorization: "Bearer " + getToken() }, // 上传的地址 - // url: process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData" - url: location.origin + "/api/tc/miniPrograms/importData", + + + url: process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API + "/tc/miniPrograms/importData" : location.origin + "/api/tc/miniPrograms/importData", + }, }; }, diff --git a/src/views/components/myUpload/index.vue b/src/views/components/myUpload/index.vue index dcab66f..d437e79 100644 --- a/src/views/components/myUpload/index.vue +++ b/src/views/components/myUpload/index.vue @@ -83,10 +83,10 @@ export default { return { number: 0, uploadList: [], - baseUrl: process.env.VUE_APP_BASE_API, - // baseUrl: location.origin + '/api', - uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 - // uploadFileUrl: location.origin + '/api/common/upload', + baseUrl:process.env.VUE_APP_HJ === "test" ? process.env.VUE_APP_BASE_API :location.origin + '/api', + + url: process.env.VUE_APP_HJ === "test" ?process.env.VUE_APP_BASE_API + "/common/upload" : location.origin + '/api/common/upload', + headers: { Authorization: "Bearer " + getToken(), },