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

Merge branch 'develop' of https://gitee.com/siwa-team/dawa-vue into develop

This commit is contained in:
Yjhon 2022-02-24 10:23:53 +08:00
parent 463c488e8c 357753d893
commit 4b9e970a6e
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
src/views/course/CoursewareAddOrUpdate.vue
View File

@ -20,11 +20,11 @@
<a-tree-select v-model="fileUpload.videoForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select> <a-tree-select v-model="fileUpload.videoForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select>
</div> </div>
<div>课件学时：&nbsp; <div>课件学时：&nbsp;
<a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnHours" style="width: 140px" /> <a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnHours" style="width: 140px" />
</div> </div>
<br /> <br />
<div>课件学分：&nbsp; <div>课件学分：&nbsp;
<a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnScore" style="width: 140px" /> <a-input-number :min="0" :max="100" :step="1" v-model="fileUpload.videoForm.learnScore" style="width: 140px" />
</div> </div>
<br /> <br />
<div>课件大小：&nbsp; <div>课件大小：&nbsp;
@ -54,11 +54,11 @@
<a-tree-select v-model="fileUpload.textForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select> <a-tree-select v-model="fileUpload.textForm.classify" style="width: 300px" :tree-data="coursewareClassfiy" placeholder="请选择课程分类"></a-tree-select>
</div> </div>
<div>课件学时：&nbsp; <div>课件学时：&nbsp;
<a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnHours" style="width: 140px" /> <a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnHours" style="width: 140px" />
</div> </div>
<br /> <br />
<div>课件学分：&nbsp; <div>课件学分：&nbsp;
<a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnScore" style="width: 140px" /> <a-input-number :min="0" :max="10" :step="0.1" v-model="fileUpload.textForm.learnScore" style="width: 140px" />
</div> </div>
<br /> <br />
<div>课件大小：&nbsp; <div>课件大小：&nbsp;
@ -154,7 +154,7 @@ import { dictionaryDropDown } from '@/api/sys/dictionaryItem';
export default { export default {
data() { data() {
return { return {
pageName: this.$route.query.coursewareId ? '课件编辑' : '课件新增', pageName: '',
// treeData: [], // treeData: [],
ifResources: this.$route.query.ifResources, ifResources: this.$route.query.ifResources,
coursewareClassfiy: [], coursewareClassfiy: [],
@ -202,7 +202,23 @@ export default {
this.dictionaryDropDown(); this.dictionaryDropDown();
//判断是否加载数据 //判断是否加载数据
if (this.queryParam.coursewareId) this.load(); if (this.queryParam.coursewareId) this.load();
},
// 是否资源库ifResources
console.log("资源库标号"+this.$route.query.ifResources+"课件ID："+this.$route.query.coursewareId)
if(this.$route.query.coursewareId && this.$route.query.ifResources == 1 ) {
this.pageName = '资源库编辑'
}else if(!this.$route.query.coursewareId && this.$route.query.ifResources == 1){
this.pageName = '资源库新增'
}
if(this.$route.query.coursewareId && this.$route.query.ifResources == 0) {
this.pageName = '课件编辑'
}else if(!this.$route.query.coursewareId && this.$route.query.ifResources == 0){
this.pageName = '课件新增'
}
},
methods: { methods: {
//弹框 //弹框
showModal() { showModal() {
@ -242,8 +258,8 @@ export default {
callback(key) { callback(key) {
this.fileUpload.videoForm = {}; this.fileUpload.videoForm = {};
this.fileUpload.textForm = {}; this.fileUpload.textForm = {};
console.log("aaaaaaa ",this.fileUpload.videoForm); console.log('aaaaaaa ', this.fileUpload.videoForm);
console.log("aaaaaaa ",this.fileUpload.textForm); console.log('aaaaaaa ', this.fileUpload.textForm);
this.videoPath = []; //置空文件 this.videoPath = []; //置空文件
this.successOssFile = this.successOssFile.splice(this.successOssFile.length, 0); //清空数组 this.successOssFile = this.successOssFile.splice(this.successOssFile.length, 0); //清空数组
@ -423,7 +439,7 @@ export default {
} }
//给课程ID //给课程ID
this.fileUpload.videoForm.type = "1" this.fileUpload.videoForm.type = '1';
this.fileUpload.videoForm.courseId = this.$route.query.courseId; this.fileUpload.videoForm.courseId = this.$route.query.courseId;
this.fileUpload.videoForm.videoPath = this.videoPath; this.fileUpload.videoForm.videoPath = this.videoPath;
this.fileUpload.videoForm.ifResources = this.$route.query.ifResources || 0; this.fileUpload.videoForm.ifResources = this.$route.query.ifResources || 0;
@ -441,7 +457,7 @@ export default {
} }
//给课程ID //给课程ID
this.fileUpload.textForm.type = "2" this.fileUpload.textForm.type = '2';
this.fileUpload.textForm.courseId = this.$route.query.courseId; this.fileUpload.textForm.courseId = this.$route.query.courseId;
this.fileUpload.textForm.type = this.fileUpload.tabkey; this.fileUpload.textForm.type = this.fileUpload.tabkey;
this.fileUpload.textForm.videoPath = this.videoPath; this.fileUpload.textForm.videoPath = this.videoPath;
@ -487,7 +503,7 @@ export default {
//加载数据 //加载数据
load() { load() {
//判断是否是编辑 //判断是否是编1辑
if (this.queryParam.coursewareId) { if (this.queryParam.coursewareId) {
let parameter = {}; let parameter = {};
coursewareDeatil(Object.assign(parameter, this.queryParam)).then(res => { coursewareDeatil(Object.assign(parameter, this.queryParam)).then(res => {
@ -562,7 +578,6 @@ export default {
// this.fileUpload.textForm.learnScore= 0.0 // this.fileUpload.textForm.learnScore= 0.0
// } // }
// }, // },
}, },
}; };
</script> </script>

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

@ -93,6 +93,7 @@ export default {
courseId: this.$route.query.id, courseId: this.$route.query.id,
type: record.type, type: record.type,
types: this.$route.query.type, types: this.$route.query.type,
ifResources:0
}, },
}) })
}, },