Prechádzať zdrojové kódy

feat: 适应后端数据结构的调整

ChenYangfan 6 rokov pred
rodič
commit
4960d96d5d

+ 1 - 1
src/components/Basic/IconButton.vue

@@ -3,7 +3,7 @@
     <c-icon :theme="theme" :bold="!noBold" :size="size ? size / 1.4 - 4 : 26">
     <c-icon :theme="theme" :bold="!noBold" :size="size ? size / 1.4 - 4 : 26">
       <slot></slot>
       <slot></slot>
     </c-icon>
     </c-icon>
-    <ripple></ripple>
+    <ripple :color="theme"></ripple>
   </div>
   </div>
 </template>
 </template>
 
 

+ 1 - 1
src/components/Cards/CourseFileCard.vue

@@ -58,7 +58,7 @@ export default {
   display: flex;
   display: flex;
   align-items: center;
   align-items: center;
   font-size: 14px;
   font-size: 14px;
-  line-height: 1.9;
+  line-height: 1.75;
 }
 }
 
 
 .course-file-card-info {
 .course-file-card-info {

+ 3 - 1
src/components/Cards/SlideCard.vue

@@ -94,6 +94,8 @@ export default {
 .slide-card-title {
 .slide-card-title {
   font-size: 14px;
   font-size: 14px;
   line-height: 1.7;
   line-height: 1.7;
+  position: relative;
+  bottom: 2px;
 }
 }
 
 
 .slide-card-time, .slide-card-course {
 .slide-card-time, .slide-card-course {
@@ -109,7 +111,7 @@ export default {
 
 
 .c-icon {
 .c-icon {
   position: relative;
   position: relative;
-  top: 2px;
+  top: 3px;
   font-size: 16px;
   font-size: 16px;
   transform: scale(1.2);
   transform: scale(1.2);
 }
 }

+ 5 - 1
src/views/quiz/QuizDetail.vue

@@ -3,7 +3,7 @@
     <div class="info">
     <div class="info">
       <back-title>
       <back-title>
         {{ quizDetail.name }}
         {{ quizDetail.name }}
-        <c-button :left="12" text theme="red" @click="handleDelete" icon="error" no-bold>删除测试</c-button>
+        <c-button class="delete-button" :left="12" text theme="red" @click="handleDelete" icon="close">删除测试</c-button>
       </back-title>
       </back-title>
       <div class="sub-title">学生提交结果列表</div>
       <div class="sub-title">学生提交结果列表</div>
       <template v-if="quizDetail.state === QuizState.closed || quizDetail.state === QuizState.ongoing">
       <template v-if="quizDetail.state === QuizState.closed || quizDetail.state === QuizState.ongoing">
@@ -86,6 +86,10 @@ export default {
   padding: 64px 24px;
   padding: 64px 24px;
 }
 }
 
 
+.delete-button {
+  float: right;
+}
+
 @media (max-width: 800px) {
 @media (max-width: 800px) {
 
 
 }
 }

+ 30 - 12
src/views/quiz/StudentDoQuiz.vue

@@ -7,17 +7,18 @@
           提交次数:
           提交次数:
           <span :class="answersInfo.submitNumber === quiz.maxSubmitTime ? 'red' : null">{{answersInfo.submitNumber ? answersInfo.submitNumber : 0}} / {{quiz.maxSubmitTime}}</span>
           <span :class="answersInfo.submitNumber === quiz.maxSubmitTime ? 'red' : null">{{answersInfo.submitNumber ? answersInfo.submitNumber : 0}} / {{quiz.maxSubmitTime}}</span>
         </div>
         </div>
-        <div>上次得分:{{answersInfo.score ? answersInfo.score : '无提交历史'}}</div>
-        <div>最近提交:{{submitAt ? momentFromNow(answersInfo.submitAt) : '无提交历史'}}</div>
+        <div>上次得分:{{!isEmpty(answersInfo.score) ? answersInfo.score : '无提交历史'}}</div>
+        <div>最近提交:{{!isEmpty(answersInfo.submitAt) ? momentFromNow(answersInfo.submitAt) : '无提交历史'}}</div>
       </div>
       </div>
-      <div class="quiz-list mb-16" :key="question.id" v-for="(question, index) in questions">
-        <div class="quiz-list__index">{{ index + 1 }}.</div>
+      <div class="quiz-list-item" :key="question.id" v-for="(question, index) in questions"
+           :class="question.studentAnswer.correct ? 'correct' : 'wrong'">
+        <div class="quiz-list-item__index">{{ index + 1 }}.</div>
         <div>
         <div>
-          <markdown-section :raw="question.stem"/>
+          <markdown-section class="quiz-list-item-title" :raw="question.stem"/>
           <div v-if="question.type === QuestionKind.choice">
           <div v-if="question.type === QuestionKind.choice">
             <label class="option" :key="index" v-for="(item, index) in question.options">
             <label class="option" :key="index" v-for="(item, index) in question.options">
-              <input v-model="question.studentAnswer" type="radio" :value="index"/>
-              {{ index }}.
+              <input v-model="question.studentAnswer.answer" type="radio" :value="index"/>
+              <b class="mr-8">{{ index }}.</b>
               <markdown-section style="display: inline" :raw="item"/>
               <markdown-section style="display: inline" :raw="item"/>
             </label>
             </label>
           </div>
           </div>
@@ -33,7 +34,9 @@
           </div>
           </div>
         </div>
         </div>
       </div>
       </div>
-      <c-button class="mb-16" theme="green" icon="check">提交答案</c-button>
+      <div class="mt-24">
+        <c-button class="mb-16" theme="green" icon="check">提交答案</c-button>
+      </div>
     </form>
     </form>
   </div>
   </div>
 </template>
 </template>
@@ -47,6 +50,7 @@ import CIcon from '@/components/Basic/CIcon'
 import { getOneQuiz, getOneQuizStudentAnswer, submitQuizStudentAnswer } from '@/server/quiz'
 import { getOneQuiz, getOneQuizStudentAnswer, submitQuizStudentAnswer } from '@/server/quiz'
 import { getQuestionsOfQuiz } from '@/server/question'
 import { getQuestionsOfQuiz } from '@/server/question'
 import momentFromNow from '@/utils/moment-from-now'
 import momentFromNow from '@/utils/moment-from-now'
+import { isEmpty } from '@/utils/types'
 
 
 export default {
 export default {
   name: 'StudentDoQuiz',
   name: 'StudentDoQuiz',
@@ -97,7 +101,7 @@ export default {
       let uncompleted = false
       let uncompleted = false
       this.questions.map(question => {
       this.questions.map(question => {
         if (question.studentAnswer) {
         if (question.studentAnswer) {
-          answers[question.id] = question.studentAnswer
+          answers[question.id] = question.studentAnswer.answer
         } else {
         } else {
           this.$setErrorMessage('题目:"' + question.stem + '"尚未填写')
           this.$setErrorMessage('题目:"' + question.stem + '"尚未填写')
           uncompleted = true
           uncompleted = true
@@ -111,13 +115,15 @@ export default {
         this.$router.go(-1)
         this.$router.go(-1)
       }).catch(err => { this.$setErrorMessage(err.response.data.msg) })
       }).catch(err => { this.$setErrorMessage(err.response.data.msg) })
     },
     },
-    momentFromNow
+    momentFromNow,
+    isEmpty
   }
   }
 }
 }
 </script>
 </script>
 
 
 <style lang="scss" scoped>
 <style lang="scss" scoped>
 @import "~@/style/theme.scss";
 @import "~@/style/theme.scss";
+
 .do-quiz {
 .do-quiz {
   margin: 0 auto;
   margin: 0 auto;
   max-width: 800px;
   max-width: 800px;
@@ -127,15 +133,18 @@ export default {
 .info {
 .info {
   line-height: 1.6;
   line-height: 1.6;
   color: #7a8a9a;
   color: #7a8a9a;
+  font-size: 14px;
   margin-bottom: 24px;
   margin-bottom: 24px;
   background: #f7f7f7;
   background: #f7f7f7;
   padding: 8px 12px;
   padding: 8px 12px;
 }
 }
 
 
 .red {
 .red {
- color: $theme-red;
+  color: $theme-red;
 }
 }
-.quiz-list {
+
+.quiz-list-item {
+  padding: 24px 8px;
   display: flex;
   display: flex;
 
 
   &__index {
   &__index {
@@ -152,4 +161,13 @@ export default {
     }
     }
   }
   }
 }
 }
+
+.wrong {
+  .quiz-list-item__index {
+    color: $theme-red;
+  }
+  .quiz-list-item-title{
+    color: $theme-red;
+  }
+}
 </style>
 </style>

+ 3 - 3
src/views/quiz/components/QuizDetailFactory.vue

@@ -19,11 +19,11 @@
         <template v-if="answers">
         <template v-if="answers">
           <c-icon v-if="!isEmpty(answers[question.id])" bold :size="20" :left="16"
           <c-icon v-if="!isEmpty(answers[question.id])" bold :size="20" :left="16"
                   :right="12"
                   :right="12"
-                  :theme="question.answer.match(answers[question.id]) ? 'green' : 'red'">
-            {{ question.answer.match(answers[question.id]) ? 'check' : 'close' }}
+                  :theme="answers[question.id].correct ? 'green' : 'red'">
+            {{ answers[question.id].correct ? 'check' : 'close' }}
           </c-icon>
           </c-icon>
           <div v-if="answers[question.id]">
           <div v-if="answers[question.id]">
-            {{answers[question.id]}}
+            {{answers[question.id].answer}}
           </div>
           </div>
         </template>
         </template>
       </div>
       </div>

+ 1 - 2
src/views/shared/tab-common.scss

@@ -6,7 +6,6 @@
   flex: 1;
   flex: 1;
   min-width: 340px;
   min-width: 340px;
   max-width: 800px;
   max-width: 800px;
-  box-sizing: border-box;
   width: 100%;
   width: 100%;
   transition: .2s;
   transition: .2s;
 }
 }
@@ -47,9 +46,9 @@
     min-width: unset;
     min-width: unset;
     min-height: unset;
     min-height: unset;
     overflow: auto;
     overflow: auto;
-    box-sizing: border-box;
     width: 100%;
     width: 100%;
     max-width: unset;
     max-width: unset;
+    box-sizing: border-box;
   }
   }
   .left {
   .left {
     padding-bottom: 64px;
     padding-bottom: 64px;