Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop
This commit is contained in:
cgd_mac
commit
ad203421ef
|
|
@ -118,7 +118,7 @@ export default {
|
|||
courseQuestion(record) {
|
||||
this.$router.push({
|
||||
path: '/course/question/ExamQuestion',
|
||||
query: { coursewareId: record.id, courseId: this.$route.query.id },
|
||||
query: { coursewareId: record.id, courseId: this.$route.query.id, types: this.$route.query.type },
|
||||
})
|
||||
},
|
||||
|
||||
|
|
@ -128,7 +128,11 @@ export default {
|
|||
if (!this.courseId) preview = true
|
||||
this.$router.push({
|
||||
path: '/course/CoursewarePreview',
|
||||
query: { coursewareId: record.id, courseId: this.$route.query.id || this.courseId },
|
||||
query: {
|
||||
coursewareId: record.id,
|
||||
courseId: this.$route.query.id || this.courseId,
|
||||
types: this.$route.query.type,
|
||||
},
|
||||
})
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -99,13 +99,12 @@ export default {
|
|||
props: {
|
||||
coursewareId: {
|
||||
type: Number,
|
||||
}
|
||||
},
|
||||
watch: {
|
||||
},
|
||||
watch: {},
|
||||
data() {
|
||||
return {
|
||||
images:[],
|
||||
images: [],
|
||||
type: 1,
|
||||
isactive: 0,
|
||||
queryParam: { coursewareId: this.$route.query.coursewareId || this.coursewareId },
|
||||
|
|
@ -134,7 +133,7 @@ export default {
|
|||
}
|
||||
},
|
||||
created() {
|
||||
console.log('porp - coursewareId :',this.coursewareId)
|
||||
console.log('porp - coursewareId :', this.coursewareId)
|
||||
let parameter = {}
|
||||
coursewareDeatil(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||
//课件内容
|
||||
|
|
@ -142,8 +141,8 @@ export default {
|
|||
if (this.courseware.videoList.length > 0) {
|
||||
//视频截取的封面图
|
||||
if (this.courseware.image != '' || this.courseware.image) {
|
||||
this.images = this.courseware.image.split(",");
|
||||
this.playerOptions.poster = this.images[0];
|
||||
this.images = this.courseware.image.split(',')
|
||||
this.playerOptions.poster = this.images[0]
|
||||
}
|
||||
//课件视频展现
|
||||
if (this.courseware.type == '1') this.play(this.courseware.videoList[0].path, 0)
|
||||
|
|
@ -164,7 +163,10 @@ export default {
|
|||
methods: {
|
||||
//返回
|
||||
goback() {
|
||||
this.$router.push({ path: '/course/CoursewareList', query: { id: this.$route.query.courseId } })
|
||||
this.$router.push({
|
||||
path: '/course/CoursewareList',
|
||||
query: { id: this.$route.query.courseId, type: this.$route.query.types },
|
||||
})
|
||||
},
|
||||
|
||||
//选择播放的文件/下载的文件
|
||||
|
|
@ -178,10 +180,9 @@ export default {
|
|||
// 加载视频
|
||||
this.playerOptions.sources = []
|
||||
this.playerOptions.sources.push({ type: 'video/mp4', src: path })
|
||||
console.log("index",index);
|
||||
console.log("images",this.images);
|
||||
console.log('index', index)
|
||||
console.log('images', this.images)
|
||||
this.playerOptions.poster = this.images[index]
|
||||
|
||||
}
|
||||
},
|
||||
|
||||
|
|
|
|||
|
|
@ -26,8 +26,8 @@ export default {
|
|||
selectedRowKeys: [],
|
||||
selectedRows: [],
|
||||
form: {
|
||||
ids:'',
|
||||
coursewareId:''
|
||||
ids: '',
|
||||
coursewareId: '',
|
||||
},
|
||||
loadData: (parameter) => {
|
||||
return requiredList(Object.assign(parameter, this.queryParam)).then((res) => {
|
||||
|
|
@ -47,7 +47,10 @@ export default {
|
|||
methods: {
|
||||
//返回到课件列表
|
||||
goback() {
|
||||
this.$router.push({ path: '/course/CoursewareList', query: { id: this.$route.query.courseId } })
|
||||
this.$router.push({
|
||||
path: '/course/CoursewareList',
|
||||
query: { id: this.$route.query.courseId, type: this.$route.query.types },
|
||||
})
|
||||
},
|
||||
|
||||
onSelectChange(selectedRowKeys, selectedRows) {
|
||||
|
|
@ -59,15 +62,15 @@ export default {
|
|||
|
||||
//确定
|
||||
save() {
|
||||
this.form.ids = this.selectedRowKeys.toString();
|
||||
this.form.coursewareId = this.$route.query.coursewareId;
|
||||
this.form.ids = this.selectedRowKeys.toString()
|
||||
this.form.coursewareId = this.$route.query.coursewareId
|
||||
console.log('from:{}', this.form)
|
||||
|
||||
addOrUpdate(this.form).then((res) => {
|
||||
if (res.code == 200) {
|
||||
this.$message.info('保存成功')
|
||||
//新增完成后直接返回课程列表
|
||||
this.goback();
|
||||
this.goback()
|
||||
}
|
||||
})
|
||||
},
|
||||
|
|
@ -77,7 +80,7 @@ export default {
|
|||
// 查询所有题目id列表
|
||||
requiredQuestionId({ coursewareId: this.$route.query.coursewareId }).then((res) => {
|
||||
console.log('+++++++++++++', res)
|
||||
this.selectedRowKeys = res.data;
|
||||
this.selectedRowKeys = res.data
|
||||
})
|
||||
},
|
||||
},
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@
|
|||
<a-textarea placeholder="" :rows="6" v-model="radio.answerD" style="width: 100%" />
|
||||
</a-card>
|
||||
<a-card title="答案解析" :bordered="false">
|
||||
<a-textarea placeholder="" :rows="6" v-model="radio.asnwerParse" style="width: 100%" />
|
||||
<a-textarea placeholder="" :rows="6" v-model="radio.answerParse" style="width: 100%" />
|
||||
</a-card>
|
||||
</a-radio-group>
|
||||
</a-tab-pane>
|
||||
|
|
@ -95,7 +95,7 @@
|
|||
</a-card>
|
||||
</a-checkbox-group>
|
||||
<a-card title="答案解析" :bordered="false">
|
||||
<a-textarea placeholder="" :rows="6" v-model="multiselect.asnwerParse" style="width: 100%" />
|
||||
<a-textarea placeholder="" :rows="6" v-model="multiselect.answerParse" style="width: 100%" />
|
||||
</a-card>
|
||||
</a-tab-pane>
|
||||
|
||||
|
|
@ -113,7 +113,7 @@
|
|||
</template>
|
||||
</a-card>
|
||||
<a-card title="答案解析" :bordered="false">
|
||||
<a-textarea placeholder="" :rows="6" v-model="estimate.asnwerParse" style="width: 100%" />
|
||||
<a-textarea placeholder="" :rows="6" v-model="estimate.answerParse" style="width: 100%" />
|
||||
</a-card>
|
||||
</a-radio-group>
|
||||
</a-tab-pane>
|
||||
|
|
@ -128,7 +128,7 @@
|
|||
<a-textarea placeholder="" :rows="6" v-model="shortAnswer.rightAnswers" style="width: 100%" />
|
||||
</a-card>
|
||||
<a-card title="答案解析" :bordered="false">
|
||||
<a-textarea placeholder="" :rows="6" v-model="shortAnswer.asnwerParse" style="width: 100%" />
|
||||
<a-textarea placeholder="" :rows="6" v-model="shortAnswer.answerParse" style="width: 100%" />
|
||||
</a-card>
|
||||
</a-tab-pane>
|
||||
|
||||
|
|
@ -151,7 +151,7 @@
|
|||
</div>
|
||||
</a-card>
|
||||
<a-card title="答案解析" :bordered="false">
|
||||
<a-textarea placeholder="" :rows="6" v-model="Completion.asnwerParse" style="width: 100%" />
|
||||
<a-textarea placeholder="" :rows="6" v-model="Completion.answerParse" style="width: 100%" />
|
||||
</a-card>
|
||||
</a-tab-pane>
|
||||
</a-tabs>
|
||||
|
|
|
|||
|
|
@ -50,7 +50,7 @@
|
|||
</div>
|
||||
|
||||
<!-- 显示简答题 -->
|
||||
<div v-if="questionDetail.questionType == 4">
|
||||
<div v-if="questionDetail.questionType == 4 || questionDetail.questionType == 3">
|
||||
<div class="answer">正确答案: {{ questionDetail.rightAnswers }}</div>
|
||||
</div>
|
||||
|
||||
|
|
@ -64,7 +64,7 @@
|
|||
<div class="info_parent" v-if="quesitonList != null && quesitonList.length != 0">
|
||||
<div class="info">解析</div>
|
||||
<div class="info_main">
|
||||
{{ questionDetail.asnwerParse }}
|
||||
{{ questionDetail.answerParse }}
|
||||
</div>
|
||||
</div>
|
||||
<a-divider :style="{ backgroundColor: '#000' }" />
|
||||
|
|
@ -143,6 +143,13 @@ export default {
|
|||
if (this.questionDetail.questionType == '3') this.questionDetail.questionTypeName = '判断题'
|
||||
if (this.questionDetail.questionType == '4') this.questionDetail.questionTypeName = '简答题'
|
||||
if (this.questionDetail.questionType == '5') this.questionDetail.questionTypeName = '填空题'
|
||||
|
||||
if(this.questionDetail.questionType == 3 && this.questionDetail.rightAnswers == 1) {
|
||||
this.questionDetail.rightAnswers = '正确'
|
||||
} else {
|
||||
this.questionDetail.rightAnswers = '错误'
|
||||
}
|
||||
|
||||
})
|
||||
}
|
||||
},
|
||||
|
|
|
|||
Loading…
Reference in New Issue