hz/learning-system-portal
1
0
Fork 0
mirror of https://codeup.aliyun.com/67762337eccfc218f6110e0e/vue/learning-system-portal.git synced 2025-12-12 04:16:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
dongruihua
2022-12-28 21:50:16 +08:00
parent 3cb84f49c8 453b08a22e
commit 1acc4cf19d
6 changed files with 20 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Course/catalogCourseware.vue
View File

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

3
src/components/Course/courseExam.vue
View File

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

24
src/components/Course/courseForm.vue
View File

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

2
src/components/Course/weikeContent.vue
View File

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

4
src/views/course/Mylecnotes.vue
View File

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

2
src/views/exam/ExamList.vue
View File

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