+
+
+
-
-
@@ -148,90 +151,16 @@
-
-
-
-
-
- 只显示试题
- 保存
- 重新选择
-
-
-
-
-
-
-
- 分钟
-
-
-
-
-
-
- %
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 最高一次
- 最后一次
-
-
-
-
- 按百分制显示成绩（实际成绩*100/实际总分）
-
-
-
-
-
-
+
+
+ 重新选择
+
+
-
+
@@ -326,10 +255,8 @@
+
+
diff --git a/src/views/study/coursenew.vue b/src/views/study/coursenew.vue
index 889b987f..c59ad269 100644
--- a/src/views/study/coursenew.vue
+++ b/src/views/study/coursenew.vue
@@ -85,6 +85,9 @@
+
+
+
@@ -317,6 +320,7 @@
data() {
return {
cutOrgNamePath,
+ scormUrl:'',//当前播放的scormUrl
loading:false,
controlHeight:400,//左边控制区域的内容高度
timer: '',
@@ -436,9 +440,8 @@
this.$router.push({path:this.$xpage.getHomePath(tea.teacherId)})
},
noteChange(){
- //视频点定位，直接到播放的视频位置
+ //视频点定位，直接到播放的视频位置
this.timer = new Date().getTime()
-
},
//非音视频课学习时长的增加,每一分钟保存一次
appendStudyOtherTime() {
@@ -592,7 +595,25 @@
}
});
// }
- } else if (r.contentType == 52) {
+ }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模块自动根据学习记录定位
+ this.scormUrl=process.env.VUE_APP_SCORM_URL+pars;//播放的首页
+ }
+ });
+
+ }else if (r.contentType == 52) {
this.isAppendTime = false;
if (r.content.startsWith('\{')) {
this.conLink = JSON.parse(r.content);
@@ -617,6 +638,7 @@
if (this.contentData.status < 2) {
this.contentData.status = 2; //进行中
}
+ //以下是学习记录
if (this.contentData.contentType > 20) { //非视频类的
//用户的学习时长，非音视频课程学习,单独的处理
this.isAppendTime = false;
@@ -625,9 +647,15 @@
$this.appendStudyOtherTime();
}, 1000*60*2); //非音视频课程学习,2分钟后记录，因为一次记录是60秒
//this.appendStudyTime();
- this.handleTimeout = setTimeout(function() {
- $this.saveStudyInfo();
- }, 5000); //5秒后记录学习完成
+ if (this.contentData.contentType != 50) {
+ this.handleTimeout = setTimeout(function(){
+ $this.saveStudyInfo();
+ }, 5000); //5秒后记录学习完成
+ }else{
+ //scorm课件不记录完成情况，由播放回调记录完成情况
+ //当前先保存学习记录，未学习状态
+ this.saveScormStudy();
+ }
}
@@ -1229,6 +1257,34 @@
}
}
},
+ saveScormStudy() {
+ //只记录SCORM课件的学习
+ if (this.contentData.contentType != 50) {
+ return;
+ }
+ if (this.contentData.status == 9) {
+ //已学习完的，不会再记录
+ return;
+ }
+ let params = {
+ studyId: this.studyId, //学习id,
+ courseId: this.courseId, //课程id,
+ contentId: this.contentData.id, //内容id,
+ contentType: this.contentData.contentType,
+ contentName: this.contentData.contentName, //内容名称
+ progress: 0,
+ status: 1,
+ contentTotal: this.totalContent
+ };
+ apiStudy.studyContent(params).then(res => {
+ if (res.status == 200) {
+ this.contentData.status = 2; //进行中
+ this.contentData.studyItemId = res.result; //学习记录id
+ } else {
+ console.log('记录学习失败:' + res.message + '，' + res.error);
+ }
+ });
+ },
saveStudyInfo() {
//记录课件学习信息
if (this.contentData.contentType >= 60) {
diff --git a/src/views/user/Setting.vue b/src/views/user/Setting.vue
index 855827ad..9df083d4 100644
--- a/src/views/user/Setting.vue
+++ b/src/views/user/Setting.vue
@@ -24,22 +24,21 @@
![]()
+ ![]()
-
教师职业照
-工作经历
- {{ teachtext.workExperience }} + {{ teachform.workExperience }}
+
擅长课程
-
- {{ teachtext.courses }}
-
+ {{ teachform.courses }}
+
专长
-
- {{ teachtext.expertise }}
+
@@ -80,21 +79,12 @@
+ {{ item }}
教师专长
-
-
-
-
+
+
+
{{sys.name}}
取消
- 保存
+ 保存
@@ -297,6 +287,8 @@
}
};
return {
+ fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
+ sysTypeListtear:[],
teaechswich:false,
props: { multiple: true },
options: [{
@@ -357,11 +349,13 @@
hideHome:false,// 是否隐藏个人主页
cities: cityOptions,
checkboxGroup: [],
+ checkboxtearGroup: [],
radio: '1',
form:{
account:{}
},
teachform:{
+ id:'',
photo:'',
courses:'',//擅长课程
workExperience:'', //工作经历
@@ -383,6 +377,8 @@
sysTypeListMap:[],
interestList:[],//已有兴趣爱好列表
interestIsEdit:false,
+ childData:[],
+ workname:[],
}
},
computed: {
@@ -415,10 +411,14 @@
}
},
+ Edittearch(){
+ this.gettearch();
+ },
// 监听"编辑按钮"事件变化
interestIsEdit(){
this.load();
this.getInfo();
+
}
@@ -430,21 +430,39 @@
this.hideHome = !this.userInfo.showHome;
this.load();
this.getInfo();
+ this.gettearch();
this.getSysTypeTree().then(rs => {
this.sysTypeListMap = rs;
+ // console.log(rs);
+ this.sysTypeListtear = rs;
});
this.Teacherprofile();
this.Teacherinfo();
},
methods:{
- teacherUpdata(){
- apiTeach.update(this.teachform).then(res =>{
- console.log('编辑成功')
- })
+ gettearch(){
+ // console.log(this.checkboxtearGroup,'lmj');
},
+
Teacherinfo(){
apiTeach.detailTeacher(this.userInfo.aid).then(res =>{
- this.teachtext = res.result;
+ this.teachform.courses = res.result.courses;
+ this.teachform.workExperience = res.result.workExperience;
+ this.tearchUrl = this.fileBaseUrl + res.result.photo;
+ this.teachform.expertise = res.result.expertise.split( ',' );
+ this.sysTypeListtear.forEach(nm =>{
+ nm.children.forEach(lk =>{
+ this.childData.push(lk);
+ })
+ })
+ this.teachform.expertise.forEach(item =>{
+ this.childData.forEach(it =>{
+ if(item == it.id){
+ this.workname.push(it.name);
+ console.log(this.workname)
+ }
+ })
+ })
})
},
Teacherprofile(){
@@ -516,6 +534,7 @@
this.checkboxGroup.push(item.refId);
item.name = this.sysTypeName(item.refId)
})
+ // console.log(res.result);
this.interestList = res.result;
}
})
@@ -525,6 +544,23 @@
return this.sysTypeMap.get(code);
},
+ teacherUpdata(){
+ if(this.checkboxtearGroup.length <3 && this.checkboxtearGroup.length>=1) {
+ this.$message.error('至少选择三个专长！')
+ return;
+ }
+ console.log(this.checkboxtearGroup);
+ this.teachform.expertise = this.checkboxtearGroup.toString();
+ console.log(this.teachform.expertise);
+ this.teachform.id = this.userInfo.aid;
+ apiTeach.updateTeacher(this.teachform).then(res =>{
+ console.log('编辑成功')
+ })
+ this.Edittearch = true;
+ this.Teacherinfo();
+
+ },
+
// 更新用户与偏好数据
saveHobby(){
let data = []
@@ -677,6 +713,7 @@
height: 40px;
width: 100%;
h4{
+ cursor: pointer;
float: left;
font-weight: 400;
margin: 0;
-
+
{{ch.name}}
@@ -106,7 +96,7 @@