From ce668f83d55efca7d8d2a487a070c07cc8a46170 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 18 Aug 2021 16:40:27 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E9=80=80=E5=87=BA=E5=AE=9E?= =?UTF-8?q?=E9=AA=8C=EF=BC=8C=E8=B7=B3=E8=BD=AC=E8=B7=AF=E5=BE=84=E9=94=99?= =?UTF-8?q?=E8=AF=AFbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/config/index.js | 2 +- src/views/Home.vue | 19 ++++++++++++++++--- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/src/config/index.js b/src/config/index.js index c08dc0d..800d14f 100644 --- a/src/config/index.js +++ b/src/config/index.js @@ -1,7 +1,7 @@ const isHh = location.host.includes('10.196.131.73') //是否是河海版本 export default { /** - * @description 域名切换,liuwan:职站测试环境,occupationlab.com:职站正式环境,10.196.131.73:河海版本 + * @description 域名切换,120.78.198.231:职站测试环境,occupationlab.com:职站正式环境,10.196.131.73:河海版本 */ host: (process.env.NODE_ENV === 'development' || location.host.includes('120.78.198.231')) ? 'http://120.78.198.231:8081/' : (location.host.includes('10.196.131.73') ? 'http://10.196.131.73/' : 'http://www.occupationlab.com/'), /** diff --git a/src/views/Home.vue b/src/views/Home.vue index 7ca2624..98a17af 100644 --- a/src/views/Home.vue +++ b/src/views/Home.vue @@ -113,7 +113,6 @@ export default { ? parseInt(sessionStorage.getItem("timer")) : 0, codeKey: 1, - host: this.$config.host }; }, components: { @@ -189,9 +188,23 @@ export default { back() { this.leavePage() if(this.projectPermissions){ - location.href = `${this.host}#/dashboard#2` + // 返回到考核列表 + if(location.host.includes('10.196.131.73')) { // 判断是否是河海 + location.href = `http://120.78.198.231/#/ass/list` + } else if (location.host.includes('120.78.198.231')) { // 判断是否是职站测试服 + location.href = `http://120.78.198.231/#/ass/list` + } else { + location.href = `http://www.occupationlab.com/#/ass/list` + } }else{ - location.href = `${this.host}#/dashboard#1` + // 返回到实验台 + if(location.host.includes('10.196.131.73')) { + location.href = `http://120.78.198.231/#/ass/list` + } else if (location.host.includes('120.78.198.231')) { + location.href = `http://120.78.198.231/#/station/list` + } else { + location.href = `http://www.occupationlab.com/#/station/list` + } } this.$refs.mainindex.getClearTime(); },