diff --git a/src/views/course/CourseAdd.vue b/src/views/course/CourseAdd.vue index 87b39d8..6196511 100644 --- a/src/views/course/CourseAdd.vue +++ b/src/views/course/CourseAdd.vue @@ -29,8 +29,7 @@ - - {{ dataValue }}分钟 + @@ -42,7 +41,7 @@ - + - + - + @@ -146,9 +145,6 @@ export default { }, methods: { - //显示页面上的数字 - onChange(dataValue) {}, - //加载数据 loadData() { if (this.$route.query.id) { diff --git a/src/views/course/CoursewareAddOrUpdate.vue b/src/views/course/CoursewareAddOrUpdate.vue index 3ea2e44..516093a 100644 --- a/src/views/course/CoursewareAddOrUpdate.vue +++ b/src/views/course/CoursewareAddOrUpdate.vue @@ -8,61 +8,62 @@ - +
课件名称： 
-
+
课件学时： 

-
课件学分：  +
课件大小：      MB

- 视频上传：  + 视频上传： +   {{this.uploadButtonText}}    
+
- - + +
课件名称： 
-
+
课件学时： 

-
课件学分：  +
课件大小：      MB
@@ -150,18 +151,19 @@ import { ossUpload } from '@/api/sys/oss'; import { coursewareAdd, coursewareClassList } from '@/api/course/courseware'; // import { listToTree } from '@/utils/util' import { dictToTree } from '@/utils/util'; -import { dictionaryDropDown } from '@/api/sys/dictionaryItem'; +// import { dictionaryDropDown } from '@/api/sys/dictionaryItem'; // const rootParentId = 0 export default { data() { return { - isSave:false, + schedule: 0, //进度 + isSave: false, pageName: '', // treeData: [], ifResources: this.$route.query.ifResources, - coursewareClassfiy: [], + // coursewareClassfiy: [], courseware: {}, //课件详情 queryParam: { coursewareId: this.$route.query.coursewareId }, //编辑传参 successOssFile: [], @@ -203,7 +205,7 @@ export default { components: { STable }, created() { //数据字典加载 - this.dictionaryDropDown(); + // this.dictionaryDropDown(); //判断是否加载数据 if (this.queryParam.coursewareId) this.load(); @@ -227,13 +229,13 @@ export default { // this.classfiy() }, - dictionaryDropDown() { - // 课件分类 - dictionaryDropDown({ dictionaryCode: '0009' }).then(res => { - // 词典转树结构 - this.coursewareClassfiy = dictToTree(res.data, [], 0); - }); - }, + // dictionaryDropDown() { + // // 课件分类 + // dictionaryDropDown({ dictionaryCode: '0009' }).then(res => { + // // 词典转树结构 + // this.coursewareClassfiy = dictToTree(res.data, [], 0); + // }); + // }, //返回 goback() { @@ -277,18 +279,17 @@ export default { }, beforeUpload(file) { - //文件类型 (后缀) - // var suffix = file.name.substring(file.name.lastIndexOf('.') + 1); - // if (this.fileUpload.tabkey == '1' && suffix != 'mp4') { - // return this.$message.error('文件类型必须是mp4'); - // } + console.log('file', file); + const _this = this; + + console.log("fileSize",file.size) //告知用户是否正在上传 this.uploadLoading = true; this.uploadButtonText = '上传中...'; //不让他保存 - this.isSave= true; + this.isSave = true; //处理视频上传 const data = new FormData(); @@ -300,32 +301,50 @@ export default { header['Content-Type'] = 'multipart/form-data'; header[ACCESS_TOKEN] = storage.get(ACCESS_TOKEN); + var config = { + headers: header, + onUploadProgress: function (e) { + console.log(e); + //属性lengthComputable主要表明总共需要完成的工作量和已经完成的工作是否可以被测量 + //如果lengthComputable为false，就获取不到e.total和e.loaded + if (e.lengthComputable) { + let a = ((e.loaded / e.total) * 100).toFixed(2); + // _this.schedule = ((e.loaded / e.total) * 100).toFixed(2) ; //已上传的比例 + console.log('进度', a); + + _this.schedule = parseInt(a) > 99 ? 99 : parseInt(a) + } + }, + }; + + // { headers: header } axios - .post(ossUpload(), data, { headers: header }) + .post(ossUpload(), data, config) .then(res => { this.isSave = false; this.uploadLoading = false; this.uploadButtonText = '选择文件'; if (res.data.code === 200) { this.$message.success('上传成功！'); - + + this.schedule = 100; res.data.uuid = file.uid; res.data.size = file.size; this.successOssFile.push(res.data); //刷新文件大小 this.refreshFileSize(); - } else { this.$message.error(res.data.msg); this.$refs.inputFile.value = ''; } }) .catch(err => { - this.$message.error(err); - this.uploadButtonText = '选择文件'; + console.log("进来了！！！！！",err); + // data.delete("file") // 清空文件 + // this.uploadButtonText = '选择文件'; + this.$message.error("上传失败!视频超出可上传大小范围"); }); - return false; }, @@ -380,13 +399,12 @@ export default { break; } } - + this.schedule = 0; this.refreshFileSize(); }, //保存 save() { - //视频赋给表单里面的字段 this.successOssFile.forEach((item, index) => { this.videoPath.push(item.url); @@ -509,7 +527,7 @@ export default { this.fileUpload.textForm.disabled = true; this.videoServerLink.disabled = true; this.thirdAddress.disabled = true; - + //分配到各自的提交模块 if (this.courseware.type == '1' || this.courseware.type == '2') { this.parentTabKey = '1'; @@ -525,7 +543,7 @@ export default { successOssFile_['url'] = element.path; successOssFile_['size'] = element.size; this.successOssFile.push(successOssFile_); - console.log("文件问见",this.successOssFile); + console.log('文件问见', this.successOssFile); }); if (this.courseware.type == '1') { @@ -558,19 +576,6 @@ export default { } }, - //视频上传和文本上传数据初始化 - // initialize(key){ - // if(key == 1) { - // this.fileUpload.videoForm.sizeStr = 0 - // this.fileUpload.videoForm.learnHours == 0 - // this.fileUpload.videoForm.learnScore= 0 - // } - // if(key == 2){ - // this.fileUpload.textForm.sizeStr = 0 - // this.fileUpload.textForm.learnHours = 0 - // this.fileUpload.textForm.learnScore= 0.0 - // } - // }, }, }; diff --git a/src/views/course/CoursewareList.vue b/src/views/course/CoursewareList.vue index 040f901..8250ba2 100644 --- a/src/views/course/CoursewareList.vue +++ b/src/views/course/CoursewareList.vue @@ -58,14 +58,7 @@ export default { }, columns: [ { title: '课件名称', width: '160px', align: 'center', dataIndex: 'name', key: 'name' }, - { - title: '课件分类', - width: '300px', - align: 'center', - dataIndex: 'classifyName', - key: 'classifyName', - }, - { title: '课时/分', width: '160px', align: 'center', dataIndex: 'duration', key: 'duration' }, + { title: '课件时长/分', width: '160px', align: 'center', dataIndex: 'duration', key: 'duration' }, { title: '课件大小(MB)', width: '160px', align: 'center', dataIndex: 'sizeStr', key: 'sizeStr' }, { title: '操作', key: 'operation', width: '200px', align: 'center', scopedSlots: { customRender: 'action' } }, ], diff --git a/src/views/course/CoursewarePreview.vue b/src/views/course/CoursewarePreview.vue index 4b11cb4..d088457 100644 --- a/src/views/course/CoursewarePreview.vue +++ b/src/views/course/CoursewarePreview.vue @@ -1,7 +1,7 @@