-
+
-
+ {{ contentTypeFilter(item.contentType).text }}
-
- {{ contentTypeFilter(item.contentType).text }}
- {{ item.title }}
-
-
讲师：{{ item.authorName}}
-
收藏时间：{{ item.time || item.favoritesTime}}
-
-
-
+
+
+ {{ item.title }}
+ #课程#
+ {{toScore(item.score)}}分
+
+
+
+
取消收藏
-
-
+
+
+
diff --git a/src/components/Course/courseImage.vue b/src/components/Course/courseImage.vue
index 0370ede8..fc63b158 100644
--- a/src/components/Course/courseImage.vue
+++ b/src/components/Course/courseImage.vue
@@ -1,8 +1,8 @@
-
+
{
- this.submitTest();
+ this.submitTest();
}
});
@@ -330,19 +336,20 @@ export default {
showClose:false,
type: 'warning'
}).then(() => {
- this.submitTest()
+ this.submitTest(score);
}).catch(()=>{
-
+
})
}else{
- this.submitTest()
+ this.submitTest(score);
}
},
countTest(){ //计算考试的分数
//console.log(this.paper.items);
let totalScore=0;
this.paper.items.forEach(item => {
- totalScore+=item.score;//加到总分中
+ item.score=parseInt(item.score);
+ totalScore+=item.score;//加到总分中
if(item.type != 102){
item.userAnswer='';
item.options.forEach(opt => {
@@ -376,11 +383,20 @@ export default {
noAnswers.push(idx+1);
}
let allRight = true;
+ //console.log('用户的答案',item.userAnswer);
item.options.forEach(it =>{
- if(it.answer && item.userAnswer.indexOf(it.id)==-1) {
- allRight=false;
+ //console.log('选项',it.answer,it.id,item.userAnswer.indexOf(it.id));
+ if(it.answer){ //正确答案
+ if(item.userAnswer.indexOf(it.id)==-1){
+ allRight=false;
+ }
+ }else{
+ if(item.userAnswer.indexOf(it.id)>-1){
+ allRight=false;
+ }
}
});
+ //console.log('是否回答正确',allRight)
if(allRight){
scoreNum+=item.score;
}
@@ -391,14 +407,22 @@ export default {
if(scoreNum === null)scoreNum=0;
this.lastScore=scoreNum;
//转化成百分制显示
+ //console.log(scoreNum,totalScore,'实际分和总分');
if(this.info.percentScore){
this.lastScore=parseInt(scoreNum*100/totalScore);
}
+ //console.log('本次得分='+this.lastScore);
return this.lastScore;
},
- submitTest(){ //提交处理
+ submitTest(testScore){ //提交处理
+ //清空提示
+ if(this.timer){
+ window.clearInterval(this.timer);
+ }
let now=new Date();
- let testScore=this.countTest();
+ if(!testScore){
+ testScore=this.countTest();
+ }
let postData={
studyId:this.studyId,//
studyItemId:this.studyItemId,//前面已经给了
@@ -410,7 +434,7 @@ export default {
arrange:this.info.arrange,
passLine:this.info.passLine,
randomMode:this.info.randomMode,
- score:this.lastScore,//分数需要计算，在检查是否填写完整性时就可以计算出分数
+ score:testScore,
paperJson:JSON.stringify(this.paper),//原来是对象，这里要也要对象
//startTime:formatDate(this.startTime),//此时间需要格式化,格式化时间可以放在util中
//endTime:formatDate(now),
@@ -432,6 +456,8 @@ export default {
}
});
this.testStart = false;
+ //获取最新的成绩
+ this.loadStudyItemId();
this.$emit('submit',this.lastScore);//考试提交回调处理
} else {
this.$message.error(res.message);
diff --git a/src/components/Course/myNote.vue b/src/components/Course/myNote.vue
new file mode 100644
index 00000000..4bca37ab
--- /dev/null
+++ b/src/components/Course/myNote.vue
@@ -0,0 +1,579 @@
+
+
+
+
+
+
+
+
![]()
+ {{formatSeconds(play_Time)}}
+
![]()
+
+
+
+
+
+
+
+
+
+
+
+
{{note.sysUpdateTime}}
+
{{note.openType == 9?'公开':'私密'}}
+
+
+
+
+
+
+
+ 
删除
+
+ 
编辑
+
+
+
+
+
+
![]()
+ {{formatSeconds(note.playTime)}}
+
+
+ {{note.content}}
+
+
+
已经到底啦
+
+
+
![]()
+
您还没有记录此课程的笔记哦～
+
+
+
+
+ {{mynoteData.sysCreateTime}}
+ {{mynoteData.openType == 9?'公开':'私密'}}
+
+
+
+
+
![]()
+ {{formatSeconds(mynoteData.playTime)}}
+
![]()
+
+
+
+
+
+
+
+
+
+
![]()
视频位置
+
公开
+
私密
+
取消
+
保存
+
+
+
+
+
![]()
{{inAnimationText}}
+
+
+
-
-
-
-
+
+
+
+
+ 分享给了{{ item.toAname }}
-
+
+ {{ item.sysCreateBy }}分享给了我
+
+
已查看
+
未查看
+
{{ item.time }}
+
+
+
【课程】{{item.title}}
+
+
+ 撤回
+
+
+
+
+
+
+
-
-
+
+ 分享给：{{ item.toAname }}
+
+
分享人：{{ item.toAname }}
分享时间：{{ item.time }}
@@ -27,14 +49,12 @@
-
-
-
-
-
+
+ {{item.isRead?'[已查看]':'[未查看]'}}
+
-
-
-->
+
@@ -124,11 +144,11 @@ export default {
}
}
- if(item.contentType == 20) {
+ // if(item.contentType == 20) {
this.$router.push({path:'/course/detail',query:{id:item.objId || item.id}})
- } else {
- this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
- }
+ // } else {
+ // this.$router.push({path:'/course/micro',query:{id:item.objId || item.id}})
+ // }
// window.open(`${this.webBaseUrl}/course/detail?id=${item.objId}`)
},
@@ -140,6 +160,60 @@ export default {
diff --git a/src/components/Gonggao.vue b/src/components/Gonggao.vue
new file mode 100644
index 00000000..45dd035b
--- /dev/null
+++ b/src/components/Gonggao.vue
@@ -0,0 +1,59 @@
+
+
+
+
+
+
最新公告
+
+ 为了保障信息安全，为您提供更优质的服务，学习平台计划在2022年11月9日0点-11月9日早6点进行服务器升级，
+ 在此期间，您无法登录学习，给您带来不便，还请谅解，感谢您的理解与支持。
+
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/answerList.vue b/src/components/HomePage/answerList.vue
new file mode 100644
index 00000000..0dee5e93
--- /dev/null
+++ b/src/components/HomePage/answerList.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/articleList.vue b/src/components/HomePage/articleList.vue
new file mode 100644
index 00000000..e6623838
--- /dev/null
+++ b/src/components/HomePage/articleList.vue
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/bookList.vue b/src/components/HomePage/bookList.vue
new file mode 100644
index 00000000..b89a41b7
--- /dev/null
+++ b/src/components/HomePage/bookList.vue
@@ -0,0 +1,101 @@
+
+
+
+ -
+
+
+
《百年孤独》[哥伦比亚] 加西亚·马尔克斯
+
开始很吃力，越读越上瘾，惊人的叙事与潮水般的叙事，野兽般撕开真理的外衣。从四姑娘的第一本书，就开始了他的抄袭生涯而已开始很吃力，越读越上瘾，惊人的叙事与潮水般的叙事，野兽般撕开真理的外衣。从四姑娘的第一本书，就开始了了他的···
+
+
+
+
+ 隐藏
+
+ 查看图书
+
+
+
+
+
![]()
+
还没有书籍
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/HomePage/caseList.vue b/src/components/HomePage/caseList.vue
new file mode 100644
index 00000000..b3f40ec6
--- /dev/null
+++ b/src/components/HomePage/caseList.vue
@@ -0,0 +1,271 @@
+
+
+
+
+
+
+ {{item.aname}}{{item.cusInfo}}
+ {{item.eventTime}}
+
+ 已隐藏
+ 隐藏
+
+
+
+
+
+
+
+
{{ item.authorInfo.sign }}
+
+
{{ orgDomainTranslate(item.info.orgDomain) }}
+
{{ orgDomainTranslate(item.info.orgDomainParent) }}
+
{{ majorTypeTranslate(item) }}
+
{{ item.info.keyword1 }}
+
{{ item.info.keyword2 }}
+
{{ item.info.keyword3 }}
+
{{ item.info.keyword4 }}
+
{{ item.info.keyword5 }}
+
+ {{item.info.summary}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/courseList.vue b/src/components/HomePage/courseList.vue
new file mode 100644
index 00000000..5c958ba3
--- /dev/null
+++ b/src/components/HomePage/courseList.vue
@@ -0,0 +1,169 @@
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/favoritesNote.vue b/src/components/HomePage/favoritesNote.vue
new file mode 100644
index 00000000..360d7f25
--- /dev/null
+++ b/src/components/HomePage/favoritesNote.vue
@@ -0,0 +1,113 @@
+
+
+
+
+
![]()
+
还没有笔记
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/HomePage/followList.vue b/src/components/HomePage/followList.vue
new file mode 100644
index 00000000..d86fa870
--- /dev/null
+++ b/src/components/HomePage/followList.vue
@@ -0,0 +1,377 @@
+
+
+
+ - {{userInfo.aid == pageId ?'我关注的人':'TA关注的人'}}
+ - {{userInfo.aid == pageId ?'关注我的人':'关注TA的人'}}
+
+
+
+
+
+
{{item.userFollow.authorInfo.name}}
+
+
+
{{item.userFollow.authorInfo.sign}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
![]()
+
还没有关注的人
+
+
+
+
+
+
{{maPage.userFollow.authorInfo.name}}
+
+
+
{{maPage.userFollow.authorInfo.sign}}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/homePage.vue b/src/components/HomePage/homePage.vue
new file mode 100644
index 00000000..f73b18f8
--- /dev/null
+++ b/src/components/HomePage/homePage.vue
@@ -0,0 +1,658 @@
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/noteList.vue b/src/components/HomePage/noteList.vue
new file mode 100644
index 00000000..92f1543b
--- /dev/null
+++ b/src/components/HomePage/noteList.vue
@@ -0,0 +1,122 @@
+
+
+
+
+
+
+
diff --git a/src/components/HomePage/putTo.vue b/src/components/HomePage/putTo.vue
new file mode 100644
index 00000000..f9c634bd
--- /dev/null
+++ b/src/components/HomePage/putTo.vue
@@ -0,0 +1,121 @@
+
+
+
+
+
+
+
diff --git a/src/components/ImageUpload/artimgUpload.vue b/src/components/ImageUpload/artimgUpload.vue
new file mode 100644
index 00000000..83baab8e
--- /dev/null
+++ b/src/components/ImageUpload/artimgUpload.vue
@@ -0,0 +1,235 @@
+
+
+
+
+
+
+
将文件拖到此处，或点击上传
+
只能上传jpg/png/bmp/jpeg文件，且不超过500kb
+
+
+ ![]()
+
+
+
+
+
+
diff --git a/src/components/ImageUpload/index.vue b/src/components/ImageUpload/index.vue
index 32e91d8e..69fbf029 100644
--- a/src/components/ImageUpload/index.vue
+++ b/src/components/ImageUpload/index.vue
@@ -15,6 +15,7 @@
:show-file-list="false"
:headers="headers"
style="display: inline-block; vertical-align: top;">
+
diff --git a/src/components/NoteUpload/index.vue b/src/components/NoteUpload/index.vue
new file mode 100644
index 00000000..8460c8ad
--- /dev/null
+++ b/src/components/NoteUpload/index.vue
@@ -0,0 +1,268 @@
+
+
+
+
+
+ 将文件拖到此处，或点击上传
+ 支持拓展名：支持扩展名：{{ty}} 图片支持批量上传，最多9张
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/src/components/Portal/artauthor.vue b/src/components/Portal/artauthor.vue
new file mode 100644
index 00000000..a3371338
--- /dev/null
+++ b/src/components/Portal/artauthor.vue
@@ -0,0 +1,171 @@
+
+
+
+
+
+ {{userName}}
+ ({{userInfo}})
+
+
{{ usersign }}
+
+
+
+
+
diff --git a/src/components/Portal/author.vue b/src/components/Portal/author.vue
index 496288fc..7e1e8958 100644
--- a/src/components/Portal/author.vue
+++ b/src/components/Portal/author.vue
@@ -6,11 +6,12 @@
{{userName}}
- ({{userInfo}})
+ {{userInfo}}
+
+
diff --git a/src/components/Portal/authorInfo.vue b/src/components/Portal/authorInfo.vue
index a6cd938b..49a67cdd 100644
--- a/src/components/Portal/authorInfo.vue
+++ b/src/components/Portal/authorInfo.vue
@@ -1,25 +1,25 @@
+ 
- 
+ 
- 
详细介绍：
@@ -65,25 +47,27 @@
