+
{{ course.studys }}人学习
@@ -371,16 +371,29 @@ export default {
topOrder:true,
pageIndex: pageIndex
};
+ let isTopList = [];
+ let data = [];
apiCoursePortal.pageList(course).then(res => {
if (res.status == 200 && res.result.list.length > 0) {
let courseIds = [];
res.result.list.forEach(item => {
item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '' ,sex:null};
courseIds.push(item.id);
+ console.log(item.isTop)
+ if(item.isTop == true) {
+ isTopList.push(item);
+ console.log(isTopList)
+
+ }else{
+ data.push(item);
+ }
});
this.loadCouserTeacher(res.result.list, courseIds);
- this.courseList.list = res.result.list;
+ this.courseList.list.push(...isTopList,...data);
this.couname = res.result.list.name;
+
+
+
if (res.result.count - pageIndex * num < 8) {
this.pageIndex = 0;
}
@@ -390,6 +403,7 @@ export default {
console.log('加载课程信息失败:' + res.error);
}
});
+
// apiCourse.list({orderType,num,device:1}).then(res => {
// if(res.status==200){
diff --git a/src/views/course/ManageList.vue b/src/views/course/ManageList.vue
index 7bc0b11a..d1172922 100644
--- a/src/views/course/ManageList.vue
+++ b/src/views/course/ManageList.vue
@@ -402,12 +402,15 @@ export default {
},
// 置顶
setTop(row) {
- let params = {
+ let params = {
ids: row.id,//课程id,多个使用逗号分隔,
title:row.name,//课程的名称,
top:!row.isTop,// top 是否置顶}
}
- this.$confirm('此操作将置顶此课程, 是否继续?', '提示', {
+ console.log(row.isTop);
+ if(row.isTop == false){
+ // console.log('fa')
+ this.$confirm('此操作将置顶此课程, 是否继续?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'
@@ -426,9 +429,38 @@ export default {
}).catch(() => {
this.$message({
type: 'info',
- message: '已取消删除'
+ message: '置顶失败'
});
});
+ }else if(row.isTop == true){
+ this.$confirm('此操作将取消置顶此课程, 是否继续?', '提示', {
+ confirmButtonText: '确定',
+ cancelButtonText: '取消',
+ type: 'warning'
+ }).then(() => {
+ apiCourse.setTop(params).then(res=>{
+ if(res.status === 200 && res.result === true) {
+ this.$message.success('取消成功！')
+ this.searchData();
+ } else {
+ this.$message({
+ type: 'error',
+ message: res.message
+ });
+ }
+ })
+ }).catch(() => {
+ this.$message({
+ type: 'info',
+ message: '取消置顶失败'
+ });
+ });
+ }
+
+
+
+
+
},
// 复制
From eef2a0b8d0fe650190fd421d98f4592632b392b6 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 19:03:59 +0800
Subject: [PATCH 09/12] =?UTF-8?q?=E6=B8=85=E7=A9=BA=E6=96=B0=E5=BB=BA?=
=?UTF-8?q?=E8=AF=95=E5=8D=B7=E5=88=86=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/exam/TestPaper.vue | 2 ++
1 file changed, 2 insertions(+)
diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index 9b889269..399d537e 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -450,6 +450,8 @@ export default {
this.paper.data = [];
this.resOwner = [];
this.formTab = 'info';
+ this.totalScore=0;
+ this.paperLength=0;
this.question.list =[];
this.question.checkQuest = [];
},
From f6609772490a1e6f1c8ed6b2dcd515d9aadd9ae9 Mon Sep 17 00:00:00 2001
From: lmj <3407000732@qq.com>
Date: Wed, 1 Jun 2022 19:46:22 +0800
Subject: [PATCH 10/12] =?UTF-8?q?=E6=9C=80=E6=96=B0=E6=9C=80=E7=83=AD?=
=?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/Index.vue | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/src/views/Index.vue b/src/views/Index.vue
index 9cb7a91d..ce9b731e 100644
--- a/src/views/Index.vue
+++ b/src/views/Index.vue
@@ -366,7 +366,7 @@ export default {
let course = {
pageSize: num,
device:1,
- orderField: orderType == 1 ? 'id' : 'studys',
+ orderField: orderType == 1 ? '' : 'studys',
orderAsc: false,
topOrder:true,
pageIndex: pageIndex
@@ -374,18 +374,21 @@ export default {
let isTopList = [];
let data = [];
apiCoursePortal.pageList(course).then(res => {
+
if (res.status == 200 && res.result.list.length > 0) {
+
let courseIds = [];
res.result.list.forEach(item => {
item.authorInfo = { aid: '', name: '', orgInfo: '', avatar: '', code: '' ,sex:null};
courseIds.push(item.id);
console.log(item.isTop)
- if(item.isTop == true) {
+ if(item.isTop) {
isTopList.push(item);
- console.log(isTopList)
-
+ console.log(isTopList)
+
}else{
data.push(item);
+ // console.log(data)
}
});
this.loadCouserTeacher(res.result.list, courseIds);
@@ -402,8 +405,9 @@ export default {
} else {
console.log('加载课程信息失败:' + res.error);
}
+
});
-
+
// apiCourse.list({orderType,num,device:1}).then(res => {
// if(res.status==200){
From 5c3ca81bec84d6279ea0dd7223dbcf0e66081cf8 Mon Sep 17 00:00:00 2001
From: "LAPTOP-S9RBPPM6\\bjxask-2201" <752743406@qq.com>
Date: Wed, 1 Jun 2022 19:47:45 +0800
Subject: [PATCH 11/12] =?UTF-8?q?=E8=80=83=E8=AF=95bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/views/exam/Test.vue | 27 ++++++++++-----------------
1 file changed, 10 insertions(+), 17 deletions(-)
diff --git a/src/views/exam/Test.vue b/src/views/exam/Test.vue
index 7c0f48d2..5f6e408a 100644
--- a/src/views/exam/Test.vue
+++ b/src/views/exam/Test.vue
@@ -331,12 +331,16 @@ export default {
getAnswerDetail(id) { //获取答卷的详细信息
apiTestPaper.getAnswerDetail(id).then(res=>{
if(res.status === 200) {
- let answerJson = JSON.parse(res.result.answerJson);
- let paperJson = JSON.parse(res.result.paperJson);
+ let answerJson = [];
+ answerJson=JSON.parse(res.result.answerJson);
+ let paperJson = [];
+ paperJson=JSON.parse(res.result.paperJson);
let answer = [];
+ let data = [];
for(let key in answerJson){
answer.push(key);
paperJson.forEach((item,index) => {
+ item.result=true;
if(item.id == key) {
if(item.type==1){
item.userAnswer='';
@@ -345,9 +349,8 @@ export default {
}else{
item.userAnswer=''
}
- item.correctOptIdxs=[];
- item.userOptIdxs=[];
-
+ item.correctOptIdxs=[];
+ item.userOptIdxs=[];
if(item.type==1){
item.userAnswer=answerJson[key];
}else if(item.type==2){
@@ -355,12 +358,12 @@ export default {
}else{
item.userAnswer=answerJson[key]
}
+ data.push(item);
// item.userAnswer.push(answerJson[key]);
}
- item.result=true;
});
}
- this.paperDetailData = paperJson;
+ this.paperDetailData = data;
this.paperDetailData.forEach((item,index)=>{
if(item.type ==3) {
item.correctOptIdxs.push(item.answer);
@@ -521,7 +524,6 @@ export default {
total+=item.defaultScore;
}
}
- //console.log(item,"judge item");
});
}
if(this.single.length > 0){
@@ -531,7 +533,6 @@ export default {
total+=item.defaultScore;
}
})
- //console.log(item,"single item");
});
}
if(this.multiple.length > 0){
@@ -552,7 +553,6 @@ export default {
}
let str1=item.userAnswer.join();
let str2=tempAnswer.join();
- //console.log(str1,str2,'aaa');
if(str1==str2){
total+=item.defaultScore;
}
@@ -570,11 +570,9 @@ export default {
//设置已答题内容
this.paperQuestion.forEach((qitem,index) => {
let avalue=answerJson[qitem.id];
- //console.log(avalue,'avalue')
if(avalue){
if(qitem.type==1){ //单选
qitem.userAnswer=avalue;
- //console.log(qitem,avalue,'单选qitem')
}else if(qitem.type==2){ //多选
qitem.userAnswer=avalue.split(',');
}else if(qitem.type==3){ //判断
@@ -582,7 +580,6 @@ export default {
}
}
});
- //console.log(this.paperQuestion,'this.paperQuestion')
this.arrangeQuestion();
this.splitQuestionType();
//进入考试阶段
@@ -684,7 +681,6 @@ export default {
if(this.updateAnswerTimeer!=null){
window.clearInterval(this.updateAnswerTimeer)
}
- //console.log("启动自动保存");
let that = this;
this.updateAnswerTimeer =window.setInterval(function(){
that.updateAnswer();
@@ -704,7 +700,6 @@ export default {
judgeUserAnswer = item.userAnswer + "";
}
answer[item.id] = judgeUserAnswer;
- // console.log(answer[item.id],'1111')
});
}
if(this.single.length > 0){
@@ -729,7 +724,6 @@ export default {
},
//自动保存提交答案
updateAnswer:function(){
- //console.log("自动保存答案");
if(!this.aloneExamAnswerId){
this.saveUserTest();
return;
@@ -750,7 +744,6 @@ export default {
// 人工提交
manualSubmit(){
// let tempScore=this.countScore();
- // console.log(tempScore,"最后得分");
let that = this;
this.$confirm('您确定要提交试卷吗？', '提示', {
confirmButtonText: '确定',
From 9ab5d6c21e2ceaae3fce2bd5d830cd9f9719008c Mon Sep 17 00:00:00 2001
From: daihh
Date: Wed, 1 Jun 2022 19:50:43 +0800
Subject: [PATCH 12/12] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
src/components/Course/auditCourse1.vue | 45 ++++----
src/components/Course/auditCourse2.vue | 33 ++++--
src/components/Course/catalogCourseware.vue | 16 ++-
src/components/Course/chooseCourseFile.vue | 2 +-
src/components/Course/weikeContent.vue | 117 +++++++++++---------
5 files changed, 122 insertions(+), 91 deletions(-)
diff --git a/src/components/Course/auditCourse1.vue b/src/components/Course/auditCourse1.vue
index 846e735c..edf1a8c0 100644
--- a/src/components/Course/auditCourse1.vue
+++ b/src/components/Course/auditCourse1.vue
@@ -162,8 +162,13 @@
-->
-
文档未转化完成
-
您上传的文档转化失败，请联系管理员
+
+
文档文件转化中，还未转化完成，
+
上传时间：{{curCFile.sysCreateTime}}
+
+
+ 文件转化失败，请重新上传（不要上传加密的文件）或联系管理员
+
@@ -231,6 +236,7 @@ import WxEditor from "@/components/Editor/index.vue";
import apiTag from "../../api/modules/tag.js";
import videoPlayer from "@/components/VideoPlayer/index.vue";
import audioPlayer from "@/components/AudioPlayer/index.vue";
+import apiCourseFile from '../../api/modules/courseFile.js';
import { mapGetters, mapActions } from "vuex";
// import hyperLink from '@/components/Course/hyperLink.vue';
export default {
@@ -281,6 +287,7 @@ export default {
assessInfo: {},
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
btnLoading: false,
+ curCFile:{},//课件内容
coursewareInfo: {
content: {},
finish: false,
@@ -580,26 +587,26 @@ export default {
$this.coursewareInfo.content.contentType == 20
) {
if (con.content.startsWith("{")) {
- this.curriculumData = JSON.parse(con.content);
+ $this.curriculumData = JSON.parse(con.content);
} else {
- this.curriculumData.url = con.content;
+ $this.curriculumData.url = con.content;
}
}
- if ($this.coursewareInfo.content.contentType == 40) {
- if (con.content != '' && con.content.indexOf('.pdf') == -1) {
- apiCourseFile.detail(r.contentRefId).then(cfrs => {
- if (cfrs.status == 200) {
- $this.converStatus = cfrs.result.converStatus;
- $this.coursewareInfo.content.content = cfrs.result.previewFilePath;
- //console.log(r.content);
- } else {
- $this.$message.error('加载pdf课件文件失败');
- }
- });
- }
- // else {
- // this.coursewareInfo.content.content = con.content;
- // }
+ if($this.coursewareInfo.content.contentType == 40) {
+ //console.log(con.content,'con.content');
+ if(con.content != '' && con.content.indexOf('.pdf') > -1) {
+ $this.coursewareInfo.content.content = con.content;
+ }else {
+ apiCourseFile.detail(con.contentRefId).then(cfrs => {
+ if (cfrs.status == 200) {
+ $this.curCFile=cfrs.result;
+ $this.converStatus = cfrs.result.converStatus;
+ $this.coursewareInfo.content.content = cfrs.result.previewFilePath;
+ } else {
+ $this.$message.error('加载pdf课件文件失败');
+ }
+ });
+ }
}
} else if (con.sortIndex == 2) {
$this.homeworkInfo = con;
diff --git a/src/components/Course/auditCourse2.vue b/src/components/Course/auditCourse2.vue
index 46152878..9c79582d 100644
--- a/src/components/Course/auditCourse2.vue
+++ b/src/components/Course/auditCourse2.vue
@@ -60,7 +60,7 @@
{{courseInfo.summary}}
-
+
-
文档未转化完成
-
您上传的文档转化失败，请联系管理员
-
+
+
文档文件转化中，还未转化完成，
+
上传时间：{{curCFile.sysCreateTime}}
+
+
+ 文件转化失败，请重新上传（不要上传加密的文件）或联系管理员
+
+
课程基本信息
+
课程基本信息
修改记录
课程内容目录
@@ -320,6 +325,7 @@ export default {
isEdit: true,
fileBaseUrl: process.env.VUE_APP_FILE_BASE_URL,
contentData: {},
+ curCFile:{},//课件内容
getType: getType,
btnLoading: false,
teacherName: [],
@@ -490,7 +496,7 @@ export default {
.saveOnlyCourse(this.courseInfo)
.then(res => {
if (res.status === 200) {
-
+
this.$message.success("操作成功！");
// let result = res.result;
this.isEdit = true;
@@ -502,7 +508,7 @@ export default {
// list.push(item.teacherName);
// });
this.btnLoading = false;
-
+
} else {
this.$message.error(res.message);
this.btnLoading = false;
@@ -643,14 +649,19 @@ export default {
this.curriculumData.url = r.content
}
} else if(r.contentType == 40) {
- if (r.content != '' && r.content.indexOf('.pdf') == -1) {
+ this.contentData.content="";
+ if (r.content != '' && r.content.indexOf('.pdf') > -1) {
+ this.contentData.content = cfrs.result.previewFilePath;
+ }else{
apiCourseFile.detail(r.contentRefId).then(cfrs => {
if (cfrs.status == 200) {
+ this.curCFile=cfrs.result;
this.converStatus = cfrs.result.converStatus;
this.contentData.content = cfrs.result.previewFilePath;
//console.log(r.content);
- } else {
- $this.$message.error('加载pdf课件文件失败');
+ }else {
+ this.contentData.content="";
+ this.$message.error('加载pdf课件文件失败');
}
});
}
diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue
index 4c50a127..19646e5a 100644
--- a/src/components/Course/catalogCourseware.vue
+++ b/src/components/Course/catalogCourseware.vue
@@ -86,8 +86,13 @@
-
文档未转化完成
-
您上传的文档转化失败，请联系管理员
+
+
文档文件转化中，还未转化完成，
+
上传时间：{{curCFile.sysCreateTime}}
+
+
+
文件转化失败，请重新上传（不要上传加密的文件），请联系管理员
+