From f6c243aed384cd1a664c6401d1a493960da94b39 Mon Sep 17 00:00:00 2001 From: Vce Date: Wed, 5 Jun 2024 19:31:49 +0800 Subject: [PATCH] =?UTF-8?q?=E9=99=90=E5=88=B6=E5=8D=B1=E5=A4=A7=E5=B7=A5?= =?UTF-8?q?=E7=A8=8B=E6=95=B0=E6=8D=AE=E5=8F=AA=E8=83=BD=E7=94=B1=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E8=B4=A6=E5=8F=B7=E5=92=8C=E8=B4=A3=E4=BB=BB=E4=BA=BA?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E6=93=8D=E4=BD=9C=EF=BC=8C=E8=80=8C=E8=B4=A3?= =?UTF-8?q?=E4=BB=BB=E5=8D=95=E4=BD=8D=E7=9A=84=E5=85=B6=E4=BB=96=E4=BA=BA?= =?UTF-8?q?=E5=8F=AA=E8=83=BD=E6=9F=A5=E7=9C=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 4 ++-- src/store/index.js | 18 ++++++++--------- .../dangerousBigProject/detail.vue | 20 +++++++++---------- .../dangerousBigProject/index.vue | 12 ++++++++++- 4 files changed, 32 insertions(+), 22 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index c2a2effa..6432dc38 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -86,8 +86,8 @@ if (process.env.NODE_ENV == "development") { // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 // axios.defaults.baseURL = "http://192.168.34.221:9111/"; //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 - axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 + axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 // axios.defaults.baseURL ='http://101.43.164.214:45020/' //沈阳和盈 // axios.defaults.baseURL ='http://183.249.224.118:9000/' //嘉兴王江泾公用码头 // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 diff --git a/src/store/index.js b/src/store/index.js index 1051e31c..b910a264 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,8 +48,8 @@ export default new Vuex.Store({ PAGESIZRS: [10, 20, 30, 50], // UPLOADURL:' http://101.43.164.214:11111/upload/image/',// 百色 // FILEURL:' http://101.43.164.214:11111/image/',// 百色 - UPLOADURL:'http://182.90.224.237:51234/upload/image/', - FILEURL:'http://182.90.224.237:51234/image/', + // UPLOADURL:'http://182.90.224.237:51234/upload/image/', + // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 @@ -60,16 +60,16 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // UPLOADURL:'http://42.180.188.17:11211/upload/image',//测试 // FILEURL:'http://42.180.188.17:11211/image/',//测试 - // BASEURL: baseUrl - // ? baseUrl - // : window.location.protocol + "//" + window.location.host + "/", //正式环境 - // UPLOADURL: - // window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 - // FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 + BASEURL: baseUrl + ? baseUrl + : window.location.protocol + "//" + window.location.host + "/", //正式环境 + UPLOADURL: + window.location.protocol + "//" + window.location.host + "/upload/image", //正式环境 + FILEURL: window.location.protocol + "//" + window.location.host + "/image/", //正式环境 // // WORKFLOWURL: 'http://47.93.215.234:19998/#/workspace/forms',//鞍钢平台工作流地址(弃用) // // WORKFLOWURL: 'http://47.93.215.234:19098/#/workspace/forms',//鞍钢测试平台工作流地址(弃用) // // WORKFLOWURL: 'http://42.180.188.17:19998/#/workspace/forms',//鞍钢平台工作流地址 - // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 + WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl diff --git a/src/views/projectFront/dangerousBigProject/detail.vue b/src/views/projectFront/dangerousBigProject/detail.vue index 40fad7f5..b84f0e86 100644 --- a/src/views/projectFront/dangerousBigProject/detail.vue +++ b/src/views/projectFront/dangerousBigProject/detail.vue @@ -701,12 +701,12 @@ - + @@ -741,12 +741,12 @@ - + @@ -795,12 +795,12 @@ - + @@ -956,12 +956,12 @@ > - + @@ -1014,12 +1014,12 @@ - + diff --git a/src/views/projectFront/dangerousBigProject/index.vue b/src/views/projectFront/dangerousBigProject/index.vue index 2182f83e..113dd73a 100644 --- a/src/views/projectFront/dangerousBigProject/index.vue +++ b/src/views/projectFront/dangerousBigProject/index.vue @@ -204,6 +204,11 @@ 编辑 -->