diff --git a/src/components/FileUpload/index.vue b/src/components/FileUpload/index.vue index 29ee8638..90efbfd5 100644 --- a/src/components/FileUpload/index.vue +++ b/src/components/FileUpload/index.vue @@ -86,7 +86,7 @@ export default { // 文件类型, 例如['png', 'jpg', 'jpeg'] fileType: { type: Array, - default: () => ["doc", "xls", "ppt","docx", "xlsx", "pptx","png","txt", "pdf","jpg","gif","bmp","mp4","mp3","zip"], + default: () => ["doc", "xls", "ppt","docx", "xlsx", "pptx","png", "pdf","jpg","gif","mp4","mp3","zip"], }, // 是否显示提示 isShowTip: { diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue index 4b15f10c..ff2bda18 100644 --- a/src/views/course/ManageList.vue +++ b/src/views/course/ManageList.vue @@ -135,7 +135,7 @@ 管理 撤回 编辑 - 删除 + 删除 更多 diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 792acd10..6fa3d168 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -477,7 +477,7 @@ export default { oneList:[], //一级分类{type:11} twoList:[], //二级分类{type:12} threeList:[],//三级分类{type:13} - + searching:false,//是否正在搜索中 resonimg:{}, formatDate, formatNum:formatUserNumber, @@ -492,6 +492,7 @@ export default { // 查询信息 course: { orderField: "studys", + companyId:'', keyword:'',//关键词 topOrder: true, orderAsc: false, @@ -1036,6 +1037,12 @@ export default { return list; }, async search() { + // + if(this.searching){ + this.$message.warning("正在搜索中,请待搜索完成后再重新搜索"); + return; + } + this.searching=true; //测试时间格式化 // let s=1650973801; // var d = new Date(1650973801*1000); @@ -1050,7 +1057,7 @@ export default { this.course.audiences=this.audiences.join(","); } //console.log(this.userInfo) - //this.course.companyId=this.userInfo.companyId; + this.course.companyId=this.userInfo.companyId; this.course.type = "";//不使用单查询了 this.course.types = ""; this.course.sysType1 = ""; @@ -1084,6 +1091,7 @@ export default { // 隐藏loadMore this.moreState = 2; await apiCoursePortal.courseSearch(this.course).then(res => { + this.searching=false; if (res.status == 200 && res.result.list.length > 0) { this.totalPages = res.result.totalPages; res.result.list.forEach(item => { diff --git a/src/views/user/Mynotes.vue b/src/views/user/Mynotes.vue index b19ee8ff..a03c8a9a 100644 --- a/src/views/user/Mynotes.vue +++ b/src/views/user/Mynotes.vue @@ -351,6 +351,7 @@ export default { } if(this.exportType == '1') { + //导出pdf已不再使用 apiNote.exportPdf(data).then(res=>{ const link = document.createElement('a');// 创建a标签 let blob = new Blob([res],{type: 'application/vnd.ms-pdf;charset=UTF-8'}); // 设置文件类型