hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-10 19:36:43 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pingcode-1104' into dev0515

Browse Source
This commit is contained in:
zhangsir
2024-11-10 17:26:37 +08:00
parent 1600029a6f ff7dd81608
commit c25c50838f
3 changed files with 21 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/components/Course/catalogCourseware.vue
View File

@@ -51,8 +51,8 @@
</el-radio-group>
<br/>
</div>
<div style="margin-left: 28px;margin-top: 10px;display: flex;">视频时长：
<el-input-number style="width:146px;margin-left:5px;" v-model="curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
<div style="margin-top: 10px;display: flex;">时长（分钟）：
<el-input-number style="width:146px;margin-left:5px;" :precision="0" v-model="curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
</div>
</div>
</div>
@@ -80,8 +80,8 @@
秒</el-radio> -->
</el-radio-group>
</div>
<div style="margin-left: 28px;margin-top: 10px;display: flex;">音频时长：
<el-input-number style="width:146px;margin-left:5px;" v-model="curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
<div style="margin-top: 10px;display: flex;">时长（分钟）：
<el-input-number style="width:146px;margin-left:5px;" :precision="0" v-model="curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
</div>
</div>
<div style="margin-top:35px;text-align: center;"> <el-button type="primary" @click="saveData()" size="mini">保存</el-button> </div>
@@ -395,9 +395,10 @@
if(newVal.content!=''){
if(newVal.content.startsWith('\{')){
this.curriculumData =JSON.parse(newVal.content);
this.curriculumData.duration = (this.curriculumData.duration/60).toFixed(0);
}else{
this.curriculumData.url=newVal.content;
this.curriculumData.duration = newVal.duration;
this.curriculumData.duration = (newVal.duration/60).toFixed(0);
}
}
}
@@ -516,6 +517,8 @@
this.$message.error("请手动输入课件时长");
return;
}
this.curriculumData.duration = this.curriculumData.duration*60;
this.content.duration = this.curriculumData.duration;
this.content.content=JSON.stringify(this.curriculumData);
}
let jsonData={
@@ -652,7 +655,7 @@
this.content.content=cfile.filePath;
}
}
this.curriculumData.duration = cfile.duration;
this.curriculumData.duration = (cfile.duration/60).toFixed(0);
this.content.courseId=this.course.id;
this.content.duration=cfile.duration;//时长
this.content.sortIndex=1;

1
src/components/Course/courseForm.vue
View File

@@ -1328,6 +1328,7 @@ export default {
pass = false;
}
} else if(this.curContent.contentType == 10 || this.curContent.contentType == 20) {// 视频
courseware.curriculumData.duration = Number((courseware.curriculumData.duration*60).toFixed(0));
if(this.curContent.content !== JSON.stringify(courseware.curriculumData)) {
pass = false;
}

19
src/components/Course/weikeContent.vue
View File

@@ -75,8 +75,8 @@
秒</el-radio> -->
</el-radio-group>
</div>
<div style="margin-left: 28px;margin-top: 10px;display: flex;">视频时长：
<el-input-number style="width:146px;margin-left:5px;" v-model="cware.curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
<div style="margin-top: 10px;display: flex;">时长（分钟）：
<el-input-number style="width:146px;margin-left:5px;" v-model="cware.curriculumData.duration" :precision="0" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
</div>
</div>
</div>
@@ -105,8 +105,8 @@
</el-radio-group>
<br/>
</div>
<div style="margin-left: 28px;margin-top: 10px;display: flex;">音频时长：
<el-input-number style="width:146px;margin-left:5px;" v-model="cware.curriculumData.duration" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
<div style="margin-top: 10px;display: flex;">时长（分钟）：
<el-input-number style="width:146px;margin-left:5px;" v-model="cware.curriculumData.duration" :precision="0" size="mini" :min="1" :max="999999999" label="描述文字" controls-position="right"></el-input-number>
</div>
</div>
<div style="margin-top:35px;text-align: center;"> <el-button :loading="loading" type="primary" @click="saveContent(1)" size="mini">保存</el-button> </div>
@@ -845,9 +845,10 @@
console.log(con.content,'con.content')
if(con.content.startsWith('\{')){
$this.cware.curriculumData=JSON.parse(con.content);
$this.cware.curriculumData.duration = ($this.cware.curriculumData.duration/60).toFixed(0);
}else{
$this.cware.curriculumData.url=con.content;
$this.cware.curriculumData.duration = con.duration;
$this.cware.curriculumData.duration = (con.duration/60).toFixed(0);
}
}
$this.cwareChange = deepClone($this.cware);
@@ -995,7 +996,7 @@
this.cware.content.contentName=row.name;
this.cware.content.content=row.filePath;
this.cware.curriculumData.url = row.filePath;
this.cware.curriculumData.duration=row.duration;
this.cware.curriculumData.duration=(row.duration/60).toFixed(0);;
this.cware.content.duration=row.duration;//时长
this.cware.findShow=false;
if(this.cware.content.contentType==40){
@@ -1082,6 +1083,8 @@
this.loading=false;
return;
}
this.cware.curriculumData.duration = (this.cware.curriculumData.duration*60).toFixed(0);
postData.content.duration = this.cware.curriculumData.duration;
postData.content.content=JSON.stringify(this.cware.curriculumData);
this.cwareChange.curriculumData = deepClone(this.cware.curriculumData)
}
@@ -1148,6 +1151,7 @@
if(res.status==200){
if(index==1){
$this.cware.content=res.result.content;
this.cware.curriculumData.duration = (this.cware.curriculumData.duration/60).toFixed(0);
}else if(index==2){
$this.homework.content=res.result.content;
$this.homework.info=res.result.homework;
@@ -1165,7 +1169,6 @@
//if(res.result.homework)
this.$message.success('保存成功');
//保存成功的统一处理
}else{
this.$message.error(res.message);
}
@@ -1231,7 +1234,7 @@
this.cware.curriculumData.url = cfile.filePath;
}
}
this.cware.curriculumData.duration=cfile.duration;
this.cware.curriculumData.duration=(cfile.duration/60).toFixed(0);;
this.cware.content.duration=cfile.duration;//时长
this.saveContent(1);