From 52b4308a0bec5c2a1d4bc5478b1662e0a57cc772 Mon Sep 17 00:00:00 2001 From: yujialong <479214531@qq.com> Date: Wed, 13 Oct 2021 14:55:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=B8=AD=E5=8F=B0=E8=BF=9B?= =?UTF-8?q?=E5=85=A5=E9=A1=B9=E7=9B=AE=E7=AE=A1=E7=90=86=E5=90=8E=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E5=88=A4=E5=88=86=E7=82=B9=E9=A1=B5=E9=9D=A2=E8=B7=B3?= =?UTF-8?q?=E8=BD=AC=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/setting.js | 3 ++- src/views/serve/Configure.vue | 2 +- src/views/serve/projectAdd.vue | 25 ++++++++++++------------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/setting.js b/src/setting.js index dbe0acd..a2f02d6 100644 --- a/src/setting.js +++ b/src/setting.js @@ -9,10 +9,11 @@ const isPro = url.includes('120.78.127.12'); //正式服 let jumpPath = ""; let host = ""; if (isDev) { - jumpPath = "http://192.168.31.154:8087/"; // 本地需要启动判分点系统 + // jumpPath = "http://192.168.31.154:8087/"; // 本地调试-需要启动本地判分点系统 // host = 'http://192.168.31.216:9000'// 榕 // host = 'http://192.168.31.125:9000'// 坤 // host = 'http://192.168.31.137:9000'// 赓 + jumpPath = "http://39.108.250.202/judgmentPoint/"; host = "http://39.108.250.202:9000"; } else if (isTest) { jumpPath = "http://39.108.250.202/judgmentPoint/"; diff --git a/src/views/serve/Configure.vue b/src/views/serve/Configure.vue index 0c9f0b3..d85f095 100644 --- a/src/views/serve/Configure.vue +++ b/src/views/serve/Configure.vue @@ -185,7 +185,7 @@ export default { this.$router.push("/addconfigure"); }, getIntoProject(row) { - this.$router.push(`/projectList/?systemId=${row.systemId}&show=1`) + this.$router.push(`/projectList?systemId=${row.systemId}&show=1`) }, getIntoJudgement(row) { // console.log(`${Setting.jumpPath}#/?systemId=${row.systemId}&token=${this.token}&referrer=${btoa(location.href)}`); diff --git a/src/views/serve/projectAdd.vue b/src/views/serve/projectAdd.vue index 7074f55..5d6a95a 100644 --- a/src/views/serve/projectAdd.vue +++ b/src/views/serve/projectAdd.vue @@ -221,7 +221,6 @@ export default { }, data() { return { - host: Setting.apiBaseURL, projectId: this.$route.query.projectId, systemList: Setting.systemList, token: btoa(sessionStorage.getItem('token')), @@ -608,42 +607,42 @@ export default { }, toJudgePoint(type, row) { // 进入判分点系统 this.handleCacheData(); - // let host = this.host; - let host = "http://192.168.31.154:8087/"; // 本地 + let jumpPath = Setting.jumpPath; + // let jumpPath = "http://192.168.31.154:8087/"; // 本地 let { systemId } = this.projectManage; let href = ""; if (type === "view") { // 查看 if (systemId == 2) { - href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; + href = `${jumpPath}/#/programOption?id=${row.judgmentPointsId}`; } else if (systemId == 3) { - href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; + href = `${jumpPath}/#/programOptions?id=${row.judgmentPointsId}`; } else if (systemId == 11) { // 交易类判分点（银行综合系统） - href = `${host}jdTrials/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; + href = `${jumpPath}/#/Transaction?isView=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } else { // 编程类判分点（python子系统） - href = `${host}jdTrials/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; + href = `${jumpPath}/#/program?isView=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } } else if (type === "edit") { // 自定义（老师端隐藏此功能） if (systemId == 2) { - href = `${host}jdTrials/#/programOption?id=${row.judgmentPointsId}`; + href = `${jumpPath}/#/programOption?id=${row.judgmentPointsId}`; } else if (systemId == 3) { - href = `${host}jdTrials/#/programOptions?id=${row.judgmentPointsId}`; + href = `${jumpPath}/#/programOptions?id=${row.judgmentPointsId}`; } else if (systemId == 11) { // 交易类判分点（银行综合系统） - href = `${host}jdTrials/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; + href = `${jumpPath}/#/Transaction?isEdit=true&systemId=${systemId}&lcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } else { // 编程类判分点（python子系统） - href = `${host}jdTrials/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; + href = `${jumpPath}/#/program?isEdit=true&systemId=${systemId}&bcId=${row.judgmentId}&token=${this.token}&referrer=${btoa(location.href)}`; } } else if (type === 'home') { if (systemId == 2 || systemId == 3) { - href = `${host}jdTrials/#/list`; + href = `${jumpPath}/#/list`; } else { // 进入判分点系统首页（老师端隐藏此功能） - href = `${host}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`; + href = `${jumpPath}#/?systemId=${systemId}&token=${this.token}&referrer=${btoa(location.href)}`; } } location.href = href;