diff --git a/src/pages/assessment/add/index.vue b/src/pages/assessment/add/index.vue index 626c60c..7422587 100644 --- a/src/pages/assessment/add/index.vue +++ b/src/pages/assessment/add/index.vue @@ -529,7 +529,7 @@ export default { this.form.curriculumId = curItem.cid this.submiting = true if (this.form.id) { - this.$post(this.api.modifyAssessment, this.form).then(res => { + this.$post(this.api.modifyAssessment, this.form).then(async res => { this.updateTime = 0 util.successMsg("修改成功"); cb ? cb() : this.$router.back() diff --git a/src/pages/assessment/list/index.vue b/src/pages/assessment/list/index.vue index b741e1b..b92f74b 100644 --- a/src/pages/assessment/list/index.vue +++ b/src/pages/assessment/list/index.vue @@ -459,7 +459,8 @@ export default { this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1`) }, start (row) { - this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(res => { + this.$post(`${this.api.enableAssessment}?id=${row.id}`).then(async res => { + await this.$post(`${this.api.refreshPageNotification}?content=3-${row.id}`) util.successMsg("启动成功!"); this.getData(1); }).catch(err => { diff --git a/src/pages/match/list/index.vue b/src/pages/match/list/index.vue index 6668d1f..5b70224 100644 --- a/src/pages/match/list/index.vue +++ b/src/pages/match/list/index.vue @@ -393,12 +393,13 @@ export default { const data = [] row.competitionStageList.map(e => { const stage = row.playingStages.find(n => n.contentId === e.contentId && n.newEndTime) - if (stage && stage.newEndTime) stage.endTime = this.formatDate('yyyy-MM-dd hh:mm:ss', stage.newEndTime) + if (stage && stage.newEndTime) stage.endTime = util.formatDate('yyyy-MM-dd hh:mm:ss', stage.newEndTime) data.push(stage || e) }) this.$post(this.api.editCompetitionContent, { competitionContents: data - }).then(res => { + }).then(async res => { + await this.$post(`${this.api.refreshPageNotification}?content=1`) util.successMsg('修改成功') this.modifyVisible = false this.getData() diff --git a/src/pages/station/preview/index.vue b/src/pages/station/preview/index.vue index 078f35f..b02bdf3 100644 --- a/src/pages/station/preview/index.vue +++ b/src/pages/station/preview/index.vue @@ -72,6 +72,18 @@
+
+ +
@@ -472,6 +484,7 @@ export default { currentPage: 0, // pdf文件页码 pageCount: 0, // pdf文件总页数 fileType: "pdf", // 文件类型 + videoSrc: '', desShrink: false, projectVisible: false, projects: [], @@ -801,38 +814,42 @@ export default { // 如果没过期,则正常预览,否则显示购买弹框 if (this.overdue || showDia) { this.curLink = `${chapterName}${row.name}`; // 章节名称+小节名称,小节名称有重复的情况,如果只用小节名称判断,会有同时选中多个的情况 - this.playauth = '' + this.playAuth = '' this.coverUrl = '' this.pdfSrc = '' this.iframeSrc = '' + this.videoSrc = '' this.isPPT = false; this.isWord = false; this.isExcel = false; if (this.transferType(row.fileType) == "视频") { - this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => { - this.playAuth = res.data.playAuth; - // 如果已经产生了实例,则销毁重新创建,不然播放器会播放上一个视频 - if (this.player) { - this.player.dispose() - this.player = null - } - this.$nextTick(() => { + // 阿里云视频点播 + if (row.fileId) { + this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => { + this.playAuth = res.data.playAuth; + // 如果已经产生了实例,则销毁重新创建,不然播放器会播放上一个视频 if (this.player) { - this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth); - } else { - this.player = new Aliplayer({ - id: "player", - width: "100%", - autoplay: false, - vid: row.fileId, - playauth: this.playAuth, - encryptType: 1 //当播放私有加密流时需要设置。 - }); + this.player.dispose() + this.player = null } - }); - - }).catch(res => { - }); + this.$nextTick(() => { + if (this.player) { + this.player.replayByVidAndPlayAuth(row.fileId, this.playAuth); + } else { + this.player = new Aliplayer({ + id: "player", + width: "100%", + autoplay: false, + vid: row.fileId, + playauth: this.playAuth, + encryptType: 1 //当播放私有加密流时需要设置。 + }); + } + }); + }).catch(res => { }); + } else { + this.videoSrc = row.fileUrl + } } else if (this.transferType(row.fileType) == "图片") { this.coverUrl = row.fileUrl; } else if (row.fileType == "pdf") { @@ -949,7 +966,9 @@ export default { util.cookies.set('systemId', id) util.cookies.set('fromManager', 1) util.cookies.set('isSubmit', '', -1) + util.cookies.set('competitionId', '', -1) util.cookies.set('language', '', -1) + util.cookies.set('className', '', -1) // 8个python子系统都跳这个地址,子系统会通过cookie里的systemId识别展示哪套系统 location.href = process.env.NODE_ENV === 'development' ? `http://${location.hostname}:8085/#/` :