From ee8a76c4dfc4c22dd5282bf547047622a329b12f Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Wed, 9 Jul 2025 13:48:31 +0800 Subject: [PATCH 01/17] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/homework.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/homework.vue b/src/components/Course/homework.vue index 6f3912e9..f5f12a71 100644 --- a/src/components/Course/homework.vue +++ b/src/components/Course/homework.vue @@ -109,7 +109,7 @@ export default { if(res.status==200){ this.info=res.result; //检查是否过期 - if(res.result.deadTime!=''){ + if(res.result.deadTime!='' && res.result.deadTime != null){ var d = new Date(res.result.deadTime); var now=new Date(); if(now.getTime() > d.getTime()){ From 44a5baec183fff2c3fa141bda5e585232ab9b463 Mon Sep 17 00:00:00 2001 From: joshen Date: Thu, 17 Jul 2025 10:14:42 +0800 Subject: [PATCH 02/17] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue index 9a652683..e47c828b 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.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') From fe790389ca76554286e656c8dcd1f9748f0f3dc5 Mon Sep 17 00:00:00 2001 From: joshen Date: Thu, 17 Jul 2025 11:24:07 +0800 Subject: [PATCH 03/17] =?UTF-8?q?=E6=97=A5=E5=BF=97=E6=89=93=E5=8D=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/VideoPlayer/index.vue | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/components/VideoPlayer/index.vue b/src/components/VideoPlayer/index.vue index e47c828b..13889a46 100644 --- a/src/components/VideoPlayer/index.vue +++ b/src/components/VideoPlayer/index.vue @@ -364,6 +364,11 @@ export default { } // 根据视频的readyState判断下一帧是否已加载,并控制loading的显示 this.isShowLoading = this.videoDom.readyState < 3; + console.log("当前缓存:"+this.videoDom.readyState) + if (this.videoDom.readyState < 3){ + console.log("详细信息",this.videoDom) + console.log("卡了",this.videoDom.readyState) + } //if() //console.log(this.videoDom.readyState,'this.videoDom.readyState'); }, 1000); From 3bb4b519f16bb4b5f3350977b50856d161b1dbfd Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 14:16:02 +0800 Subject: [PATCH 04/17] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 8163331c..45e1cc62 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -141,6 +141,7 @@ PC端可见 移动端可见 多端可见 + 仅内网访问 @@ -305,6 +306,7 @@ PC端可见 移动端可见 多端可见 + 仅内网访问 @@ -488,6 +490,7 @@ export default { refType:'' }, visibleShow:false, + isPermission:false, extendRefId:'', extendRefType:'', courseTeachers: [], //课程的老师 @@ -906,6 +909,7 @@ export default { this.contentInfo.list = result.contents; this.sectionInfo.list = result.sections; this.courseTeachers = result.teachers; //课程的老师信息 + this.isPermission = result.teachers; //课程的老师信息 if(!this.courseInfo.orgId){ //根据课程创建者获取机构id From 206f0e825d9dc051b1ad1f8b57777bae2b7a2dfa Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 15:39:37 +0800 Subject: [PATCH 05/17] =?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?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Course/courseForm.vue | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 45e1cc62..83389e6b 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -491,6 +491,7 @@ export default { }, visibleShow:false, isPermission:false, + dicts:[], extendRefId:'', extendRefType:'', courseTeachers: [], //课程的老师 @@ -558,6 +559,7 @@ export default { handler(newVal) { //需要保存 this.requireSaveCourse = true; + this.checkOrgPermission(newVal.orgId); }, deep: true } @@ -584,6 +586,14 @@ export default { this.loadUserGroup(); }, methods: { + // 检查机构权限 + checkOrgPermission(orgId) { + if (!orgId) { + this.isPermission = false; + return; + } + this.isPermission = this.dicts.includes(orgId); + }, // 关键字的更改 changeKeywords(option){ if(option.target.value){ @@ -892,7 +902,8 @@ export default { async getDetail(id) { this.curCourseId = id; this.orgName=''; - let $this = this; + this.isPermission = false; + let $this = this; try { const { result, status } = await apiCourse.detail(id); if (status === 200) { @@ -910,6 +921,7 @@ export default { this.sectionInfo.list = result.sections; this.courseTeachers = result.teachers; //课程的老师信息 this.isPermission = result.teachers; //课程的老师信息 + this.dicts = result.dicts; //课程的老师信息 if(!this.courseInfo.orgId){ //根据课程创建者获取机构id From 93e769be4210b35569d80160fe5366243e4e6763 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 16:15:02 +0800 Subject: [PATCH 06/17] =?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 | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 83389e6b..829f6a34 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -559,6 +559,7 @@ export default { handler(newVal) { //需要保存 this.requireSaveCourse = true; + console.log("newVal.orgId = ",newVal.orgId) this.checkOrgPermission(newVal.orgId); }, deep: true @@ -588,11 +589,19 @@ export default { methods: { // 检查机构权限 checkOrgPermission(orgId) { + console.log("--- 监测组织id orgId = ",orgId) + console.log("--- this.isPermission = ",this.isPermission) + console.log("--- device = ",this.courseInfo.device) if (!orgId) { this.isPermission = false; return; } this.isPermission = this.dicts.includes(orgId); + this.courseInfo.device = 3; + if(this.isPermission){ + this.courseInfo.device = 4; + } + console.log("--- 监听结束 this.isPermission = ",this.isPermission) }, // 关键字的更改 changeKeywords(option){ @@ -922,7 +931,8 @@ export default { this.courseTeachers = result.teachers; //课程的老师信息 this.isPermission = result.teachers; //课程的老师信息 this.dicts = result.dicts; //课程的老师信息 - + console.log("--- 编辑查看 this.isPermission = ",this.isPermission) + console.log("--- 编辑查看 this.dicts = ",this.dicts) if(!this.courseInfo.orgId){ //根据课程创建者获取机构id apiUser.getOrgSimpleByUserId(result.course.sysCreateAid).then(ors=>{ From d9f69001a5090200d74bf5d192842c570e676a10 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 16:38:42 +0800 Subject: [PATCH 07/17] =?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 | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 829f6a34..1696d7ad 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -531,7 +531,11 @@ export default { dlgShow: false }, rightTypeId: {}, - catalogSortDialogShow: false + catalogSortDialogShow: false, + selectedOrg: { + orgId: null, + name: '' + } }; }, created() { @@ -559,10 +563,18 @@ export default { handler(newVal) { //需要保存 this.requireSaveCourse = true; - console.log("newVal.orgId = ",newVal.orgId) - this.checkOrgPermission(newVal.orgId); }, deep: true + }, + 'selectedOrg.orgId': { + handler(newVal, oldVal) { + if (newVal !== oldVal) { + console.log("--- watch newVal.orgId = ",newVal.orgId) + this.checkOrgPermission(newVal.orgId); + } + }, + deep: false, // 因为只是监听 orgId,不是整个对象内容变化,所以不需要 deep + immediate: false // 如果不需要立即执行,设为 false } }, mounted() { From a8bcd3832bbf589efdbdba212bbcadf6b4516442 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 16:56:47 +0800 Subject: [PATCH 08/17] =?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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 1696d7ad..986a37f5 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -941,7 +941,7 @@ export default { this.contentInfo.list = result.contents; this.sectionInfo.list = result.sections; this.courseTeachers = result.teachers; //课程的老师信息 - this.isPermission = result.teachers; //课程的老师信息 + this.isPermission = result.isPermission; //课程的老师信息 this.dicts = result.dicts; //课程的老师信息 console.log("--- 编辑查看 this.isPermission = ",this.isPermission) console.log("--- 编辑查看 this.dicts = ",this.dicts) From 3cfa3ffec397e221e6ee4b5fe3dca1d1e58e7780 Mon Sep 17 00:00:00 2001 From: 670788339 <670788339@qq.com> Date: Sun, 20 Jul 2025 17:47:53 +0800 Subject: [PATCH 09/17] =?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 | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue index 986a37f5..63e79861 100644 --- a/src/components/Course/courseForm.vue +++ b/src/components/Course/courseForm.vue @@ -560,21 +560,17 @@ export default { }, watch: { courseInfo: { - handler(newVal) { - //需要保存 - this.requireSaveCourse = true; - }, - deep: true - }, - 'selectedOrg.orgId': { handler(newVal, oldVal) { - if (newVal !== oldVal) { - console.log("--- watch newVal.orgId = ",newVal.orgId) + // 需要保存 + this.requireSaveCourse = true; + + console.log("--- watch比较 = ", oldVal.orgId, newVal.orgId); + if (newVal.orgId !== oldVal.orgId) { + console.log("--- watch newVal.orgId = ", newVal.orgId); this.checkOrgPermission(newVal.orgId); } }, - deep: false, // 因为只是监听 orgId,不是整个对象内容变化,所以不需要 deep - immediate: false // 如果不需要立即执行,设为 false + deep: true } }, mounted() { From 147366f7389c47dd65fc61ebeade845b72a99cdf 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 10:33:44 +0800 Subject: [PATCH 10/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 47 +++++++++++++++++++++++++++++++++-- 1 file changed, 45 insertions(+), 2 deletions(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index cc6143a8..2b3e6b8d 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -630,7 +630,7 @@ let urlSign = encodeURIComponent(encrypt(beforeUrl)); cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存 //以下判断是为了区分本地环境和服务器环境 - if (process.env.NODE_ENV == 'development') { + if (true) { this.blobUrl = process.env.VUE_APP_FILE_BASE_URL + u; } else { this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign; @@ -1386,12 +1386,55 @@ this.totalContent = rs.result.contents.length; //加载学习的数据 this.loadStudyData(rs.result); - + if (rs.result.course.isPermission){ + this.getInternet() + console.log('需要内网环境') + } } else { this.$message.error(rs.message); } }); }, + // 检测是否为内网 + getInternet() { + this.Internet = 3; + let $this = this; + let xmlhttp = this.getXmlHttpRequest(); + let timedOut = false; + let timer = setTimeout(function () { + timedOut = true; + xmlhttp.abort(); + }, 5000); + xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true); + xmlhttp.send(); + xmlhttp.onreadystatechange = function () { + if (xmlhttp.readyState == 4) { + if (xmlhttp.status == 200) { + clearTimeout(timer); + $this.Internet = 1; + $this.$store.dispatch("userTrigger", { + key: "ViewCase",//后台的事件key 发布文章且审核通过 + title: '查看案例',//事件的标题 + parameters: "",//用户自定义参数 name:value,name:value + content: '查看了案例',//事件的内容 + objId: $this.resolveId,//关联的id + objType: "3",//关联的类型 + objInfo: $this.caseDetail?.title, + aid: $this.userInfo.aid, //当前登录人的id + aname: $this.userInfo.name,//当前人的姓名 + status: 1 //状态,直接写1 + }); + $this.sendEventData(); + } else { + clearTimeout(timer); + $this.Internet = 2; + } + } else { + if (timedOut) return;//忽略中止请求 + clearTimeout(timer);//取消等待的超时 + } + } + }, loadStudyData(result) { let $this=this; this.loadScorePraiseAndTrample(); From b9f23eb6573a69cd709b44071ff6a4051c89f769 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 10:46:30 +0800 Subject: [PATCH 11/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 2b3e6b8d..9d05e5b4 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -630,7 +630,7 @@ let urlSign = encodeURIComponent(encrypt(beforeUrl)); cookies.set('PLAYSIGN_TIME', ctime); //写客户端的cookie保存 //以下判断是为了区分本地环境和服务器环境 - if (true) { + if (process.env.NODE_ENV == 'development') { this.blobUrl = process.env.VUE_APP_FILE_BASE_URL + u; } else { this.blobUrl = process.env.VUE_APP_BASE_API + '/xboe/m/course/cware/resource?sign=' + urlSign; From 81602506c747433f2836ab33bfb62d79a1d7ba15 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 11:00:33 +0800 Subject: [PATCH 12/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 9d05e5b4..d6c70f10 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -1386,7 +1386,7 @@ this.totalContent = rs.result.contents.length; //加载学习的数据 this.loadStudyData(rs.result); - if (rs.result.course.isPermission){ + if (rs.result.isPermission){ this.getInternet() console.log('需要内网环境') } @@ -1395,6 +1395,14 @@ } }); }, + getXmlHttpRequest() { + if (window.XMLHttpRequest) { + return new XMLHttpRequest(); + } + else if (window.ActiveXObject) { + return new ActiveXObject("Microsoft.XMLHTTP"); + } + }, // 检测是否为内网 getInternet() { this.Internet = 3; From afd1bec458bdb89613df534c33b082d8d70c7cd6 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 14:33:05 +0800 Subject: [PATCH 13/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 203 ++++++++++++++++++++-------------- 1 file changed, 117 insertions(+), 86 deletions(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index d6c70f10..0090a74c 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -22,92 +22,103 @@
-
- - -
-
- -
-
-
- - - -
+
+
+ + +
+
+ +
+
+
+ + + +
+
+
+ + + +
+
-
- - - -
-
-
-
+
- -
-
-
- +
- +
+
+ +
+ {{ toScore(courseInfo.score) }} +
-
-
-
-
{{ contentData.contentName }}
-
- +
+
+
{{ contentData.contentName }}
+
+ +
-
-
-
-
此课程内容无法预览,请联系管理员
-
-
- 此课程内容无法预览,请联系管理员 -
- - -
-
-
-
-
- -
-
-
- -
- -
-
- -
-
- - -
+ +
+ 十分抱歉,您当前的网络环境不符合观看要求。
+ 为了保障案例信息的安全,您需要接入公司内网才能观看。
+
+
+ 重新检测 +
+
@@ -303,6 +314,17 @@
+ +
{{warnTitle}}
+
+   {{warn}} +
+ + 确 + 定 + +
@@ -369,6 +391,7 @@ }, data() { return { + protocolDialogVisible: false, tentative: false, isContentTypeTwo: null, isContentType: null, @@ -390,6 +413,7 @@ curCFile: { converStatus: 4, }, + Internet: 3,//1是成功 2是是失败 3是检测中 radio: '', interactRuning: false, playerBoxShow: false, @@ -454,6 +478,8 @@ cumulativeDuration:0, //非音频累计时长 maxDuration:0, //非音频最大时长 defaultMaxTime:1800, //非音频默认最大时间 + warn:"测试内容", + warnTitle:"测试标题", } }, mounted() { @@ -1357,7 +1383,8 @@ } } this.courseInfo = rs.result.course; - + this.warn = rs.result.warn; + this.warnTitle = rs.result.warnTitle; if (rs.result.teachers && rs.result.teachers.length > 0) { let userIds = []; let ctoUsers = []; @@ -1387,6 +1414,7 @@ //加载学习的数据 this.loadStudyData(rs.result); if (rs.result.isPermission){ + // if (true){ this.getInternet() console.log('需要内网环境') } @@ -1420,22 +1448,11 @@ if (xmlhttp.status == 200) { clearTimeout(timer); $this.Internet = 1; - $this.$store.dispatch("userTrigger", { - key: "ViewCase",//后台的事件key 发布文章且审核通过 - title: '查看案例',//事件的标题 - parameters: "",//用户自定义参数 name:value,name:value - content: '查看了案例',//事件的内容 - objId: $this.resolveId,//关联的id - objType: "3",//关联的类型 - objInfo: $this.caseDetail?.title, - aid: $this.userInfo.aid, //当前登录人的id - aname: $this.userInfo.name,//当前人的姓名 - status: 1 //状态,直接写1 - }); - $this.sendEventData(); + $this.protocolDialogVisible=true } else { clearTimeout(timer); $this.Internet = 2; + } } else { if (timedOut) return;//忽略中止请求 @@ -2419,4 +2436,18 @@ height: 200px; background: url('../../../public/images/couresdetail.png'); } + +.protocol { + .protocol-title { + font-size: 20px; + font-weight: 600; + text-align: center; + margin-bottom: 25px; + } + + .protocol-content { + font-size: 14px; + line-height: 25px; + } +} From 33c9d2140fa51cc4f1bb28890579db477fd1c6d3 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 14:42:42 +0800 Subject: [PATCH 14/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 0090a74c..3a07b434 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -110,15 +110,14 @@
- +
- 十分抱歉,您当前的网络环境不符合观看要求。
- 为了保障案例信息的安全,您需要接入公司内网才能观看。
+ 十分抱歉,您当前的网络环境不符合观看要求。为了保障案例信息的安全,您需要接入公司内网才能观看。
重新检测
- +
@@ -1452,7 +1451,6 @@ } else { clearTimeout(timer); $this.Internet = 2; - } } else { if (timedOut) return;//忽略中止请求 From c24b54957abade2b2d21881899ea561e9f54c239 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 14:57:51 +0800 Subject: [PATCH 15/17] =?UTF-8?q?=E5=86=85=E7=BD=91=E7=8E=AF=E5=A2=83?= =?UTF-8?q?=E5=88=A4=E6=96=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/study/coursenew.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue index 3a07b434..09f5fda3 100644 --- a/src/views/study/coursenew.vue +++ b/src/views/study/coursenew.vue @@ -1790,6 +1790,7 @@ display: flex; justify-content: space-between; .course-player{ //内容播放区域 + background-color: #f5f7fa; flex:1; min-width: 700px; min-height: 400px; 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 16/17] =?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 17/17] =?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); } }, },