Merge branch 'master' of https://gitlab-pro.ezijing.com/ezijing-web/qbs

src/modules/exam/views/Detail.vue

@@ -90,13 +90,14 @@ export default {
             type: 'input',
             prop: 'name',
             placeholder: '请输入考生姓名',
-            label: '姓名'
+            label: '姓名：'
           },
 
           {
             type: 'input',
             prop: 'school',
-            label: '学校'
+            label: '学校：',
+            placeholder: '请输入学校'
           }
           // {
           //   type: 'select',
@@ -141,7 +142,7 @@ export default {
   },
   methods: {
     handleDetail(row) {
-      console.log(row)
+      // console.log(row)
       this.$router.push({
         path: 'markingPaper',
         query: { eid: this.exam_id, sid: row.student_id }

src/modules/exam/views/List.vue

@@ -49,7 +49,7 @@ export default {
             type: 'select',
             prop: 'status',
             placeholder: '请输入考试状态',
-            label: '考试状态',
+            label: '考试状态：',
             options: status,
             labelKey: 'label',
             valueKey: 'value'

src/modules/exam/views/MarkingPaper.vue

@@ -336,7 +336,7 @@ export default {
               it.get_score = obj.score || 0
               it.checked_flag = obj.checked_flag || false
               if (obj.comment) it.comment = obj.comment
-              // if (it.answer) it.answer = JSON.parse(it.answer)
+              if (it.answer) it.answer = JSON.parse(it.answer)
               if (it.options) it.options = JSON.parse(it.options)
             })
           } else {
@@ -344,11 +344,12 @@ export default {
             subItem.get_score = obj.score || 0
             subItem.checked_flag = obj.checked_flag || false
             if (obj.comment) subItem.comment = obj.comment
-            // if (subItem.answer) subItem.answer = JSON.parse(subItem.answer)
+            if (subItem.answer) subItem.answer = JSON.parse(subItem.answer)
             if (subItem.options) subItem.options = JSON.parse(subItem.options)
           }
         })
       })
+      // console.log(this.questionList)
     }
   }
 }