修改样式

src/modules/exam-module/components/examEnd.vue

@@ -155,6 +155,7 @@ export default {
   background: #fff;
 }
 .head{
+  border-bottom: 1px solid #ccc;
   color: #222;
   display: flex;
   padding: .4rem 0;

src/modules/exam-module/src/ExamEnd.vue

@@ -291,6 +291,7 @@ export default {
   background: #fff;
 }
 .head{
+  border-bottom: 1px solid #ccc;
   color: #222;
   display: flex;
   padding: .4rem 0;

src/modules/exam-module/src/ExamTopic.vue

@@ -901,6 +901,7 @@ export default {
     }
   }
   .head{
+    border-bottom: 1px solid #ccc;
     color: #222;
     display: flex;
     padding: .4rem 0;

src/pages/exam/components/answerCard.vue

@@ -36,7 +36,7 @@
       </li>
     </ul>
     <ul class="tips-box" v-else>
-      <li v-if="this.$route.query.id !== 'err'">
+      <li>
         <div class="circle1"></div>
         <div class="txt">答对</div>
       </li>
@@ -178,6 +178,7 @@ export default {
   }
 }
 .order-num{
+  padding-top: 20px;
   padding-bottom: 90px;
   .tit{
     font-size: 12px;

src/pages/exam/components/question.vue

@@ -166,11 +166,15 @@ export default {
           this.questionParams.answerRecord[pId]
             ? this.questionParams.answerRecord[pId][cId]
               ? (() => {
-                const optChack = this.questionParams.answerRecord[pId][cId].answer.findIndex(item => { return item === optId })
-                if (optChack === -1) {
-                  this.questionParams.answerRecord[pId][cId].answer.push(optId)
+                if (this.questionParams.answerRecord[pId][cId].answer) {
+                  const optChack = this.questionParams.answerRecord[pId][cId].answer.findIndex(item => { return item === optId })
+                  if (optChack === -1) {
+                    this.questionParams.answerRecord[pId][cId].answer.push(optId)
+                  } else {
+                    this.questionParams.answerRecord[pId][cId].answer.splice(optChack, 1)
+                  }
                 } else {
-                  this.questionParams.answerRecord[pId][cId].answer.splice(optChack, 1)
+                  this.questionParams.answerRecord[pId][cId].answer = [optId]
                 }
               })()
               : this.questionParams.answerRecord[pId][cId] = {
@@ -247,7 +251,7 @@ export default {
 .title-type{
   width: 100%;
   height: 45px;
-  border-bottom:1px solid #ccc;
+  // border-bottom:1px solid #ccc;
   display: flex;
   align-items: center;
   .type{

src/pages/exam/courseExam/chapter/index.vue

@@ -47,8 +47,8 @@
             <div :class="questionParams.question.isCollection ? 'icon active' : 'icon'"></div>
             <div class="txt">{{ questionParams.question.isCollection ? '已收藏' : '收藏' }}</div>
           </div>
-          <div class="end-exam-btn" v-if="!$route.query.id">
-            <div class="btn" @click="endExam">交卷</div>
+          <div class="end-exam-btn">
+            <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
           </div>
         </div>
       </div>
@@ -340,6 +340,7 @@ export default {
   height: 100%;
   // background: #f9f9f9;
   .head{
+    border-bottom: 1px solid #ccc;
     width: 100%;
     height: 80px;
     background: #FFFFFF;
@@ -383,6 +384,7 @@ export default {
   .exam-main{
     display: flex;
     .left{
+      background: #fff;
       flex: 1;
       padding: 10px 20px 0 53px;
       overflow-y: scroll;
@@ -392,6 +394,7 @@ export default {
       }
     }
     .right{
+      border-left: 1px solid #ccc;
       position: relative;
       width: 220px;
       background: #fff;
@@ -404,6 +407,7 @@ export default {
     }
   }
   .foot{
+    border-top: 1px solid #ccc;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -449,6 +453,10 @@ export default {
       display: flex;
       margin-left: auto;
       .end-exam-btn{
+        background: #fff;
+        height: 62px;
+        margin-top: -2px;
+        border-left: 1px solid #ccc;
         width: 260px;
         display: flex;
         justify-content: center;
@@ -468,6 +476,7 @@ export default {
       }
       .sign{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;

src/pages/exam/courseExam/examSite/components/question.vue

@@ -234,7 +234,7 @@ export default {
 .title-type{
   width: 100%;
   height: 45px;
-  border-bottom:1px solid #ccc;
+  // border-bottom:1px solid #ccc;
   display: flex;
   align-items: center;
   .type{

src/pages/exam/courseExam/examSite/index.vue

@@ -221,6 +221,7 @@ export default {
   height: 100%;
   // background: #f9f9f9;
   .head{
+    border-bottom: 1px solid #ccc;
     width: 100%;
     height: 80px;
     background: #FFFFFF;
@@ -264,6 +265,7 @@ export default {
   .exam-main{
     display: flex;
     .left{
+      background: #fff;
       flex: 1;
       padding: 10px 20px 0 53px;
       overflow-y: scroll;
@@ -273,6 +275,7 @@ export default {
       }
     }
     .right{
+      border-left: 1px solid #ccc;
       position: relative;
       width: 220px;
       background: #fff;
@@ -285,6 +288,7 @@ export default {
     }
   }
   .foot{
+    border-top: 1px solid #ccc;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -330,6 +334,7 @@ export default {
       display: flex;
       margin-left: auto;
       .del-btn{
+        margin-top: 10px;
         width: 100px;
         height: 40px;
         border-radius: 4px;
@@ -342,6 +347,10 @@ export default {
         margin-right: 30px;
       }
       .end-exam-btn{
+        background: #fff;
+        height: 62px;
+        margin-top: -2px;
+        border-left: 1px solid #ccc;
         width: 260px;
         display: flex;
         justify-content: center;
@@ -361,6 +370,7 @@ export default {
       }
       .sign{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;

src/pages/exam/mockExam/exam/index.vue

@@ -42,8 +42,8 @@
             <div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div>
             <div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div>
           </div>
-          <div class="end-exam-btn" v-if="!$route.query.id">
-            <div class="btn" @click="endExam">交卷</div>
+          <div class="end-exam-btn">
+            <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
           </div>
         </div>
       </div>
@@ -200,7 +200,7 @@ export default {
     // 获取考卷
     getTopic() {
       const param = {
-        type: 1,
+        type: 2,
         is_create: this.$route.query.id || this.$route.query.is_create === undefined ? 0 : this.$route.query.is_create
       }
       api
@@ -389,6 +389,7 @@ export default {
   height: 100%;
   // background: #f9f9f9;
   .head{
+    border-bottom: 1px solid #ccc;
     width: 100%;
     height: 80px;
     background: #FFFFFF;
@@ -432,6 +433,7 @@ export default {
   .exam-main{
     display: flex;
     .left{
+      background: #fff;
       flex: 1;
       padding: 10px 20px 0 53px;
       overflow-y: scroll;
@@ -441,6 +443,7 @@ export default {
       }
     }
     .right{
+      border-left: 1px solid #ccc;
       position: relative;
       width: 220px;
       background: #fff;
@@ -453,6 +456,7 @@ export default {
     }
   }
   .foot{
+    border-top: 1px solid #ccc;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -487,6 +491,10 @@ export default {
       display: flex;
       margin-left: auto;
       .end-exam-btn{
+        background: #fff;
+        height: 62px;
+        margin-top: -2px;
+        border-left: 1px solid #ccc;
         width: 260px;
         display: flex;
         justify-content: center;
@@ -506,6 +514,7 @@ export default {
       }
       .sign2{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;
@@ -526,6 +535,7 @@ export default {
       }
       .sign{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;

src/pages/exam/mockExam/exam/result.vue

 <template>
   <div class="result-box">
     <div class="card-left">
-      <div class="title">成绩报告</div>
+      <div class="title">
+        <span>成绩报告</span>
+        <span class="time" v-if="data.sheet">
+          {{ data.sheet.created_time }}
+        </span>
+      </div>
       <div class="chart-box">
         <chart :accuracy="accuracy" :accuracScore="accuracScore" v-if="data.sheet">
           <template v-slot:tips>
@@ -10,17 +15,6 @@
           </template>
         </chart>
       </div>
-      <!-- <div class="assess">测试评估</div>
-      <div class="assess-box">
-        <div class="prog">
-          <div class="line-box">
-            <div class="line" :style="setStyle"></div>
-          </div>
-          <div class="icon"></div>
-        </div>
-        <div class="text">{{ accuracy !== 100 ? '您离成功还有一段距离，继续努力！' : '成功近在眼前，再接再厉！' }}</div>
-        <div class="btn">全部考试服务</div>
-      </div> -->
     </div>
     <div class="card-right">
       <card v-if="data.sheet" :data="data.sheet" @goQuestion="goPage">
@@ -104,6 +98,13 @@ export default {
       color: #222222;
       line-height: 45px;
       border-bottom: 1px solid #ccc;
+      display: flex;
+    }
+    .time{
+      font-size: 14px;
+      color: #222222;
+      line-height: 45px;
+      margin-left: auto;
     }
     .chart-box{
       position: absolute;

src/pages/exam/mockExam/index.vue

@@ -78,6 +78,7 @@ export default {
       this.$confirm('您上次未做完试题', '', {
         confirmButtonText: '重新答题',
         cancelButtonText: '继续答题',
+        distinguishCancelAndClose: true,
         type: 'warning'
       }).then(() => {
         this.$router.push({
@@ -87,13 +88,15 @@ export default {
           }
         })
       }).catch((e) => {
-        console.log(e)
-        this.$router.push({
-          path: '/mock/exam',
-          query: {
-            is_create: 0
-          }
-        })
+        if (e === 'cancel') {
+          console.log(e)
+          this.$router.push({
+            path: '/mock/exam',
+            query: {
+              is_create: 0
+            }
+          })
+        }
       })
     }
   }

src/pages/exam/myExam/components/answerCard.vue

@@ -101,6 +101,7 @@ export default {
 </script>
 <style lang="scss" scoped>
 .order-num{
+  padding-top: 20px;
   padding-bottom: 90px;
   ul{
     display: flex;

src/pages/exam/myExam/components/question.vue

@@ -216,7 +216,7 @@ export default {
 .title-type{
   width: 100%;
   height: 45px;
-  border-bottom:1px solid #ccc;
+  // border-bottom:1px solid #ccc;
   display: flex;
   align-items: center;
   .type{

src/pages/exam/myExam/questionDetails.vue

@@ -378,6 +378,7 @@ export default {
   height: 100%;
   // background: #f9f9f9;
   .head{
+    border-bottom: 1px solid #ccc;
     width: 100%;
     height: 80px;
     background: #FFFFFF;
@@ -421,6 +422,7 @@ export default {
   .exam-main{
     display: flex;
     .left{
+      background: #fff;
       flex: 1;
       padding: 10px 20px 0 53px;
       overflow-y: scroll;
@@ -430,6 +432,7 @@ export default {
       }
     }
     .right{
+      border-left: 1px solid #ccc;
       position: relative;
       width: 220px;
       background: #fff;
@@ -442,6 +445,7 @@ export default {
     }
   }
   .foot{
+    border-top: 1px solid #ccc;
     position: fixed;
     bottom: 0;
     left: 0;
@@ -487,6 +491,7 @@ export default {
       display: flex;
       margin-left: auto;
       .del-btn{
+        margin-top: 10px;
         width: 100px;
         height: 40px;
         border-radius: 4px;
@@ -499,6 +504,10 @@ export default {
         margin-right: 30px;
       }
       .end-exam-btn{
+        background: #fff;
+        height: 62px;
+        margin-top: -2px;
+        border-left: 1px solid #ccc;
         width: 260px;
         display: flex;
         justify-content: center;
@@ -518,6 +527,7 @@ export default {
       }
       .sign{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;

src/pages/exam/testExam/exam/index.vue

@@ -42,8 +42,8 @@
             <div :class="questionParams.question.sign ? 'icon active' : 'icon'"></div>
             <div class="txt">{{ questionParams.question.sign ? '已标记' : '标记' }}</div>
           </div>
-          <div class="end-exam-btn" v-if="!$route.query.id">
-            <div class="btn" @click="endExam">交卷</div>
+          <div class="end-exam-btn">
+            <div class="btn" @click="endExam" v-if="!$route.query.id">交卷</div>
           </div>
         </div>
       </div>
@@ -218,7 +218,6 @@ export default {
               })
             })
           }
-          console.log(countData)
           this.afterChangeData = countData
           this.questionParams.card = countData
           data.sheet.answers !== null && (this.questionParams.answerRecord = data.sheet.answers)
@@ -391,6 +390,7 @@ export default {
   height: 100%;
   // background: #f9f9f9;
   .head{
+    border-bottom: 1px solid #ccc;
     width: 100%;
     height: 80px;
     background: #FFFFFF;
@@ -434,6 +434,7 @@ export default {
   .exam-main{
     display: flex;
     .left{
+      background: #fff;
       flex: 1;
       padding: 10px 20px 0 53px;
       overflow-y: scroll;
@@ -443,6 +444,7 @@ export default {
       }
     }
     .right{
+      border-left: 1px solid #ccc;
       position: relative;
       width: 220px;
       background: #fff;
@@ -455,6 +457,7 @@ export default {
     }
   }
   .foot{
+    border-top: 1px solid #ccc;
     position: absolute;
     bottom: 0;
     left: 0;
@@ -489,6 +492,10 @@ export default {
       display: flex;
       margin-left: auto;
       .end-exam-btn{
+        background: #fff;
+        height: 62px;
+        margin-top: -2px;
+        border-left: 1px solid #ccc;
         width: 260px;
         display: flex;
         justify-content: center;
@@ -506,10 +513,9 @@ export default {
           text-align: center;
         }
       }
-      .sign-box{
-      }
       .sign{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;
@@ -530,6 +536,7 @@ export default {
       }
       .sign2{
         margin-right: 20px;
+        margin-top: 8px;
         .icon{
           margin: 0 auto;
           width: 24px;