From 2e45a24c7bbc6353513714960c28a834e71c5509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Wed, 8 Jan 2025 12:59:40 +0800 Subject: [PATCH 1/7] =?UTF-8?q?=E6=89=93=E5=8C=85=E6=9B=B4=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.production | 4 ++-- src/utils/request.js | 4 ++-- src/views/auditPages/assetsManagement/email.vue | 4 ++-- src/views/auditPages/assetsManagement/index.vue | 4 ++-- .../auditPages/assetsManagement/mobileApplication.vue | 4 ++-- src/views/auditPages/assetsManagement/officialAccount.vue | 4 ++-- src/views/auditPages/assetsManagement/program.vue | 4 ++-- src/views/components/myUpload/index.vue | 8 ++++---- vue.config.js | 4 ++-- 9 files changed, 20 insertions(+), 20 deletions(-) diff --git a/.env.production b/.env.production index ffd1313..f542820 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统 ENV = 'production' # 若依管理系统/生产环境 -VUE_APP_BASE_API = 'http://39.101.188.84:9115' -# VUE_APP_BASE_API = 'http://20.1.0.164/api' +# VUE_APP_BASE_API = 'http://39.101.188.84:9115' +VUE_APP_BASE_API = 'http://20.1.0.164/api' diff --git a/src/utils/request.js b/src/utils/request.js index 827b69c..b286e75 100644 --- a/src/utils/request.js +++ b/src/utils/request.js @@ -15,8 +15,8 @@ axios.defaults.headers['Content-Type'] = 'application/json;charset=utf-8' // 创建axios实例 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_BASE_API, + baseURL: process.env.NODE_ENV === "production" ? location.origin + '/api' : process.env.VUE_APP_BASE_API, // 超时 timeout: 50000 }) diff --git a/src/views/auditPages/assetsManagement/email.vue b/src/views/auditPages/assetsManagement/email.vue index b6be177..5eaa5d2 100644 --- a/src/views/auditPages/assetsManagement/email.vue +++ b/src/views/auditPages/assetsManagement/email.vue @@ -239,8 +239,8 @@ 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_BASE_API + "/tc/assetEmail/importData" + url: location.origin + "/api/tc/assetEmail/importData" }, } }, diff --git a/src/views/auditPages/assetsManagement/index.vue b/src/views/auditPages/assetsManagement/index.vue index 69fce46..54b3962 100644 --- a/src/views/auditPages/assetsManagement/index.vue +++ b/src/views/auditPages/assetsManagement/index.vue @@ -258,8 +258,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_BASE_API + "/tc/assetCurrent/import" + url: location.origin + "/api/tc/assetCurrent/importData" }, } }, diff --git a/src/views/auditPages/assetsManagement/mobileApplication.vue b/src/views/auditPages/assetsManagement/mobileApplication.vue index 1cd4715..be5ce90 100644 --- a/src/views/auditPages/assetsManagement/mobileApplication.vue +++ b/src/views/auditPages/assetsManagement/mobileApplication.vue @@ -265,8 +265,8 @@ 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_BASE_API + "/tc/assetApp/importData" + url: location.origin + "/api/tc/assetApp/importData" }, } }, diff --git a/src/views/auditPages/assetsManagement/officialAccount.vue b/src/views/auditPages/assetsManagement/officialAccount.vue index 9afc76e..35ee3c9 100644 --- a/src/views/auditPages/assetsManagement/officialAccount.vue +++ b/src/views/auditPages/assetsManagement/officialAccount.vue @@ -251,8 +251,8 @@ 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_BASE_API + "/tc/assetOfficialAccount/importData" + url: location.origin + "/api/tc/assetOfficialAccount/importData" }, } }, diff --git a/src/views/auditPages/assetsManagement/program.vue b/src/views/auditPages/assetsManagement/program.vue index 1d0630f..df2075b 100644 --- a/src/views/auditPages/assetsManagement/program.vue +++ b/src/views/auditPages/assetsManagement/program.vue @@ -250,8 +250,8 @@ 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_BASE_API + "/tc/miniPrograms/importData" + url: location.origin + "/api/tc/miniPrograms/importData" }, } }, diff --git a/src/views/components/myUpload/index.vue b/src/views/components/myUpload/index.vue index b92e585..173826c 100644 --- a/src/views/components/myUpload/index.vue +++ b/src/views/components/myUpload/index.vue @@ -67,10 +67,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_BASE_API, + baseUrl: location.origin + '/api', + // uploadFileUrl: process.env.VUE_APP_BASE_API + "/common/upload", // 上传文件服务器地址 + uploadFileUrl: location.origin + '/api/common/upload', headers: { Authorization: "Bearer " + getToken(), }, diff --git a/vue.config.js b/vue.config.js index 3776cf0..6a0ac7f 100644 --- a/vue.config.js +++ b/vue.config.js @@ -18,8 +18,8 @@ module.exports = { // 部署生产环境和开发环境下的URL。 // 默认情况下,Vue CLI 会假设你的应用是被部署在一个域名的根路径上 // 例如 https://www.ruoyi.vip/。如果应用被部署在一个子路径上,你就需要用这个选项指定这个子路径。例如,如果你的应用被部署在 https://www.ruoyi.vip/admin/,则设置 baseUrl 为 /admin/。 - publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", - // publicPath: process.env.NODE_ENV === "production" ? "./" : "/", + // publicPath: process.env.NODE_ENV === "production" ? "/demo/TcAssetVerificationPc" : "/", + publicPath: process.env.NODE_ENV === "production" ? "./" : "/", // 在npm run build 或 yarn build 时 ,生成文件的目录名称(要和baseUrl的生产环境路径一致)(默认dist) outputDir: 'dist', // 用于放置生成的静态资源 (js、css、img、fonts) 的;(项目打包之后,静态资源会放在这个文件夹下) From d427ef8dd68e223c49d5d9384cf3af74e4b66f86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Wed, 8 Jan 2025 13:17:17 +0800 Subject: [PATCH 2/7] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=90=9C=E7=B4=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/auditPages/taskManagement/info.vue | 5 +++++ src/views/unitPages/myTask/info.vue | 5 +++++ 2 files changed, 10 insertions(+) diff --git a/src/views/auditPages/taskManagement/info.vue b/src/views/auditPages/taskManagement/info.vue index f4990a7..8aaedbc 100644 --- a/src/views/auditPages/taskManagement/info.vue +++ b/src/views/auditPages/taskManagement/info.vue @@ -52,6 +52,11 @@ --> + + + + + diff --git a/src/views/unitPages/myTask/info.vue b/src/views/unitPages/myTask/info.vue index a516b79..a95b815 100644 --- a/src/views/unitPages/myTask/info.vue +++ b/src/views/unitPages/myTask/info.vue @@ -52,6 +52,11 @@ --> + + + + + From f6aa17792b8cdb2a231dc02773a0b8b1e5bca417 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E5=8A=B2=E9=BE=99?= <2860996570@qq.com> Date: Fri, 10 Jan 2025 13:47:15 +0800 Subject: [PATCH 3/7] =?UTF-8?q?=E6=9B=B4=E6=96=B01.8=E6=8F=90=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .env.development | 4 +- .env.production | 4 +- src/App.vue | 10 + src/utils/request.js | 4 +- .../auditPages/assetsManagement/email.vue | 4 +- .../auditPages/assetsManagement/index.vue | 4 +- .../assetsManagement/mobileApplication.vue | 4 +- .../assetsManagement/officialAccount.vue | 4 +- .../auditPages/assetsManagement/program.vue | 4 +- src/views/auditPages/taskManagement/info.vue | 57 +- src/views/components/assetsType/index_v2.vue | 357 +- .../components/myAssetsType/index_v2.vue | 532 ++- src/views/components/myUpload/index.vue | 8 +- src/views/components/renwuType/index_v1.vue | 58 +- src/views/components/renwuType/index_v2.vue | 158 +- src/views/components/renwuType/index_v3.vue | 58 +- src/views/components/renwuType/index_v4.vue | 57 +- .../components/renwuType/webType1 copy.vue | 3046 +++++++++++++++++ src/views/components/renwuType/webType1.vue | 753 ++-- src/views/components/renwuType/webType2DW.vue | 11 +- src/views/unitPages/myTask/info.vue | 11 +- 21 files changed, 4269 insertions(+), 879 deletions(-) create mode 100644 src/views/components/renwuType/webType1 copy.vue diff --git a/.env.development b/.env.development index ffd52ea..7009762 100644 --- a/.env.development +++ b/.env.development @@ -6,7 +6,9 @@ ENV = 'development' # 若依管理系统/开发环境 # VUE_APP_BASE_API = 'http://192.168.0.112:9115' -VUE_APP_BASE_API = 'http://39.101.188.84:9115' +# VUE_APP_BASE_API = 'http://39.101.188.84:9115' +VUE_APP_BASE_API = 'http://192.168.0.112:9115' + # 路由懒加载 VUE_CLI_BABEL_TRANSPILE_MODULES = true diff --git a/.env.production b/.env.production index f542820..ffd1313 100644 --- a/.env.production +++ b/.env.production @@ -5,5 +5,5 @@ VUE_APP_TITLE = 太仓市网络和数据资产采集管理系统 ENV = 'production' # 若依管理系统/生产环境 -# VUE_APP_BASE_API = 'http://39.101.188.84:9115' -VUE_APP_BASE_API = 'http://20.1.0.164/api' +VUE_APP_BASE_API = 'http://39.101.188.84:9115' +# VUE_APP_BASE_API = 'http://20.1.0.164/api' diff --git a/src/App.vue b/src/App.vue index b92ea37..2f2a1dc 100644 --- a/src/App.vue +++ b/src/App.vue @@ -20,6 +20,16 @@ export default { } } }; +/* + !!process.env.VUE_APP_BASE_API 开头的为公司环境 + + assetsManagement 除了assetsAuth.vue,其他文件切换 上传文件 公司环境正式环境 + myUpload 切换正式环境,公司环境 + vue.config.js 切换公司环境,正式环境 + .env.production 切换公司环境,正式环境 + request.js 切换公司环境,正式环境 + +*/