From 2c526757ad0a5298be65c774dc59de39830cf58f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Wed, 5 Jun 2024 20:11:36 +0800 Subject: [PATCH 1/3] 1 --- src/assets/js/http.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 8144bbd1..6e26a1cb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,10 +84,10 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:45011/' //上海优益（上海建工） // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // 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.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://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/' // 百色三标段项目 From 1b2cd60e3f05ec67f2dd0a9268186828dbe6c30a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Wed, 5 Jun 2024 20:12:32 +0800 Subject: [PATCH 2/3] 1 --- src/assets/js/http.js | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 85f6756c..6e26a1cb 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -85,15 +85,9 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://192.168.34.221:28888/' //郭圣雄本地 // axios.defaults.baseURL = 'http://192.168.34.221:28889/' //郭圣雄本地 axios.defaults.baseURL = 'http://192.168.34.221:9111/' //郭圣雄本地 -<<<<<<< HEAD // 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://192.168.34.155:19111/' //彭洁本地 - // axios.defaults.baseURL = 'http://182.90.224.237:51234' //郭圣雄远程 - // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:61212/' //彭洁远程 ->>>>>>> 5e35c709af58a4e55f6b6f747ebbf6e58b14344b // 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/' // 百色三标段项目 From 4e54e5d260eed24183af2dd727d273752b206e3d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E2=80=9DRain=E2=80=9C?= <904416525@qq.com> Date: Wed, 5 Jun 2024 21:40:19 +0800 Subject: [PATCH 3/3] =?UTF-8?q?fix:=20BUG=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/store/index.js | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/src/store/index.js b/src/store/index.js index 03a69acb..f0adcc45 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -44,22 +44,22 @@ export default new Vuex.Store({ }), ], - state: { - 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://192.168.34.155:19111/upload/image/", // 洁本地 - // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 - UPLOADURL: 'http://192.168.34.221:9111/upload/image/', // 郭圣雄本地 - FILEURL: 'http://192.168.34.221:9111/image/', //郭圣雄本地 - // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) - WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) - // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 - // 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/',//测试 + state: { + 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://192.168.34.155:19111/upload/image/", // 洁本地 + // FILEURL: "http://192.168.34.155:19111/image/", //洁本地 + UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄本地 + FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄本地 + // WORKFLOWURL: "http://192.168.34.138:88/#/workspace/forms", //坤工作流地址(本地) + WORKFLOWURL: "http://192.168.34.126:88/#/workspace/forms", //罗峰工作流地址(本地) + // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 + // 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 + "/", //正式环境 @@ -67,7 +67,7 @@ export default new Vuex.Store({ // 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:19998/#/workspace/forms',//鞍钢平台工作流地址 // WORKFLOWURL: "http://42.180.188.17:19098/#/workspace/forms", //鞍钢测试平台工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl