From 35ef44ab6a849f45b1733e889225bba59f1e1038 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 7 Jun 2023 18:31:44 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=AF=BE=E7=A8=8B=E6=90=9C=E7=B4=A2?= =?UTF-8?q?=E8=BF=9E=E7=BB=AD=E7=82=B9=E5=87=BB=E9=87=8D=E5=A4=8D=E5=8A=A0?= =?UTF-8?q?=E8=BD=BD=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 9a16264c..55f0e877 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -428,7 +428,7 @@ export default { oneList:[], //一级分类{type:11} twoList:[], //二级分类{type:12} threeList:[],//三级分类{type:13} - + searching:false,//是否正在搜索中 resonimg:{}, formatDate, formatNum:formatUserNumber, @@ -973,6 +973,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); @@ -1021,6 +1027,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 => { From 067ee1ea22d73e01a2b5ca3fada00ec3a1bd5a26 Mon Sep 17 00:00:00 2001 From: daihh Date: Wed, 7 Jun 2023 18:51:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/portal/course/Index.vue | 3 ++- src/views/user/Mynotes.vue | 1 + 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index 55f0e877..918c7ae1 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -443,6 +443,7 @@ export default { // 查询信息 course: { orderField: "studys", + companyId:'', keyword:'',//关键词 topOrder: true, orderAsc: false, @@ -993,7 +994,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 = ""; 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'}); // 设置文件类型 From c61e8a2e8ae3d4a3badb8562919782fda15706b5 Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 8 Jun 2023 09:46:01 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/course/ManageList.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 @@ 管理 撤回 编辑 - 删除 + 删除 更多 From 9164f7aa458cb2536a9585c2fdf460aeede7195f Mon Sep 17 00:00:00 2001 From: daihh Date: Thu, 8 Jun 2023 13:40:09 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=8F=90=E7=A4=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/FileUpload/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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: {