From f9e1f153a68199164a1728cc8956a217a348a06b Mon Sep 17 00:00:00 2001 From: X_Rian <904416525@qq.com> Date: Mon, 15 Jul 2024 09:03:25 +0800 Subject: [PATCH] =?UTF-8?q?flx=EF=BC=9A=E4=BF=AE=E6=94=B9=E9=85=8D?= =?UTF-8?q?=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/js/http.js | 12 ++++++------ src/components/header.vue | 4 ++-- src/store/index.js | 12 ++++++------ 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/src/assets/js/http.js b/src/assets/js/http.js index 11bebe0a..4b7ef25b 100644 --- a/src/assets/js/http.js +++ b/src/assets/js/http.js @@ -174,7 +174,7 @@ 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:28890/' //郭圣雄本地 - 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/' //彭洁远程 @@ -187,11 +187,11 @@ 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://8.136.222.164:8808/' //中科安信正式地址 - // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 - // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 - // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 + axios.defaults.baseURL = 'http://42.180.188.17:11211/' //鞍钢测试地址 + // axios.defaults.baseURL = 'http://8.136.222.164:8808/' //中科安信正式地址 + // axios.defaults.baseURL = 'http://1.13.185.209:9820/' //中科佳成正式地址 + // axios.defaults.baseURL = 'http://192.168.110.220:9809/' //同济正式地址 + // axios.defaults.baseURL = 'http://192.168.100.4:9809/' //乌丹(合肥启程)新正式地址 } else if (process.env.NODE_ENV == "debug") { axios.defaults.baseURL = "https://www.ceshi.com"; } else if (process.env.NODE_ENV == "production") { diff --git a/src/components/header.vue b/src/components/header.vue index 09d973d4..a9eb3fd3 100644 --- a/src/components/header.vue +++ b/src/components/header.vue @@ -538,8 +538,8 @@ export default { // this.$store.state.userInfo.token this.jumpToken = localStorage.getItem("jumpToken"); // "http://192.168.34.175:8081/#/large" - window.open("http://192.168.34.129:8081/#/large" + "?token=" + this.jumpToken, "_self"); - // window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); + // window.open("http://192.168.34.129:8081/#/large" + "?token=" + this.jumpToken, "_self"); + window.open(this.newBigScreen + "?token=" + this.jumpToken, "_self"); // window.open('http://192.168.34.138:8081/#/large?token=' + this.jumpToken + '&sn=' + this.$store.state.projectSn, "_self")//这里是后台跳到大屏的操作，携带token过去 } // if (this.newBigScreen != null) { diff --git a/src/store/index.js b/src/store/index.js index 7daa647e..dbe151ea 100644 --- a/src/store/index.js +++ b/src/store/index.js @@ -56,14 +56,14 @@ 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/', //郭圣雄本地 + // 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.129:88/#/workspace/forms", //罗峰工作流地址(本地) + // WORKFLOWURL: "http://192.168.34.129: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/', //测试 + 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", //正式环境 @@ -71,7 +71,7 @@ export default new Vuex.Store({ // // 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