mirror of
https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git
synced 2025-12-11 03:46:44 +08:00
Merge branch 'zcwy-master' into 'master'
Zcwy master See merge request !112
This commit is contained in:
@@ -102,10 +102,10 @@
|
||||
<homework v-if="resType == 60 && studyId != ''" :studyId="studyId" :content="contentData"></homework>
|
||||
</div>
|
||||
<div v-if="resType == 61">
|
||||
<exam v-if="resType == 61 && studyId != '' " :studyId="studyId" :courseType="courseType" :content="contentData"></exam>
|
||||
<exam v-if="resType == 61 && studyId != '' " :studyId="studyId" :content="contentData"></exam>
|
||||
</div>
|
||||
<div v-if="resType == 62" style="padding:5px">
|
||||
<assess v-if="resType == 62 && studyId != '' && contentData.id" :courseType="courseType" :studyId="studyId" :content="contentData">
|
||||
<assess v-if="resType == 62 && studyId != '' && contentData.id" :studyId="studyId" :content="contentData">
|
||||
</assess>
|
||||
</div>
|
||||
</div>
|
||||
@@ -320,7 +320,6 @@
|
||||
},
|
||||
data() {
|
||||
return {
|
||||
courseType: 0,
|
||||
trueFalse: true,
|
||||
audiences:'',
|
||||
isCrowd:false,
|
||||
@@ -608,6 +607,7 @@
|
||||
this.saveStudyDuration();
|
||||
|
||||
if (r.contentType == 10 || r.contentType == 20) {
|
||||
this.trueFalse = true
|
||||
if (r.content.startsWith('\{')) {
|
||||
this.curriculumData = JSON.parse(r.content);
|
||||
} else {
|
||||
@@ -1191,8 +1191,6 @@
|
||||
audiences:this.audiences
|
||||
}).then(rs => {
|
||||
if (rs.status == 200) {
|
||||
this.courseType = rs.result.course.type
|
||||
this.contentStudysLength = rs.result.contentStudys
|
||||
if(rs.result.contents.length==0){
|
||||
$this.$message.error('课程内容已删除或课程已不再使用');
|
||||
return;
|
||||
|
||||
Reference in New Issue
Block a user