From 50079559e2667a50ac9a9c00c0ac8e4672acc12c Mon Sep 17 00:00:00 2001
From: daihh <seastar@bjxask.com>
Date: Wed, 11 Jan 2023 17:14:31 +0800
Subject: [PATCH] =?UTF-8?q?=E8=80=83=E8=AF=95=E8=AF=95=E9=A2=98=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E5=89=8D=E5=A2=9E=E5=8A=A0=E6=A0=A1=E9=AA=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/Exam/EditPaper.vue | 50 +++++++++++++++++++++++++++++++
 src/views/exam/TestPaper.vue      |  8 ++---
 2 files changed, 54 insertions(+), 4 deletions(-)

diff --git a/src/components/Exam/EditPaper.vue b/src/components/Exam/EditPaper.vue
index 023c20d9..f3ce3d07 100644
--- a/src/components/Exam/EditPaper.vue
+++ b/src/components/Exam/EditPaper.vue
@@ -240,6 +240,56 @@
               })
         },
         save(){
+
+            let qidMap=new Map();
+            let hasItem=null;
+            let allScore=true;
+            let allAnswer=true;
+            this.qitems.some(qitem=>{
+                //console.log(qitem,'qitem');
+                if(qitem.type==3){
+                    if(!qitem.answer){
+                      allAnswer=false;
+                       return true;
+                    }
+                }else{
+                  var optHasAnswer=qitem.optionList.some(opt=>{
+                      return opt.isAnswer;
+                   })
+                  if(!optHasAnswer){
+                    allAnswer=false;
+                    return true;
+                  }
+                }
+                if(!qitem.defaultScore || qitem.defaultScore=='0'){
+                  allScore=false;
+                  return true;
+                }
+                if(qidMap.has(qitem.id)){
+                   hasItem=qitem;
+                   return true;
+                }else{
+                  qidMap.set(qitem.id,qitem.id);
+                  return false;
+                }
+            });
+
+            if(!allAnswer){
+              this.$message.error('还有试题未设置答案，请设置完整再保存');
+              return;
+            }
+
+            if(!allScore){
+               this.$message.error('有试题未设置分数');
+               return;
+            }
+
+            if(hasItem!=null){
+              console.log(hasItem);
+              this.$message.error('选择的试题重复：'+hasItem.title)
+              return
+            }
+
             this.loading=true;
             this.paper.paperContent=JSON.stringify(this.qitems);
             apiPaper.update(this.paper).then((res)=>{
diff --git a/src/views/exam/TestPaper.vue b/src/views/exam/TestPaper.vue
index fb5b0f9d..5a1a497c 100644
--- a/src/views/exam/TestPaper.vue
+++ b/src/views/exam/TestPaper.vue
@@ -573,13 +573,13 @@ export default {
           return this.$message.warning('请您完善基本信息必填项！')
         }
         //检查是否都有分数了
-        
+
         //检查是否有重复的试卷
         let qidMap=new Map();
         let hasItem=null;
         let allScore=true;
         this.paper.data.some(qitem=>{
-            if(!qitem.score){
+            if(!qitem.defaultScore || qitem.defaultScore=='0'){
               allScore=false;
               return true;
             }
@@ -591,12 +591,12 @@ export default {
               return false;
             }
         });
-        
+
         if(!allScore){
            this.$message.error('有试题未设置分数');
            return;
         }
-        
+
         if(hasItem!=null){
           console.log(hasItem);
           this.$message.error('选择的试题重复：'+hasItem.title)