From 1a146dea2406a34235ee550de83ccc207c8d3935 Mon Sep 17 00:00:00 2001 From: e <2432808546@qq.com> Date: Wed, 17 Nov 2021 18:58:01 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/ass/list/index.vue | 100 ++++++++++++++++++++--------------- src/setting.js | 4 +- 2 files changed, 58 insertions(+), 46 deletions(-) diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index c40c3b9..fd4ae3a 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -190,7 +190,14 @@ export default { invitationCode: "", searchTimer: null, curRow: {}, - ticker: null // 倒计时定时器 + ticker: null, // 倒计时定时器 + item:{ + + }, + projectId:null, + url:'', + cid:null, + systemId:null, }; }, computed: { @@ -331,23 +338,25 @@ export default { this.getData(); }, entry(row) { // 进入考核 - if (row.status === 0) { + this.item = row + if (row.status == 0) { return util.warningMsg("该实验尚未开始"); - } else if (row.status === 2) { + } else if (row.status == 2) { return util.warningMsg("该实验已经结束"); } else { this.curRow = row; - if (row.isCode === 0) { // 是否启用邀请码(0、未启用 1、启用) - this.goSubSystem(); - } else { + if (row.isEnableCode == 0) { // 是否启用邀请码(0、未启用 1、启用) this.$post(`${this.api.enterExam}?assessmentId=${row.assessmentId}&classId=${row.classId}`).then(res => { - if (res.message == "false") { - this.icVisible = true; - } else { - this.goSubSystem(); - } + console.log(res) + this.projectId = res.projectId + this.url = res.url + this.cid = res.info.cid + this.systemId = res.info.systemId + this.goSubSystem(); }).catch(res => { }); + } else { + this.icVisible = true } } }, @@ -357,14 +366,14 @@ export default { saveIc() { if (!this.invitationCode) return util.warningMsg("请输入邀请码"); if (!this.invitationCode || String(this.invitationCode).length < 6 || isNaN(this.invitationCode)) return util.warningMsg("请输入6位纯数字邀请码"); - let data = { - id: this.curRow.id, - userId: this.userId, - invitationCode: Number(this.invitationCode) - }; - this.$post(this.api.joinPractice, data).then(res => { + this.$post(`${this.api.enterExam}?assessmentId=${this.item.assessmentId}&classId=${this.item.classId}&invitationCode=${this.invitationCode}`).then(res => { util.successMsg("验证成功！"); + console.log(res) this.icVisible = false; + this.projectId = res.projectId + this.url = res.url + this.cid = res.info.cid + this.systemId = res.info.systemId setTimeout(() => { this.goSubSystem(); }, 1000); @@ -379,37 +388,40 @@ export default { util.cookies.set("assessmentId", this.curRow.id); util.cookies.set("studentId", this.studentId); util.cookies.set("userId", this.userId); - util.cookies.set("projectId", this.curRow.projectId); + util.cookies.set("projectId", this.projectId); util.cookies.set("startTime", this.curRow.startTime); util.cookies.set("stopTime", this.curRow.stopTime); let curriculumId = this.curRow.curriculumId; + let token = util.local.get(Setting.tokenKey); let href = ""; - switch (curriculumId) { - case 1: - href = `${host}pyTrials/#/`; - break; - case 4: - href = `${host}pyFinance/#/`; - break; - case 5: - href = `${host}pyProjects/#/`; - break; - case 6: - href = `${host}pyRandom/#/`; - break; - case 7: - href = `${host}pyQuantification/#/`; - break; - case 8: - href = `${host}pyAnalysis/#/`; - break; - case 9: - href = `${host}pyDataclean/#/`; - break; - case 10: - href = `${host}pyAcquisition/#/`; - break; - } + href = `${host}${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}`; + console.log(href) + // switch (curriculumId) { + // // case 1: + // href = `${host}${this.url}/#/?projectId=${this.projectId}`; + // break; + // // case 4: + // // href = `${host}pyFinance/#/?projectId=${this.projectId}`; + // // break; + // // case 5: + // // href = `${host}pyProjects/#/?projectId=${this.projectId}`; + // // break; + // // case 6: + // // href = `${host}pyRandom/#/?projectId=${this.projectId}`; + // // break; + // // case 7: + // // href = `${host}pyQuantification/#/?projectId=${this.projectId}`; + // // break; + // // case 8: + // // href = `${host}pyAnalysis/#/?projectId=${this.projectId}`; + // // break; + // // case 9: + // // href = `${host}pyDataclean/#/?projectId=${this.projectId}`; + // // break; + // // case 10: + // // href = `${host}pyAcquisition/#/?projectId=${this.projectId}`; + // // break; + // } if (!href) return util.errorMsg("该考核非Python考核，请选择其他考核"); location.href = href; // location.href = 'http://192.168.31.154:8080/' diff --git a/src/setting.js b/src/setting.js index 6f28761..e4e84ba 100644 --- a/src/setting.js +++ b/src/setting.js @@ -42,9 +42,9 @@ if (isHh) { title = "职站"; } else if (isDev) { // 本地 - host = "http://39.108.250.202:9000/"; // 中台测试服 + // host = "http://39.108.250.202:9000/"; // 中台测试服 // host = "http://192.168.31.137:9000/"; // 赓 - // host = "http://192.168.31.151:9000/"; // 榕 + host = "http://192.168.31.151:9000/"; // 榕 // host = "http://192.168.31.125:9000/"; // 坤 systemPath = "http://192.168.31.154/"; defaultSubSystem = "http://39.108.250.202/pyTrials/#/";