yujialong 1 year ago
parent 75b9f3fa52
commit 4179b85fe5
  1. 2
      src/pages/assessment/add/index.vue
  2. 3
      src/pages/assessment/list/index.vue
  3. 5
      src/pages/match/list/index.vue
  4. 27
      src/pages/station/preview/index.vue

@ -529,7 +529,7 @@ export default {
this.form.curriculumId = curItem.cid this.form.curriculumId = curItem.cid
this.submiting = true this.submiting = true
if (this.form.id) { 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 this.updateTime = 0
util.successMsg("修改成功"); util.successMsg("修改成功");
cb ? cb() : this.$router.back() cb ? cb() : this.$router.back()

@ -459,7 +459,8 @@ export default {
this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1`) this.$router.push(`/achievement/project?id=${row.id}&projectName=${row.projectName}&permissions=1`)
}, },
start (row) { 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("启动成功!"); util.successMsg("启动成功!");
this.getData(1); this.getData(1);
}).catch(err => { }).catch(err => {

@ -393,12 +393,13 @@ export default {
const data = [] const data = []
row.competitionStageList.map(e => { row.competitionStageList.map(e => {
const stage = row.playingStages.find(n => n.contentId === e.contentId && n.newEndTime) 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) data.push(stage || e)
}) })
this.$post(this.api.editCompetitionContent, { this.$post(this.api.editCompetitionContent, {
competitionContents: data competitionContents: data
}).then(res => { }).then(async res => {
await this.$post(`${this.api.refreshPageNotification}?content=1`)
util.successMsg('修改成功') util.successMsg('修改成功')
this.modifyVisible = false this.modifyVisible = false
this.getData() this.getData()

@ -72,6 +72,18 @@
<div class="video_wid" <div class="video_wid"
id="player"></div> id="player"></div>
</div> </div>
<div class="inner"
v-else-if="videoSrc">
<video class="video"
width="100%"
height="100%"
autoplay
controls>
<source :src="videoSrc"
type="video/mp4">
您的浏览器不支持 video 标签
</video>
</div>
</div> </div>
<div class="catalog"> <div class="catalog">
<div class="m-b-20"> <div class="m-b-20">
@ -472,6 +484,7 @@ export default {
currentPage: 0, // pdf currentPage: 0, // pdf
pageCount: 0, // pdf pageCount: 0, // pdf
fileType: "pdf", // fileType: "pdf", //
videoSrc: '',
desShrink: false, desShrink: false,
projectVisible: false, projectVisible: false,
projects: [], projects: [],
@ -801,14 +814,17 @@ export default {
// //
if (this.overdue || showDia) { if (this.overdue || showDia) {
this.curLink = `${chapterName}${row.name}`; // + this.curLink = `${chapterName}${row.name}`; // +
this.playauth = '' this.playAuth = ''
this.coverUrl = '' this.coverUrl = ''
this.pdfSrc = '' this.pdfSrc = ''
this.iframeSrc = '' this.iframeSrc = ''
this.videoSrc = ''
this.isPPT = false; this.isPPT = false;
this.isWord = false; this.isWord = false;
this.isExcel = false; this.isExcel = false;
if (this.transferType(row.fileType) == "视频") { if (this.transferType(row.fileType) == "视频") {
//
if (row.fileId) {
this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => { this.$get(`${this.api.getPlayAuth}/${row.fileId}`).then(res => {
this.playAuth = res.data.playAuth; this.playAuth = res.data.playAuth;
// //
@ -830,9 +846,10 @@ export default {
}); });
} }
}); });
}).catch(res => { });
}).catch(res => { } else {
}); this.videoSrc = row.fileUrl
}
} else if (this.transferType(row.fileType) == "图片") { } else if (this.transferType(row.fileType) == "图片") {
this.coverUrl = row.fileUrl; this.coverUrl = row.fileUrl;
} else if (row.fileType == "pdf") { } else if (row.fileType == "pdf") {
@ -949,7 +966,9 @@ export default {
util.cookies.set('systemId', id) util.cookies.set('systemId', id)
util.cookies.set('fromManager', 1) util.cookies.set('fromManager', 1)
util.cookies.set('isSubmit', '', -1) util.cookies.set('isSubmit', '', -1)
util.cookies.set('competitionId', '', -1)
util.cookies.set('language', '', -1) util.cookies.set('language', '', -1)
util.cookies.set('className', '', -1)
// 8pythoncookiesystemId // 8pythoncookiesystemId
location.href = process.env.NODE_ENV === 'development' ? location.href = process.env.NODE_ENV === 'development' ?
`http://${location.hostname}:8085/#/` : `http://${location.hostname}:8085/#/` :

Loading…
Cancel
Save