diff --git a/src/assets/js/http.js b/src/assets/js/http.js index e97dbb86..f842ac40 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -92,8 +92,8 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL ='http://101.43.164.214:11111/' // 百色三标段项目 // axios.defaults.baseURL = 'http://125.88.207.86:8088/'//中建四局线上(最新)地址 // axios.defaults.baseURL = 'http://125.88.207.86:8099/'//中建四局(沙湖)线上(最新)地址 - axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 - // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址 + // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:15551/'//测试地址 + axios.defaults.baseURL = 'http://47.93.215.234:9809/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index 53c67760..6f07d085 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -48,23 +48,23 @@ 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://192.168.34.221:9111/upload/image/',// 郭圣雄 - FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 - WORKFLOWURL: 'http://192.168.181.67:88/#/workspace/forms',//测试工作流地址(本地) + // UPLOADURL:'http://192.168.34.221:9111/upload/image/',// 郭圣雄 + // FILEURL:'http://192.168.34.221:9111/image/',//郭圣雄 + // WORKFLOWURL: 'http://192.168.181.67:88/#/workspace/forms',//测试工作流地址(本地) // UPLOADURL:'http://jxj.zhgdyun.com:15551/upload/image',//测试 // FILEURL:'http://jxj.zhgdyun.com:15551/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://jxj.zhgdyun.com:9811/#/workspace/forms',//正式工作流地址 - // WORKFLOWURL: 'http://jxj.zhgdyun.com:9814/#/workspace/forms',//正式工作流地址 + WORKFLOWURL: 'http://jxj.zhgdyun.com:9814/#/workspace/forms',//正式工作流地址 //--------------------------------------------------------------------------------------------- // BASEURL: baseUrl // ? baseUrl