lingling
/
welfare-admin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: 解决冲突

This commit is contained in:
cgd 2022-03-16 14:45:59 +08:00
parent 8a3bc17497 81d2b6687d
commit f9508aa776
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/views/course/CoursewareList.vue
View File

@ -56,9 +56,11 @@ export default {
return res
})
},
courseType: ['视频','文本'],
columns: [
{ title: '课件名称', width: '160px', align: 'center', dataIndex: 'name', key: 'name' },
{ title: '课件时长/分', width: '160px', align: 'center', dataIndex: 'duration', key: 'duration' },
{ title: '课件时长/分', width: '160px', align: 'center', dataIndex: 'duration', key: 'duration', customRender: (text, record, index) => { if(!text) {return '-' } else {return text} }},
{ title: '类别', width: 'auto', align: 'center', dataIndex: 'type', key: 'type', customRender: (text, record, index) => { return this.courseType[Number(text) - 1] } },
{ title: '课件大小(MB)', width: '160px', align: 'center', dataIndex: 'sizeStr', key: 'sizeStr' },
{ title: '操作', key: 'operation', width: '200px', align: 'center', scopedSlots: { customRender: 'action' } },
],

8
src/views/course/question/QuestionAdd.vue
View File

@ -118,8 +118,8 @@
</a-radio-group>
</a-tab-pane>
<!-- 简答题 -->
<a-tab-pane key="4" tab="简答" :disabled="shortAnswer.disabled">
<!-- 简答题 20220316关闭入口 -->
<a-tab-pane v-if="false" key="4" tab="简答" :disabled="shortAnswer.disabled">
<a-card title="题目（题干内容）" :bordered="false">
<a-textarea placeholder="" :rows="6" v-model="shortAnswer.questionName" style="width: 100%" />
</a-card>
@ -132,8 +132,8 @@
</a-card>
</a-tab-pane>
<!-- 填空题 -->
<a-tab-pane key="5" tab="填空" :disabled="Completion.disabled">
<!-- 填空题 20220316关闭入口 -->
<a-tab-pane v-if="false" key="5" tab="填空" :disabled="Completion.disabled">
<a-card title="题目（题干内容）" :bordered="false">
<a-textarea placeholder="" :rows="6" v-model="Completion.questionName" style="width: 100%" />
</a-card>