Merge branch 'master' of codeup.aliyun.com:6265f483e4166464dc2f9c14/boeu/portal

This commit is contained in:
dongruihua
2022-12-28 21:50:16 +08:00
6 changed files with 20 additions and 17 deletions

View File

@@ -526,7 +526,7 @@
})
},
saveExam(examInfo){
console.log('保存考试配置');
//console.log('保存考试配置');
//这里只是61考试
this.content.courseId=this.course.id;
this.content.sortIndex=this.addOrder;

View File

@@ -321,8 +321,9 @@
let pars={
pageIndex:this.usePaper.pageIndex,
pageSize:this.usePaper.pageSize,
keyword:this.usePaper.keyword
keyWord:this.usePaper.keyword
}
apiExamPaper.querylist(pars).then(rs=>{
if(rs.status==200){
this.usePaper.list=rs.result.list;

View File

@@ -1212,20 +1212,22 @@ export default {
// 判断是否有未保存的内容
unsavedContent() {
const courseware = this.$refs.courseware;
console.log(courseware,'courseware');
//console.log(courseware,'courseware');
let pass = true;
if(this.curContent.id == '') {// 新增
if(this.curContent.contentType == 60) { // 判断作业是否保存
if(courseware.homework.content || courseware.homework.name || courseware.homework.deadTime){
pass = false;
}
} else if(this.curContent.contentType == 61) { //考试
if(courseware.exam.paperContent != '') {
pass = false;
}
if(courseware.examPaper.items.length >0) {
pass = false;
}
// if(courseware.exam.paperContent != '') {
// pass = false;
// }
// if(courseware.examPaper.items.length >0) {
// pass = false;
// }
}else if(this.curContent.contentType == 41) { //图文
if(courseware.htmlContent.length > 7){
pass = false;
@@ -1241,9 +1243,10 @@ export default {
pass = false;
}
} else if(this.curContent.contentType == 61) { //考试
if(courseware.exam.paperContent !== courseware.examChange.paperContent || JSON.stringify(courseware.examPaper) != JSON.stringify(courseware.examPaperChange)) {
pass = false;
}
// console.log(courseware.exam,'courseware.exam');
// if(courseware.exam.paperContent !== courseware.examChange.paperContent || JSON.stringify(courseware.examPaper) != JSON.stringify(courseware.examPaperChange)) {
// pass = false;
// }
} else if(this.curContent.contentType == 41) { //图文
if(this.curContent.content !== courseware.htmlContent) {
pass = false;
@@ -1297,7 +1300,6 @@ export default {
return;
}
if(this.weike.dlgShow && !this.unsavedWeiContent()){
return;
}

View File

@@ -1306,7 +1306,7 @@
let pars={
pageIndex:this.usePaper.pageIndex,
pageSize:this.usePaper.pageSize,
keyword:this.usePaper.keyword
keyWord:this.usePaper.keyword
}
apiExamPaper.querylist(pars).then(rs=>{
if(rs.status==200){

View File

@@ -111,7 +111,7 @@ export default {
exportFile(){
let req = {
teacherId: this.userInfo.sysId
userId: this.userInfo.sysId
// teacherId:"70F80F4E-34BA-10AB-894A-8FA812B19637"
}
apiCourse.courseRecordExport(req).then(res=>{
@@ -129,7 +129,7 @@ export default {
recordList(pageIndex){
let req = {
//     teacherId:"70F80F4E-34BA-10AB-894A-8FA812B19637",
teacherId: this.userInfo.sysId,
userId: this.userInfo.sysId,
keyword:this.keyword,
    page:pageIndex,
    pageSize:10

View File

@@ -778,7 +778,7 @@ export default {
this.$refs.comEditPaper.show(row.paperId);
},
open(row,flag) {
this.$confirm('确定要下架考试?', '提示', {
this.$confirm('确定要下架考试?', '提示', {
confirmButtonText: '确定',
cancelButtonText: '取消',
type: 'warning'