From 18324458f38430fb65e6aa5073408e596fcd1d85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Mon, 21 Jul 2025 18:31:13 +0800 Subject: [PATCH 01/16] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD,=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 09f5fda3..7d7632f2 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -22,7 +22,7 @@
-
+
@@ -110,11 +110,11 @@
-
-
+
+
十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
-
+
重新检测
@@ -1790,7 +1790,7 @@ display: flex; justify-content: space-between; .course-player{ //内容播放区域 - background-color: #f5f7fa; + background-color: rgb(238, 238, 238); flex:1; min-width: 700px; min-height: 400px; From 6208caf4ca065cd930c3c26724e5e0512d29d55d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Wed, 23 Jul 2025 10:14:14 +0800 Subject: [PATCH 02/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/progress-bar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index 84bc066d..2ca784ae 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -73,7 +73,7 @@ export default { }, methods: { down(e) { - // if(this.isDrag) { + if(!this.isDrag) return; this.$emit("getMouseDownStatus", true); this.is_mousedown_progress = true; // 获取完整进度条的clientX（dom左上角） @@ -87,8 +87,8 @@ export default { var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) - // 禁止拖动 - if(!this.isDrag && time && arr[this.blobId] < current) return; + // 禁止拖动到未学习区域 + if(time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); // } @@ -124,7 +124,7 @@ export default { // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); - + this.$emit("getMouseDownStatus", false); } }, }, From b8858348c0691ccfd79b2123fe2cc3904a6445f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Wed, 23 Jul 2025 10:42:54 +0800 Subject: [PATCH 03/16] =?UTF-8?q?Revert=20"=E4=BF=AE=E6=94=B9=E5=89=8D?= =?UTF-8?q?=E7=AB=AF=E8=BF=9B=E5=BA=A6=E6=9D=A1"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This reverts commit 6208caf4ca065cd930c3c26724e5e0512d29d55d. --- src/components/VideoPlayer/progress-bar.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index 2ca784ae..84bc066d 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -73,7 +73,7 @@ export default { }, methods: { down(e) { - if(!this.isDrag) return; + // if(this.isDrag) { this.$emit("getMouseDownStatus", true); this.is_mousedown_progress = true; // 获取完整进度条的clientX（dom左上角） @@ -87,8 +87,8 @@ export default { var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) - // 禁止拖动到未学习区域 - if(time && arr[this.blobId] < current) return; + // 禁止拖动 + if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); // } @@ -124,7 +124,7 @@ export default { // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); - this.$emit("getMouseDownStatus", false); + } }, }, From f91e2f12dddbc27fce9148b8925f40c30c663c8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Wed, 23 Jul 2025 10:58:47 +0800 Subject: [PATCH 04/16] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=89=8D=E7=AB=AF?= =?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/progress-bar.vue | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index 84bc066d..ab79c995 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -86,10 +86,9 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) - // 禁止拖动 + console.log('down arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + // 禁止拖动 true:禁止拖动，false:允许拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; - this.$emit("updateProgress", current); // } @@ -103,7 +102,7 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + console.log('move arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); @@ -119,12 +118,12 @@ export default { if(current<0) current = 0; var time = localStorage.getItem('videoProgressData'); var arr = time&&JSON.parse(time) || {} - //console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) + console.log('up arr:',this.isDrag,this.blobId,arr,arr[this.blobId],current) this.$emit("getMouseDownStatus", false); // 禁止拖动 if(!this.isDrag && time && arr[this.blobId] < current) return; this.$emit("updateProgress", current); - + this.$emit("getMouseDownStatus", false); } }, }, From cfe043113102f9779c2fdcafcaf298621dee990c Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 23 Jul 2025 11:21:31 +0800 Subject: [PATCH 05/16] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/index.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue index 13889a46..7742cc68 100644 --- a/src/components/VideoPlayer/index.vue +++ b/src/components/VideoPlayer/index.vue @@ -317,7 +317,7 @@ export default { } setInterval(() => { - console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration) + // console.log('当前状态:',this.currentProgress,this.isDrag,this.videoDom.currentTime , this.videoDom.duration) // 视频播放时本地记录视频实时播放时长,视频设置了禁止拖动时执行 if(!this.isDrag){ var time = localStorage.getItem('videoProgressData') @@ -364,10 +364,10 @@ export default { } // 根据视频的readyState判断下一帧是否已加载，并控制loading的显示 this.isShowLoading = this.videoDom.readyState < 3; - console.log("当前缓存:"+this.videoDom.readyState) + // console.log("当前缓存:"+this.videoDom.readyState) if (this.videoDom.readyState < 3){ - console.log("详细信息",this.videoDom) - console.log("卡了",this.videoDom.readyState) + // console.log("详细信息",this.videoDom) + // console.log("卡了",this.videoDom.readyState) } //if() //console.log(this.videoDom.readyState,'this.videoDom.readyState'); From 1c27bc3cc7282b18d8f9c949582d3c86abc15118 Mon Sep 17 00:00:00 2001 From: joshen Date: Wed, 23 Jul 2025 11:30:12 +0800 Subject: [PATCH 06/16] =?UTF-8?q?=E4=B8=B4=E6=97=B6=E6=B5=8B=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/progress-bar.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/VideoPlayer/progress-bar.vue b/src/components/VideoPlayer/progress-bar.vue index ab79c995..b0e131b8 100644 --- a/src/components/VideoPlayer/progress-bar.vue +++ b/src/components/VideoPlayer/progress-bar.vue @@ -37,7 +37,6 @@ export default { }, isDrag:{ type: Boolean, - default: true, }, blobId:{ type: String, From 7c7acc85e958070a2de4498fee5bc31e88612a16 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 23 Jul 2025 16:23:05 +0800 Subject: [PATCH 07/16] =?UTF-8?q?=E4=BB=85=E5=86=85=E7=BD=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=81-=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=20=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/course.js | 14 +++++++++----- src/components/Course/courseForm.vue | 18 +++++++++--------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/src/api/modules/course.js b/src/api/modules/course.js index 3f4e503b..e20ea18a 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -1,9 +1,10 @@ /** * 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。 * 针对于管理员，教师的功能 - * + * **/ import ajax from '@/utils/xajax.js' +import request from "../unionAjax"; /** * 保存课程基本信息，新增和更新都是此方式 @@ -170,6 +171,9 @@ const updateContentOrders = function(cid,items) { const detail = function(id) { return ajax.get('/xboe/m/course/manage/detail?id=' + id); } +const getDictIds = function(pid,type) { + return request.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`); +} /** * 更新内容的名称 @@ -274,7 +278,7 @@ const countWaitAudit = function() { } /** - * [已用courseAudit中的hrbpAuditList替换] + * [已用courseAudit中的hrbpAuditList替换] * 当前用户需要审核的课程列表 * @param {Object} query 同pageList */ @@ -283,9 +287,9 @@ const auditList = function(query) { } -/** - * 【已移到courseAudit中】 - * 教师需要审核的课程列表 +/** + * 【已移到courseAudit中】 + * 教师需要审核的课程列表 */ const teacherAuditList = function(query) { return ajax.post('/xboe/m/course/audit/teacher-course', query); diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 121e32c0..6064f527 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -571,6 +571,7 @@ export default { } }, mounted() { + this.getDictIds(); let extendFlag=this.$route.query.f; //是否是管理端过来的 this.extendRefId=this.$route.query.refId; this.extendRefType=this.$route.query.refType; @@ -601,16 +602,8 @@ export default { this.isPermission = false; return; } + console.log("--- dicts = ",this.dicts) this.isPermission = this.dicts.includes(orgId); - /*if(this.isPermission && !this.courseInfo && !this.courseInfo.device){ - this.courseInfo.device = 4; - }else{ - if(!this.courseInfo && !this.courseInfo.device){ - return; - }else{ - this.courseInfo.device = 3; - } - }*/ console.log("--- 监听结束 this.isPermission = ",this.isPermission) }, // 关键字的更改 @@ -918,6 +911,13 @@ export default { this.courseInfo.coverImg = ''; }, //获取课程信息 + async getDictIds() { + const { result, status } = await apiCourse.detail(id); + if (status === 200) { + this.dicts = result.dicts; + } + }, + //获取课程信息 async getDetail(id) { this.curCourseId = id; this.orgName=''; From 6691705f3c05e2d77d49c91b7c47f71883db0f93 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 23 Jul 2025 16:33:14 +0800 Subject: [PATCH 08/16] =?UTF-8?q?=E4=BB=85=E5=86=85=E7=BD=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=81-=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=20=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/course.js | 1 + src/components/Course/courseForm.vue | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/api/modules/course.js b/src/api/modules/course.js index e20ea18a..0dcaf075 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -450,6 +450,7 @@ export default { findUpdateLogs, getUpdateLog, detail, + getDictIds, saveContent, pageList, setEnabled, diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 6064f527..6db31ab2 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -911,8 +911,8 @@ export default { this.courseInfo.coverImg = ''; }, //获取课程信息 - async getDictIds() { - const { result, status } = await apiCourse.detail(id); + getDictIds() { + const { result, status } = apiCourse.getDictIds(637,1); if (status === 200) { this.dicts = result.dicts; } From 007da019ae85176ec387b3fac761ee1ec25442f4 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 23 Jul 2025 16:35:42 +0800 Subject: [PATCH 09/16] =?UTF-8?q?=E4=BB=85=E5=86=85=E7=BD=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=81-=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=20=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/course.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/api/modules/course.js b/src/api/modules/course.js index 0dcaf075..c122be4f 100644 --- a/src/api/modules/course.js +++ b/src/api/modules/course.js @@ -172,7 +172,7 @@ const detail = function(id) { return ajax.get('/xboe/m/course/manage/detail?id=' + id); } const getDictIds = function(pid,type) { - return request.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`); + return ajax.get(`/xboe/m/course/manage/getDictIds?pid=${pid}&type=${type}`); } /** From 16a1deb279a2b129b2767826f7458853f7be39d7 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 23 Jul 2025 16:42:11 +0800 Subject: [PATCH 10/16] =?UTF-8?q?=E4=BB=85=E5=86=85=E7=BD=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=81-=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=20=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 6db31ab2..f46a6a1c 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -910,11 +910,15 @@ export default { this.courseCoverurl = ''; this.courseInfo.coverImg = ''; }, - //获取课程信息 + //获取字典信息 getDictIds() { + console.log("--- 获取字典信息 1 = ",this.dicts) const { result, status } = apiCourse.getDictIds(637,1); + console.log("--- 获取字典信息 2 result= ",result) if (status === 200) { + console.log("--- 获取字典信息 3 = ",this.dicts) this.dicts = result.dicts; + console.log("--- 获取字典信息 4 = ",this.dicts) } }, //获取课程信息 From 0fdf1b65d25d1c025ec4d17b48a1335c6973fb72 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 23 Jul 2025 16:50:48 +0800 Subject: [PATCH 11/16] =?UTF-8?q?=E4=BB=85=E5=86=85=E7=BD=91=E5=8F=AF?= =?UTF-8?q?=E8=A7=81-=E7=AE=A1=E7=90=86=E5=91=98=E7=AB=AF=20=E8=B0=83?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index f46a6a1c..3ae9f0ae 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -911,14 +911,17 @@ export default { this.courseInfo.coverImg = ''; }, //获取字典信息 - getDictIds() { - console.log("--- 获取字典信息 1 = ",this.dicts) - const { result, status } = apiCourse.getDictIds(637,1); - console.log("--- 获取字典信息 2 result= ",result) - if (status === 200) { - console.log("--- 获取字典信息 3 = ",this.dicts) - this.dicts = result.dicts; - console.log("--- 获取字典信息 4 = ",this.dicts) + async getDictIds() { + console.log("--- 获取字典信息 1 = ", this.dicts); + try { + const response = await apiCourse.getDictIds(637, 1); // 确保返回 Promise + console.log("--- 获取字典信息 2 result= ", response); + if (response.status === 200) { + this.dicts = response.result.dicts; // 正确提取 dicts + console.log("--- 获取字典信息 3 = ", this.dicts); + } + } catch (error) { + console.error("获取字典信息失败：", error); } }, //获取课程信息 From cc0aba97c205fb45053d0dfb7a21c9901625cb91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Thu, 24 Jul 2025 14:08:08 +0800 Subject: [PATCH 12/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/ManageList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue index 386b4ac5..c4f12737 100644 --- a/src/views/article/ManageList.vue +++ b/src/views/article/ManageList.vue @@ -289,8 +289,8 @@ export default { }) }, viewTopic(data) { - // window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') - this.$router.push({path:'/article/detail',query:{id:data.id}}) + window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') + // this.$router.push({path:'/article/detail',query:{id:data.id}}) }, }, } From 40be9c3e210686f058b819f4ea3d1f2da64857cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Thu, 24 Jul 2025 14:15:33 +0800 Subject: [PATCH 13/16] =?UTF-8?q?=E6=81=A2=E5=A4=8D=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/ManageList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue index c4f12737..c534754c 100644 --- a/src/views/article/ManageList.vue +++ b/src/views/article/ManageList.vue @@ -289,8 +289,8 @@ export default { }) }, viewTopic(data) { - window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') - // this.$router.push({path:'/article/detail',query:{id:data.id}}) + // window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') + this.$router.push({path:'/article/detail',query:{id:data.id}}) }, }, } From 032e15013a029346b2ef87a649960a46fac048ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Thu, 24 Jul 2025 14:20:44 +0800 Subject: [PATCH 14/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=A1=88=E4=BE=8B?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/case/ManageList.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/case/ManageList.vue b/src/views/case/ManageList.vue index 5e70ac72..cba20191 100644 --- a/src/views/case/ManageList.vue +++ b/src/views/case/ManageList.vue @@ -697,7 +697,8 @@ export default { }, viewTopic(data) { if (data.confidentialityLevel == '内部') { - this.$router.push({ path: '/case/detail', query: { id: data.id } }) + // this.$router.push({ path: '/case/detail', query: { id: data.id } }) + window.open(this.webBaseUrl+'/case/detail?id='+data.id , '_blank') } else { this.$message.warning("非内部密级案例不能查看"); } From 4d01d6946b10d9990966c03f45cbdbfc4624610d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E7=8E=8B=E5=8D=93=E7=85=9C?= <2210102150@qq.com> Date: Thu, 24 Jul 2025 14:31:12 +0800 Subject: [PATCH 15/16] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=96=87=E7=AB=A0?= =?UTF-8?q?=E6=A0=87=E9=A2=98=E9=93=BE=E6=8E=A5=E6=89=93=E5=BC=80=E9=A1=B5?= =?UTF-8?q?=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/article/ManageList.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/views/article/ManageList.vue b/src/views/article/ManageList.vue index c534754c..c4f12737 100644 --- a/src/views/article/ManageList.vue +++ b/src/views/article/ManageList.vue @@ -289,8 +289,8 @@ export default { }) }, viewTopic(data) { - // window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') - this.$router.push({path:'/article/detail',query:{id:data.id}}) + window.open(this.webBaseUrl+'/article/detail?id='+data.id , '_blank') + // this.$router.push({path:'/article/detail',query:{id:data.id}}) }, }, } From fde8e622731e11708e0a1b3a5d2ea91defb6d300 Mon Sep 17 00:00:00 2001 From: zhengsongbo Date: Sat, 2 Aug 2025 13:19:48 +0800 Subject: [PATCH 16/16] =?UTF-8?q?zhengsongbo:=E6=A0=87=E7=AD=BE=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E7=AC=AC=E4=B8=80=E6=AC=A1=E6=8F=90=E6=B5=8B=20on=202?= =?UTF-8?q?025-08-02?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/modules/courseTag.js | 64 +++++ src/components/Course/courseForm.vue | 6 +- src/components/Course/courseTag.vue | 158 ++++++++++++ src/data/pages.js | 3 +- src/views/portal/course/Index.vue | 104 +++++++- src/views/tag/TagManageList.vue | 372 +++++++++++++++++++++++++++ 6 files changed, 698 insertions(+), 9 deletions(-) create mode 100644 src/api/modules/courseTag.js create mode 100644 src/components/Course/courseTag.vue create mode 100644 src/views/tag/TagManageList.vue diff --git a/src/api/modules/courseTag.js b/src/api/modules/courseTag.js new file mode 100644 index 00000000..0368c0d9 --- /dev/null +++ b/src/api/modules/courseTag.js @@ -0,0 +1,64 @@ +/**课程标签模块的相关处理*/ +import ajax from '@/utils/xajax.js' + +/** + * 分页查询：标签列表 + * @param {Object} query + */ +const portalPageList = function(query) { + return ajax.post('/xboe/m/coursetag/page', query); +} + +//改变标签的公共属性 +const changeTagPublic = function (row){ + // 返回 Promise 的 API 调用 + return ajax.post('/xboe/m/coursetag/changePublicStatus', { + id: row.id, + isPublic: row.isPublic + }); +} + +//改变标签的热点属性 +const changeTagHot = function (row){ + // 返回 Promise 的 API 调用 + return ajax.post('/xboe/m/coursetag/changeHotStatus', { + id: row.id, + isHot: row.isHot + }); +} + +//查询指定id的标签关联的所有课程 +const showCourseByTag = function (query){ + return ajax.post('/xboe/m/coursetag/showCourseByTag', query); +} + +//解除指定id的课程和某个标签之间的关联关系 +const unbindCourseTagRelation = function (params){ + return ajax.post('/xboe/m/coursetag/unbind', params); +} + +//编辑课程：标签模糊查询 +const searchTags = function (params){ + return ajax.post('/xboe/m/coursetag/searchTags', params); +} + +//编辑课程：创建标签(与当前课程关联) +const createTag = function (params){ + return ajax.post('/xboe/m/coursetag/createTag', params); +} + +//获取最新前10个热点标签 +const getHotTagList = function (params){ + return ajax.post('/xboe/m/coursetag/getHotTagList', params); +} + +export default { + portalPageList, + changeTagPublic, + changeTagHot, + showCourseByTag, + unbindCourseTagRelation, + searchTags, + createTag, + getHotTagList +} diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 8163331c..13ddd9a8 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -253,6 +253,9 @@ --> + + + @@ -402,6 +405,7 @@
+ + diff --git a/src/data/pages.js b/src/data/pages.js index fa49ae36..5ec52049 100644 --- a/src/data/pages.js +++ b/src/data/pages.js @@ -128,7 +128,8 @@ export const iframes=[ {title:'查看受众', path:'/iframe/ugroup/view',hidden:false,component:'manage/AudienceView'}, {title:'问答管理', path:'/iframe/qa/manages',hidden:false,component:'qa/ManageList'}, {title:'待审核课程', path:'/iframe/course/noapproved',hidden:false,component:'examine/NotApproved'}, - {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'} + {title:'已审核课程', path:'/iframe/course/reviewed',hidden:false,component:'examine/Reviewed'}, + {title:'标签管理', path:'/iframe/tag/manages',hidden:false,component:'tag/TagManageList'}, ] diff --git a/src/views/portal/course/Index.vue b/src/views/portal/course/Index.vue index fef6ab57..2084430d 100644 --- a/src/views/portal/course/Index.vue +++ b/src/views/portal/course/Index.vue @@ -284,32 +284,40 @@
-
+
全部
-
录播课
-
线下课
-
学习项目
- U选小课堂 + U选小课堂 + +
+
+ {{tag.name}} +
+
@@ -540,6 +548,7 @@ import { courseType, getType, toScore, formatDate, formatUserNumber, formatDateB import { deepClone, param } from "../../../utils"; import apiSearchterm from "@/api/modules/searchterm.js"; import apiPlace from "@/api/phase2/place.js" +import apiCourseTag from '@/api/modules/courseTag.js' export default { name: "index", components: { @@ -574,6 +583,11 @@ export default { list.push(item); } }); + this.hotTagsList.forEach(item => { + if (item.checked) { + list.push(item); + } + }); this.oneList.forEach(one => { var twoChildChecked = false;//是否有下级 one.children.forEach(two => { @@ -640,6 +654,18 @@ export default { }, data() { return { + hotTagsList: [ //热点标签 + {id:1,name:"数据库", checked: false }, + {id:2,name:"Python", checked: false }, + {id:3,name:"Java", checked: false }, + {id:4,name:"Vue3.0", checked: false }, + {id:5,name:"大数据", checked: false }, + {id:6,name:"Bootstrap", checked: false }, + {id:7,name:"营销学", checked: false }, + {id:8,name:"芯片", checked: false }, + {id:9,name:"火箭", checked: false }, + {id:10,name:"感悟", checked: false } + ], newData: false,//线上品牌系列隐藏 navTitle: [], // 设置高亮 @@ -715,6 +741,14 @@ export default { console.log(rs.message); } }) + //初始化:获取最新前10个热点标签 + apiCourseTag.getHotTagList(null).then(rs => { + if (rs.status == 200) { + this.hotTagsList = rs.result; + } else { + console.log(rs.message); + } + }) }, mounted() { let screenWidth = window.screen.availWidth; @@ -945,6 +979,9 @@ export default { this.ctypeList.forEach(item => { item.checked = false; }); + this.hotTagsList.forEach(item => { + item.checked = false; + }); this.oneList.forEach(one => { one.checked = false; one.children.forEach(two => { @@ -972,6 +1009,11 @@ export default { this.searchData(); }, + //点击标签 + handleTagClick(item, list) { + item.checked = !item.checked; + this.searchData(); + }, //三级分类 handleOptionClick(item, level, list) { // 线上品牌展示效果 @@ -1377,12 +1419,18 @@ export default { }, getAllChecked() { //获取全部选中的标签 let list = []; - + //获取选中的课程类型 this.ctypeList.forEach(item => { if (item.checked) { list.push(item); } }); + //获取选中的热点标签 + this.hotTagsList.forEach(item => { + if (item.checked) { + list.push(item); + } + }); this.oneList.forEach(one => { one.children.forEach(two => { two.children.forEach(three => { @@ -1487,7 +1535,7 @@ export default { item.name = item.name; } }); -console.log(res.result.list,'data') + console.log(res.result.list,'data') this.courseList = res?.result?.list ?? [] console.log(this.courseList); if (this.newData) { @@ -2518,4 +2566,46 @@ console.log(res.result.list,'data') padding: 0 !important; } /* ---end--- */ +/* ---标签管理 added by zhengsongbo on 2025-08-01--- */ +.search-div.nav { + display: block; + width: 100%; + clear: both; +} +.option-item { + margin: 0px 5px; +} +/* 热点标签：自定义按钮样式 */ +a.custom { + /* 基础样式 */ + display: inline-block; /* 使内边距生效 */ + padding: 1px; /* 按钮内边距 */ + margin: 1px 5px; + background-color: #F2F2F2; /* 淡灰色背景 */ + color: #333; /* 文字颜色 */ + text-decoration: none; /* 去除下划线 */ + border-radius: 3px; /* 圆角设计 */ + font-family: Arial, sans-serif; /* 字体 */ + font-size: 14px; /* 文字大小 */ + height: 24px; + line-height: 20px; + /* 过渡效果，使颜色变化更平滑 */ + transition: background-color 0.2s ease; +} + +/* 鼠标悬停效果 */ +a.custom:hover { + background-color: #DDEDFF; /* 浅蓝色背景 */ +} + +/* 可选：点击时效果 */ +a.custom:active { + background-color: #757575; /* 点击时更深的灰色 */ +} + +/* 鼠标悬停效果 */ +a.custom2 { + background-color: #DDEDFF; /* 浅蓝色背景 */ +} +/* ---end--- */ diff --git a/src/views/tag/TagManageList.vue b/src/views/tag/TagManageList.vue new file mode 100644 index 00000000..788ccabe --- /dev/null +++ b/src/views/tag/TagManageList.vue @@ -0,0 +1,372 @@ + + + + +