-
-
-
-
-
-
-
+
重新检测
-
+
- ![]()
- ![]()
-
-
- 赞
+
+
+
+
+
+
-
+
-
+
-
+ ![]()
+ ![]()
+
+
+ 赞
+
+ ![]()
+ ![]()
+
+
踩
+
- ![]()
- ![]()
-
-
- 踩
-
+
-
-
-
-
-
-
+
+
+
+
{{ toScore(courseInfo.score) }}
分
+
-
+
@@ -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 16/49] =?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 @@
-
+ {{ contentData.contentName }}
-
-
-
+
-
+
{{ contentData.contentName }}
+
+
-
-
-
-
-
- 此课程内容无法预览，请联系管理员
-
- 此课程内容无法预览，请联系管理员
-
-
-
-
-
-
-
-
-
-
+
-
- {{ contentData.contentName }}
- {{ conLink.url }}
+
+
+
+
+
+
-
+ 此课程内容无法预览，请联系管理员
+ 此课程内容无法预览，请联系管理员
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ {{ contentData.contentName }}
+ {{ conLink.url }}
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+ 十分抱歉，您当前的网络环境不符合观看要求。
+ 为了保障案例信息的安全，您需要接入公司内网才能观看。 +
+ + 为了保障案例信息的安全，您需要接入公司内网才能观看。 +
+ 重新检测
+
+
@@ -303,6 +314,17 @@
{{warnTitle}}
+
+ {{warn}}
+
+
+
- 十分抱歉，您当前的网络环境不符合观看要求。
- 为了保障案例信息的安全，您需要接入公司内网才能观看。 + 十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
- 为了保障案例信息的安全，您需要接入公司内网才能观看。 + 十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
@@ -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 17/49] =?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 f4c9b921bbf824af688188b945d46de927eb068a Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 15:02:46 +0800
Subject: [PATCH 18/49] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
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 cbb5f130..09f5fda3 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1444,7 +1444,7 @@
xmlhttp.send();
xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4) {
- if (xmlhttp.status != 200) {
+ if (xmlhttp.status == 200) {
clearTimeout(timer);
$this.Internet = 1;
$this.protocolDialogVisible=true
From e3735e4b923e61930fb0109189162af5ad2f920d Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 15:09:39 +0800
Subject: [PATCH 19/49] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/study/coursenew.vue | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 09f5fda3..fa5bb013 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1445,11 +1445,12 @@
xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4) {
if (xmlhttp.status == 200) {
- clearTimeout(timer);
- $this.Internet = 1;
$this.protocolDialogVisible=true
+ clearTimeout(timer);
+ $this.Internet = 2;
} else {
clearTimeout(timer);
+
$this.Internet = 2;
}
} else {
From 13af8ba4e0c1d5d455fd1513ba541f08e8f5c6a9 Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 15:21:19 +0800
Subject: [PATCH 20/49] =?UTF-8?q?=E5=89=8D=E7=AB=AF=E5=8F=82=E6=95=B0?=
=?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/study/coursenew.vue | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index fa5bb013..4b7257e4 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1445,12 +1445,11 @@
xmlhttp.onreadystatechange = function () {
if (xmlhttp.readyState == 4) {
if (xmlhttp.status == 200) {
- $this.protocolDialogVisible=true
clearTimeout(timer);
- $this.Internet = 2;
+ $this.Internet = 1;
} else {
clearTimeout(timer);
-
+ $this.protocolDialogVisible=true
$this.Internet = 2;
}
} else {
From 89277f88681e836fce25e9822881d4f464f04f36 Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 18:35:09 +0800
Subject: [PATCH 21/49] =?UTF-8?q?=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 | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 4b7257e4..69a5bd23 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -111,10 +111,10 @@
-
-
+
Date: Mon, 21 Jul 2025 18:57:40 +0800
Subject: [PATCH 22/49] =?UTF-8?q?=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 69a5bd23..767f906b 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1324,6 +1324,11 @@
audiences:this.audiences
}).then(rs => {
if (rs.status == 200) {
+ if (rs.result.isPermission){
+ // if (true){
+ this.getInternet()
+ console.log('需要内网环境')
+ }
if(rs.result.contents.length==0){
$this.$message.error('课程内容已删除或课程已不再使用');
return;
@@ -1412,11 +1417,6 @@
this.totalContent = rs.result.contents.length;
//加载学习的数据
this.loadStudyData(rs.result);
- if (rs.result.isPermission){
- // if (true){
- this.getInternet()
- console.log('需要内网环境')
- }
} else {
this.$message.error(rs.message);
}
From e501b8d23fa2ac01a4259f6c8d681e8e7453deeb Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 19:16:49 +0800
Subject: [PATCH 23/49] =?UTF-8?q?=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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 767f906b..e3b062a6 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1439,7 +1439,7 @@
let timer = setTimeout(function () {
timedOut = true;
xmlhttp.abort();
- }, 5000);
+ }, 1);
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
xmlhttp.send();
xmlhttp.onreadystatechange = function () {
From 44f79c93a597ad7c9f9ca95f6acdf665e7e5c370 Mon Sep 17 00:00:00 2001
From: joshen
Date: Mon, 21 Jul 2025 19:24:24 +0800
Subject: [PATCH 24/49] =?UTF-8?q?=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 | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index e3b062a6..bab5e0e3 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -110,7 +110,7 @@
十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
-
+
重新检测
From ea8143db2b3d43622f555e5146842089fbcf1c04 Mon Sep 17 00:00:00 2001
From: joshen
+
十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
From de14f9f561544b8ad3361a96d7d01dbd0327d6f2 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 19:26:19 +0800
Subject: [PATCH 25/49] =?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/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 bab5e0e3..62f1cff0 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1439,7 +1439,7 @@
let timer = setTimeout(function () {
timedOut = true;
xmlhttp.abort();
- }, 1);
+ }, 3000);
xmlhttp.open("HEAD", window.location.protocol + "//uapi.boe.com.cn/500.html", true);
xmlhttp.send();
xmlhttp.onreadystatechange = function () {
From 7be5c072d9e513c9ba9c7d30bd0b3b40cf6efeb5 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 19:37:32 +0800
Subject: [PATCH 26/49] =?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/views/study/coursenew.vue | 8 +++++---
1 file changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 62f1cff0..e559a8f3 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -22,7 +22,7 @@
-
+
-
+
+
-
十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
From 4033eb22945d7324b8c338ad64caaad6a36ba84a Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 20:18:33 +0800
Subject: [PATCH 31/49] =?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/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 9cd1b188..85c5352f 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -110,7 +110,7 @@
+
-
十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
From 8c69fac9be457f021fbe1978dada9de69c89d031 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 20:24:39 +0800
Subject: [PATCH 32/49] =?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/views/study/coursenew.vue | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 85c5352f..19df5946 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -110,9 +110,9 @@
+
重新检测
From 3cd2c5f43365928ac5e6edaf5b036171d00783bb Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 20:33:47 +0800
Subject: [PATCH 33/49] =?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/views/study/coursenew.vue | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 19df5946..5a38f18d 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1326,10 +1326,9 @@
audiences:this.audiences
}).then(rs => {
if (rs.status == 200) {
- if (rs.result.isPermission && this.Internet==1){
+ if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
// this.getInternet()
this.renderCourse = true
- console.log('需要内网环境')
}else{
// this.Internet=1;
this.renderCourse = false
From a4d088a3aed5d7c8a7fa1fb316c3810830b0866d Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 20:44:20 +0800
Subject: [PATCH 34/49] =?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/views/study/coursenew.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 5a38f18d..30bdc4cc 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1332,6 +1332,7 @@
}else{
// this.Internet=1;
this.renderCourse = false
+ this.protocolDialogVisible=true
}
if(rs.result.contents.length==0){
$this.$message.error('课程内容已删除或课程已不再使用');
@@ -1454,7 +1455,7 @@
$this.Internet = 1;
} else {
clearTimeout(timer);
- $this.protocolDialogVisible=true
+ // $this.protocolDialogVisible=true
$this.Internet = 2;
}
} else {
From c7f4a224ff1a5520a8148f749381546b486986ca Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 20:59:06 +0800
Subject: [PATCH 35/49] =?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/views/study/coursenew.vue | 366 +++++++++++++++++-----------------
1 file changed, 185 insertions(+), 181 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 30bdc4cc..eb038f1f 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -114,7 +114,7 @@
0) {
//发送用户学习事件
//console.log('保存到后台学习时长='+duration);
let postData={
- "key": "StudyCourse",//课程学习的key
- "title": "学习课程",//事件的标题
- "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
- "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
- "objId": this.courseInfo.id,//课程的id
- "objType": "1",//类型
- "source":"page",
- "objInfo": ""+this.courseInfo.name,
- "aid":this.userInfo.aid, //当前登录人的id
- "aname":this.userInfo.name,//当前人的姓名
- "status": 1, //状态
- "contentId": this.contentData.id,
+ "key": "StudyCourse",//课程学习的key
+ "title": "学习课程",//事件的标题
+ "parameters":"second:"+duration,//second:value,total:value 本次的学习时长
+ "content": "学习课程【"+this.courseInfo.name+"】",//事件的内容
+ "objId": this.courseInfo.id,//课程的id
+ "objType": "1",//类型
+ "source":"page",
+ "objInfo": ""+this.courseInfo.name,
+ "aid":this.userInfo.aid, //当前登录人的id
+ "aname":this.userInfo.name,//当前人的姓名
+ "status": 1, //状态
+ "contentId": this.contentData.id,
+ }
+ if(this.resType == 10){
+ postData.progress = this.sendEventProgress;
+ }
+ //静默处理
+ apiStat.sendEvent(postData).then(rs=>{
+ if(rs.status == 200) {
+ // this.appendStartTime = new Date();//重新计时
+ // studyUtil.clearStudyDuration(); //清除本地存储
+ } else {
+ console.log(rs.message);
}
- if(this.resType == 10){
- postData.progress = this.sendEventProgress;
- }
- //静默处理
- apiStat.sendEvent(postData).then(rs=>{
- if(rs.status == 200) {
- // this.appendStartTime = new Date();//重新计时
- // studyUtil.clearStudyDuration(); //清除本地存储
- } else {
- console.log(rs.message);
- }
- });
+ });
// let postAppendData = {
// id: this.appentId,
// studyId: this.studyId,
@@ -1638,13 +1638,13 @@
},
//结束追加学习时长
stopStudyTime(){
- //console.log('停止追加学习时长');
- this.isAppendTime=false;
- //暂停让他为空 从新计时
- this.appendStartTime = null
- if (this.appendHandle != null) {
- window.clearTimeout(this.appendHandle);
- }
+ //console.log('停止追加学习时长');
+ this.isAppendTime=false;
+ //暂停让他为空 从新计时
+ this.appendStartTime = null
+ if (this.appendHandle != null) {
+ window.clearTimeout(this.appendHandle);
+ }
},
appendStudyTime() {
// 暂停的时候重新从十五秒开始计时
@@ -1666,11 +1666,11 @@
this.appendHandle && window.clearTimeout(this.appendHandle);
//启动下次追加学习时长
this.appendHandle = setTimeout(() => {
- let endTime = new Date().getTime();
- this.appentInterval = 60
- let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
- this.appendStudyTime();
- this.saveStudyDuration(totalTime)
+ let endTime = new Date().getTime();
+ this.appentInterval = 60
+ let totalTime = Math.round((endTime - this.appendStartTime) / 1000);
+ this.appendStudyTime();
+ this.saveStudyDuration(totalTime)
}, this.appentInterval * 1000);
},
@@ -1736,26 +1736,30 @@
},
handleAudioTimeUpdate(currentTime) {
// if(this.contentStudysLength.length == 0){
- let params = {
- studyId: this.studyId, //学习id,
- courseId: this.courseId, //课程id,
- contentId: this.contentData.id, //内容id,
- contentType: this.contentData.contentType,
- contentName: this.contentData.contentName, //内容名称
- progress: 1,
- status: 2,
- contentTotal: this.totalContent
- };
- if(currentTime > 2 && this.trueFalse){
- apiStudy.studyContent(params).then(()=>{
- if(this.contentData.status<2){
- this.contentData.status = 2;
- }
- })
- this.trueFalse = false
- }
+ let params = {
+ studyId: this.studyId, //学习id,
+ courseId: this.courseId, //课程id,
+ contentId: this.contentData.id, //内容id,
+ contentType: this.contentData.contentType,
+ contentName: this.contentData.contentName, //内容名称
+ progress: 1,
+ status: 2,
+ contentTotal: this.totalContent
+ };
+ if(currentTime > 2 && this.trueFalse){
+ apiStudy.studyContent(params).then(()=>{
+ if(this.contentData.status<2){
+ this.contentData.status = 2;
+ }
+ })
+ this.trueFalse = false
+ }
},
},
+ destroyed(){
+ this.cleanAppendTime();
+ this.stopStudyTime();
+ },
}
From f537608e4f3f1c8276ebb651c239bcb86ae45a15 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 21:10:41 +0800
Subject: [PATCH 36/49] =?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/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 eb038f1f..ba2c84c4 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1425,7 +1425,7 @@
});
},
refreshPage() {
- location.reload();
+ location.reload(true);
},
getXmlHttpRequest() {
if (window.XMLHttpRequest) {
From ac236e8d7c22b9da2a9658bb868398567cf65c3c Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Mon, 21 Jul 2025 21:17:18 +0800
Subject: [PATCH 37/49] =?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/views/study/coursenew.vue | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index ba2c84c4..c730436c 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1426,6 +1426,8 @@
},
refreshPage() {
location.reload(true);
+ this.getInternet();
+ this.loadData();
},
getXmlHttpRequest() {
if (window.XMLHttpRequest) {
@@ -1452,7 +1454,6 @@
if (xmlhttp.status == 200) {
clearTimeout(timer);
$this.Internet = 1;
-
} else {
clearTimeout(timer);
// $this.protocolDialogVisible=true
From a7396e0a6ae6280db7864242da43a29db2ad2284 Mon Sep 17 00:00:00 2001
From: joshen
Date: Wed, 23 Jul 2025 13:37:42 +0800
Subject: [PATCH 38/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=B9=E7=95=8C?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2?=
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 c730436c..6c1baee7 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1807,7 +1807,7 @@
min-height: 400px;
max-height: 800px;
//height: 100%;
- border: 1px solid #ffffff;
+ border: 1px solid #c7c7c7;
padding-right: 20px;
// overflow: auto;
}
From 6d1147545641bfdf90b8bad8901b7ab5f27d9808 Mon Sep 17 00:00:00 2001
From: joshen
Date: Wed, 23 Jul 2025 13:45:38 +0800
Subject: [PATCH 39/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=BE=B9=E7=95=8C?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2?=
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 6c1baee7..c730436c 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1807,7 +1807,7 @@
min-height: 400px;
max-height: 800px;
//height: 100%;
- border: 1px solid #c7c7c7;
+ border: 1px solid #ffffff;
padding-right: 20px;
// overflow: auto;
}
From a96806293666e1bfaa0b828f1ecbe8f67e7d05e5 Mon Sep 17 00:00:00 2001
From: joshen
Date: Wed, 23 Jul 2025 14:40:06 +0800
Subject: [PATCH 40/49] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=A7=86=E9=A2=91?=
=?UTF-8?q?=E8=BF=9B=E5=BA=A6=E6=9D=A1=E6=8B=96=E5=8A=A8?=
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 84bc066d..8e04b51b 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 ea97aee4afd2bbb68963b9f8f4fafe2d4132b72c Mon Sep 17 00:00:00 2001
From: joshen
Date: Wed, 23 Jul 2025 15:07:30 +0800
Subject: [PATCH 41/49] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E8=AF=84=E5=88=86?=
=?UTF-8?q?=E4=BC=9A=E7=82=B9=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/study/coursenew.vue | 45 +++++++++++++++++++++++++----------
1 file changed, 32 insertions(+), 13 deletions(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index c730436c..a06b8ce1 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1800,19 +1800,40 @@
min-height: 400px;
display: flex;
justify-content: space-between;
+ .course-player-container {
+ display: flex;
+ flex-direction: column;
+ height: 100%;
+ }
.course-player{ //内容播放区域
- background-color: #f5f7fa;
- flex:1;
+ flex: 4; // 80%高度
min-width: 700px;
- min-height: 400px;
- max-height: 800px;
- //height: 100%;
+ // min-height: 400px;
+ // max-height: 800px;
+ height: 80%;
border: 1px solid #ffffff;
padding-right: 20px;
// overflow: auto;
}
.course-control{ //内容控制区域
- width: 420px;
+ width: 420px;
+ }
+ }
+
+ @media screen and (max-width: 1200px) {
+ .course-playbox,
+ .course-infobox {
+ flex-direction: column;
+ }
+ .course-player,
+ .course-info {
+ min-width: 100%;
+ padding-right: 0;
+ }
+ .course-control,
+ .course-teacher {
+ width: 100%;
+ margin-top: 20px;
}
}
.course-infobox {
@@ -1934,13 +1955,10 @@
}
.player-box {
- position: absolute;
- // top: 62px;
- // left: 184px;
- width: 300px;
- left: 50%;
- top: 50%;
- transform: translate(-50%, -50%);
+ position: relative;
+ width: 100%;
+ max-width: 300px;
+ margin: 20px auto;
height: 187px;
background: rgba(74, 74, 74, .5);
border-radius: 33px;
@@ -2083,6 +2101,7 @@
}
.course-interact {
+ flex: 1; // 20%高度
height: 54px;
// padding-top: 10px;
// padding-right: 10px;
From 5d0d64abbf96df893e2c685997c1c0207b329a76 Mon Sep 17 00:00:00 2001
From: joshen
Date: Wed, 23 Jul 2025 16:49:08 +0800
Subject: [PATCH 42/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=83=8C=E6=99=AF?=
=?UTF-8?q?=E9=A2=9C=E8=89=B2?=
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 a06b8ce1..00b129d0 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1813,6 +1813,7 @@
height: 80%;
border: 1px solid #ffffff;
padding-right: 20px;
+ background-color: rgb(238, 238, 238);
// overflow: auto;
}
.course-control{ //内容控制区域
From 2ee3daedf6c40f3a13322e5bfee80e51fc3730e1 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 23 Jul 2025 17:10:19 +0800
Subject: [PATCH 43/49] =?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 | 15 +++++++++------
src/components/Course/courseForm.vue | 12 ++++++++++++
2 files changed, 21 insertions(+), 6 deletions(-)
diff --git a/src/api/modules/course.js b/src/api/modules/course.js
index 3f4e503b..df60caa4 100644
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -1,7 +1,7 @@
/**
* 课程的操作，课程的添加，修改，列表查询，课程的审核发布等操作。
* 针对于管理员，教师的功能
- *
+ *
**/
import ajax from '@/utils/xajax.js'
@@ -170,7 +170,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}`);
+}
/**
* 更新内容的名称
* @param {Object} data
@@ -274,7 +276,7 @@ const countWaitAudit = function() {
}
/**
- * [已用courseAudit中的hrbpAuditList替换]
+ * [已用courseAudit中的hrbpAuditList替换]
* 当前用户需要审核的课程列表
* @param {Object} query 同pageList
*/
@@ -283,9 +285,9 @@ const auditList = function(query) {
}
-/**
- * 【已移到courseAudit中】
- * 教师需要审核的课程列表
+/**
+ * 【已移到courseAudit中】
+ * 教师需要审核的课程列表
*/
const teacherAuditList = function(query) {
return ajax.post('/xboe/m/course/audit/teacher-course', query);
@@ -446,6 +448,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 121e32c0..24e910e8 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;
@@ -917,6 +918,17 @@ 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)
+ }
+ },
//获取课程信息
async getDetail(id) {
this.curCourseId = id;
From 3485435c9ebc008107801c017d27d166813233d5 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 23 Jul 2025 17:24:51 +0800
Subject: [PATCH 44/49] =?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 df60caa4..00db854c 100644
--- a/src/api/modules/course.js
+++ b/src/api/modules/course.js
@@ -171,7 +171,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 5276813ebac120538649f0c304bb9547a8630389 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 23 Jul 2025 17:28:36 +0800
Subject: [PATCH 45/49] =?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 | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 24e910e8..32713ab4 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -919,14 +919,18 @@ 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 58fc6264fe479fc70786ae9481fc422e06347c8b Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 23 Jul 2025 17:45:30 +0800
Subject: [PATCH 46/49] =?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 | 1 +
1 file changed, 1 insertion(+)
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 32713ab4..868ed244 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -602,6 +602,7 @@ export default {
this.isPermission = false;
return;
}
+ console.log("--- this.dicts = ",this.dicts)
this.isPermission = this.dicts.includes(orgId);
/*if(this.isPermission && !this.courseInfo && !this.courseInfo.device){
this.courseInfo.device = 4;
From 0864704c4cdc4a6131b2ae968ef12f1c372d84d4 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 23 Jul 2025 17:53:43 +0800
Subject: [PATCH 47/49] =?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 | 9 ---------
1 file changed, 9 deletions(-)
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index 868ed244..eef5a11f 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -604,15 +604,6 @@ export default {
}
console.log("--- this.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)
},
// 关键字的更改
From dff81df91d90d98770fb816e6c00d422593b69a9 Mon Sep 17 00:00:00 2001
From: joshen
Date: Fri, 25 Jul 2025 20:52:43 +0800
Subject: [PATCH 48/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86?=
=?UTF-8?q?=E5=8F=AF=E8=A7=81?=
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 00b129d0..c5e6b85e 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1328,8 +1328,8 @@
}else{
// this.Internet=1;
this.renderCourse = false
- this.protocolDialogVisible=true
}
+ this.protocolDialogVisible=true
if(rs.result.contents.length==0){
$this.$message.error('课程内容已删除或课程已不再使用');
return;
From d237dc99ee6ad3d9f54b5d4a849fab713bf2b643 Mon Sep 17 00:00:00 2001
From: joshen
Date: Fri, 25 Jul 2025 21:01:58 +0800
Subject: [PATCH 49/49] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=BC=B9=E6=A1=86?=
=?UTF-8?q?=E5=8F=AF=E8=A7=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/study/coursenew.vue | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index c5e6b85e..d954787e 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -1322,14 +1322,17 @@
audiences:this.audiences
}).then(rs => {
if (rs.status == 200) {
+ if(rs.result.isPermission){
+ this.protocolDialogVisible=true
+ }
if (!rs.result.isPermission || (rs.result.isPermission && this.Internet==1)){
// this.getInternet()
this.renderCourse = true
}else{
// this.Internet=1;
this.renderCourse = false
+ this.protocolDialogVisible=true
}
- this.protocolDialogVisible=true
if(rs.result.contents.length==0){
$this.$message.error('课程内容已删除或课程已不再使用');
return;
- 十分抱歉，您当前的网络环境不符合观看要求。为了保障案例信息的安全，您需要接入公司内网才能观看。
+ 十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。
十分抱歉，您当前的网络环境不符合观看要求。为了保障课程信息的安全，您需要接入公司内网才能观看。
-
+
重新检测
@@ -531,10 +531,6 @@
return treeList;
}
},
- destroyed(){
- this.cleanAppendTime();
- this.stopStudyTime();
- },
methods: {
handleOpen(key,path){
if(this.isFalse){
@@ -549,13 +545,13 @@
},
noteChange(){
//视频点定位，直接到播放的视频位置
- this.timer = new Date().getTime()
+ this.timer = new Date().getTime()
},
//清空追加学习时长事件
cleanAppendTime(){
- if(this.appendStudyOtherHandle){
- window.clearTimeout(this.appendStudyOtherHandle);
- }
+ if(this.appendStudyOtherHandle){
+ window.clearTimeout(this.appendStudyOtherHandle);
+ }
},
//非音视频课学习时长的增加,每一分钟保存一次
appendStudyOtherTime() {
@@ -566,46 +562,46 @@
if (!this.contentData.id) {
return;
}
- //每一分钟保存一次
- // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
- let $this=this;
- let startTime = new Date().getTime();
- this.appendStudyOtherHandle = setTimeout(function() {
- let endTime = new Date().getTime();
- let totalTime = Math.round((endTime - startTime) / 1000);
- $this.cumulativeDuration += totalTime;
- if($this.cumulativeDuration <= $this.maxDuration){
- //发送时长
- $this.sendStudyOtherTime(totalTime);
- //递归调用
- $this.appendStudyOtherTime();
- }else{
- clearTimeout(this.appendStudyOtherHandle);
- $this.cumulativeDuration = 0;
- $this.maxDuration = 0;
- }
- }, 1000*60);
+ //每一分钟保存一次
+ // 取消阅读的每分钟六十秒的计时，最多是设置的时间或默认时间
+ let $this=this;
+ let startTime = new Date().getTime();
+ this.appendStudyOtherHandle = setTimeout(function() {
+ let endTime = new Date().getTime();
+ let totalTime = Math.round((endTime - startTime) / 1000);
+ $this.cumulativeDuration += totalTime;
+ if($this.cumulativeDuration <= $this.maxDuration){
+ //发送时长
+ $this.sendStudyOtherTime(totalTime);
+ //递归调用
+ $this.appendStudyOtherTime();
+ }else{
+ clearTimeout(this.appendStudyOtherHandle);
+ $this.cumulativeDuration = 0;
+ $this.maxDuration = 0;
+ }
+ }, 1000*60);
},
sendStudyOtherTime(totalTime){
//静默处理
apiStat.sendEvent({
- "key": "StudyCourseOther",//课程学习的key
- "title": "非音视频课内容",//事件的标题
- "parameters":"second:" + totalTime,//second:value 本次的学习时长
- "content": "学习课程",//事件的内容
- "objId": this.courseInfo.id,//课程的id
- "objType": "1",//类型
- "source":"page",
- "objInfo": ""+this.courseInfo.name,
- "aid":this.userInfo.aid, //当前登录人的id
- "aname":this.userInfo.name,//当前人的姓名
- "status": 1 //状态
- }).then(rs=>{
- if(rs.status != 200) {
- console.log(rs.message);
- }
- });
+ "key": "StudyCourseOther",//课程学习的key
+ "title": "非音视频课内容",//事件的标题
+ "parameters":"second:" + totalTime,//second:value 本次的学习时长
+ "content": "学习课程",//事件的内容
+ "objId": this.courseInfo.id,//课程的id
+ "objType": "1",//类型
+ "source":"page",
+ "objInfo": ""+this.courseInfo.name,
+ "aid":this.userInfo.aid, //当前登录人的id
+ "aname":this.userInfo.name,//当前人的姓名
+ "status": 1 //状态
+ }).then(rs=>{
+ if(rs.status != 200) {
+ console.log(rs.message);
+ }
+ });
},
//笔记组件触发，播放指定时间
onPlayVideo(contentId,time){
@@ -614,32 +610,32 @@
console.log(contentId,this.contentData.id,'两个内容id');
let $this=this;
if(this.contentData.id==contentId){
- this.onPlayerPause()
- this.contentData.lastStudyTime=time;
- setTimeout(() => {
- $this.$refs.myVideoPlayer.startPlay(time);
- }, 10)
- console.log('开始播放1');
+ this.onPlayerPause()
+ this.contentData.lastStudyTime=time;
+ setTimeout(() => {
+ $this.$refs.myVideoPlayer.startPlay(time);
+ }, 10)
+ console.log('开始播放1');
}else{
- //通过contentId
- let toResContent=null;
- this.contentList.forEach(c => {
- if(c.id==contentId){
- c.lastStudyTime=time;
- toResContent=c;
- }
- });
- if(toResContent){
-
- this.changePlayRes(toResContent);
- setTimeout(() => {
- $this.$refs.myVideoPlayer.startPlay(time);
- }, 10)
-
- console.log('开始播放2');
- }else{
- this.$message.error('资源已不存在或更换过，已无法定位');
+ //通过contentId
+ let toResContent=null;
+ this.contentList.forEach(c => {
+ if(c.id==contentId){
+ c.lastStudyTime=time;
+ toResContent=c;
}
+ });
+ if(toResContent){
+
+ this.changePlayRes(toResContent);
+ setTimeout(() => {
+ $this.$refs.myVideoPlayer.startPlay(time);
+ }, 10)
+
+ console.log('开始播放2');
+ }else{
+ this.$message.error('资源已不存在或更换过，已无法定位');
+ }
}
this.playerBoxShow = false;
},
@@ -717,23 +713,23 @@
}else if(r.contentType==50){ //scorm
this.scormUrl='';
apiCourseFile.detail(r.contentRefId).then(cfrs => {
- if(cfrs.status==200){
- this.curCFile = cfrs.result;
- //this.scormUrl=cfrs
- let pars='?mode=normal&r='+Math.random();
- pars+='&scormId='+this.curCFile.id;
- pars+='&courseId='+this.courseId;
- pars+='&contentId='+r.id;
- pars+='&studentId='+this.userInfo.aid;
- pars+='&studentName='+encodeURIComponent(this.userInfo.name);
- pars+='&lmsId='+this.studyId;
- pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
- let urlPre=window.location.protocol;
- let configUrl=process.env.VUE_APP_SCORM_URL;
- configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
+ if(cfrs.status==200){
+ this.curCFile = cfrs.result;
+ //this.scormUrl=cfrs
+ let pars='?mode=normal&r='+Math.random();
+ pars+='&scormId='+this.curCFile.id;
+ pars+='&courseId='+this.courseId;
+ pars+='&contentId='+r.id;
+ pars+='&studentId='+this.userInfo.aid;
+ pars+='&studentName='+encodeURIComponent(this.userInfo.name);
+ pars+='&lmsId='+this.studyId;
+ pars+='&scoId=';//不指定，scorm模块自动根据学习记录定位
+ let urlPre=window.location.protocol;
+ let configUrl=process.env.VUE_APP_SCORM_URL;
+ configUrl=urlPre+configUrl.substring(configUrl.indexOf(':')+1);
- this.scormUrl=configUrl+pars;//播放的首页
- }
+ this.scormUrl=configUrl+pars;//播放的首页
+ }
});
}else if (r.contentType == 52) {
@@ -764,12 +760,12 @@
setTimeout(() => {
this.isContentTypeTwo = r.contentType
$this.isShowTime()
- }, 2000);
- }
+ }, 2000);
+ }
}
//以下是学习记录,50是scorm项目
if (this.contentData.contentType > 20 && this.contentData.contentType !== 50) { //非视频类的
- //用户的学习时长，非音视频课程学习,单独的处理
+ //用户的学习时长，非音视频课程学习,单独的处理
this.isAppendTime = false;
this.appendStudyOtherHandle = setTimeout(function() {
@@ -779,18 +775,18 @@
// 没有设置默认时长三十分钟，
$this.maxDuration = r.duration !== 0 ? r.duration * 2 : $this.defaultMaxTime;
$this.$store.dispatch("userTrigger", {
- "key": "StudyCourseOther",//课程学习的key
- "title": "非音视频课内容",//事件的标题
- "parameters":"second:15",//second:value 本次的学习时长
- "content": "学习课程",//事件的内容
- "objId": $this.courseInfo.id,//课程的id
- "objType": "1",//类型
- "source":"page",
- "objInfo": ""+$this.courseInfo.name,
- "aid":$this.userInfo.aid, //当前登录人的id
- "aname":$this.userInfo.name,//当前人的姓名
- "status": 1 //状态
- });
+ "key": "StudyCourseOther",//课程学习的key
+ "title": "非音视频课内容",//事件的标题
+ "parameters":"second:15",//second:value 本次的学习时长
+ "content": "学习课程",//事件的内容
+ "objId": $this.courseInfo.id,//课程的id
+ "objType": "1",//类型
+ "source":"page",
+ "objInfo": ""+$this.courseInfo.name,
+ "aid":$this.userInfo.aid, //当前登录人的id
+ "aname":$this.userInfo.name,//当前人的姓名
+ "status": 1 //状态
+ });
$this.appendStudyOtherTime();
}, 15000); //非音视频课程学习,十五秒后记录
this.isContentType = this.contentData.contentType
@@ -807,20 +803,20 @@
this.$nextTick(function(){
- if (r.contentType == 10) {
- console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
- console.log('视频处理progressVideo',this.contentData.progressVideo)
- this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
- }
+ if (r.contentType == 10) {
+ console.log('视频处理lastStudyTime',this.contentData.lastStudyTime)
+ console.log('视频处理progressVideo',this.contentData.progressVideo)
+ this.$refs.myVideoPlayer.updateProgressByClickBar2(this.contentData.lastStudyTime,this.contentData.progressVideo);
+ }
- let h=$this.$refs.coursePlayer.offsetHeight;
- //解决获取高度不正的问题
- if(h>400 && h<500){
- h=h+40;
- }else if(h>500){
- h=h+60;
- }
- $this.controlHeight=h-95;
+ let h=$this.$refs.coursePlayer.offsetHeight;
+ //解决获取高度不正的问题
+ if(h>400 && h<500){
+ h=h+40;
+ }else if(h>500){
+ h=h+60;
+ }
+ $this.controlHeight=h-95;
})
@@ -962,9 +958,9 @@
this.interactRuning = true;
let teacherId='';
if(this.teachers.length>0){
- teacherId=this.teachers[0].teacherId;
+ teacherId=this.teachers[0].teacherId;
}else{
- teacherId=this.courseInfo.sysCreateAid
+ teacherId=this.courseInfo.sysCreateAid
}
let postData = {
objType: 1,
@@ -1105,7 +1101,7 @@
class: 'catalog-cell-state1'
};
}
- break;
+ break;
}
return data;
},
@@ -1166,8 +1162,8 @@
var markDiv = div.querySelector("#" + divId);
console.log("去除水印 ---- gx markDiv ----",markDiv);
if (markDiv) {
- console.log("执行去除水印 ---- gx markDiv ----",markDiv);
- div.removeChild(markDiv);
+ console.log("执行去除水印 ---- gx markDiv ----",markDiv);
+ div.removeChild(markDiv);
}
}
},
@@ -1226,9 +1222,9 @@
var time = localStorage.getItem('videoProgressData')
var arr = time&&JSON.parse(time) || {}
if(arr[this.blobId] && this.contentData.progressVideo