From 63b097677dd14cbd043107d4b88c84cb7254e77b Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 28 Dec 2022 21:48:29 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E8=80=83=E8=AF=95=E5=90=8E?=
 =?UTF-8?q?=E6=8F=90=E4=BA=A4=E6=A3=80=E6=9F=A5=E9=97=AE=E9=A2=98=E8=A7=A3?=
 =?UTF-8?q?=E5=86=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Course/catalogCourseware.vue |  2 +-
 src/components/Course/courseForm.vue        | 24 +++++++++++----------
 src/views/exam/ExamList.vue                 |  2 +-
 3 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/Course/catalogCourseware.vue b/src/components/Course/catalogCourseware.vue
index 29812ada..666f8737 100644
--- a/src/components/Course/catalogCourseware.vue
+++ b/src/components/Course/catalogCourseware.vue
@@ -526,7 +526,7 @@
         })
       },
       saveExam(examInfo){
-        console.log('保存考试配置');
+        //console.log('保存考试配置');
         //这里只是61考试
         this.content.courseId=this.course.id;
         this.content.sortIndex=this.addOrder;
diff --git a/src/components/Course/courseForm.vue b/src/components/Course/courseForm.vue
index f5f3f242..f35d8aa3 100644
--- a/src/components/Course/courseForm.vue
+++ b/src/components/Course/courseForm.vue
@@ -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;
       }
 
diff --git a/src/views/exam/ExamList.vue b/src/views/exam/ExamList.vue
index 65239f49..be0f0fa4 100644
--- a/src/views/exam/ExamList.vue
+++ b/src/views/exam/ExamList.vue
@@ -778,7 +778,7 @@ export default {
       this.$refs.comEditPaper.show(row.paperId);
     },
     open(row,flag) {
-        this.$confirm('确定要下架改考试么?', '提示', {
+        this.$confirm('确定要下架此考试吗?', '提示', {
           confirmButtonText: '确定',
           cancelButtonText: '取消',
           type: 'warning'