diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 6778e31c..4486d203 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -84,7 +84,7 @@ 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/' //彭洁远程 @@ -97,7 +97,7 @@ if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://47.93.215.234:9809/'//鞍钢正式地址(弃用) // axios.defaults.baseURL = 'http://42.180.188.17:9809/'//鞍钢正式地址 // axios.defaults.baseURL = 'http://47.93.215.234:11211/'//鞍钢测试地址(弃用) - // axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 + axios.defaults.baseURL = 'http://42.180.188.17:11211/'//鞍钢测试地址 // axios.defaults.baseURL = 'http://jxj.zhgdyun.com:19814/'//测试地址 } else if (process.env.NODE_ENV == 'debug') { diff --git a/src/store/index.js b/src/store/index.js index 5c007c90..5cf3643f 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -52,27 +52,27 @@ export default new Vuex.Store({ // FILEURL:'http://182.90.224.237:51234/image/', // UPLOADURL: "http://http://192.168.34.155:19111/upload/image/", // 洁本地 // FILEURL: "http://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", //坤工作流地址(本地) + // 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", //坤工作流地址(本地) // UPLOADURL:'http://182.90.224.237:51234/upload/image/',// 郭圣雄远程 // FILEURL:'http://182.90.224.237:51234/image/',//郭圣雄远程 // 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://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