diff --git a/src/pages/ass/list/index.vue b/src/pages/ass/list/index.vue index fd4ae3a..3a8e581 100644 --- a/src/pages/ass/list/index.vue +++ b/src/pages/ass/list/index.vue @@ -198,6 +198,8 @@ export default { url:'', cid:null, systemId:null, + assessmentId:'', + classId:'', }; }, computed: { @@ -339,6 +341,8 @@ export default { }, entry(row) { // 进入考核 this.item = row + this.assessmentId =this.item.assessmentId + this.classId = this.item.classId if (row.status == 0) { return util.warningMsg("该实验尚未开始"); } else if (row.status == 2) { @@ -394,8 +398,9 @@ export default { let curriculumId = this.curRow.curriculumId; let token = util.local.get(Setting.tokenKey); let href = ""; - href = `${host}${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}`; - console.log(href) + let aaa = '' + aaa = host.slice(0,host.length-6) + href = `${aaa}/${this.url}/#/index/list?token=${token}&cid=${this.cid}&systemId=${this.systemId}&projectId=${this.projectId}&assessmentId=${this.assessmentId}&classId=${this.classId}`; // switch (curriculumId) { // // case 1: // href = `${host}${this.url}/#/?projectId=${this.projectId}`; diff --git a/src/pages/record/details/index.vue b/src/pages/record/details/index.vue index 25877ef..7bdf9ad 100644 --- a/src/pages/record/details/index.vue +++ b/src/pages/record/details/index.vue @@ -27,7 +27,11 @@ - + + + diff --git a/src/pages/record/list/ass.vue b/src/pages/record/list/ass.vue index 51af08b..154c155 100644 --- a/src/pages/record/list/ass.vue +++ b/src/pages/record/list/ass.vue @@ -16,7 +16,7 @@ diff --git a/src/setting.js b/src/setting.js index e4e84ba..6f28761 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/#/";