From 8c0f29a39e8328b80635e803400d2825e2516408 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期四, 20 六月 2024 14:36:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/exam/exam/MarkPaperDetail.vue |   35 +++++++++++++++++++++++++++++------
 1 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/src/views/exam/exam/MarkPaperDetail.vue b/src/views/exam/exam/MarkPaperDetail.vue
index 8b8710f..da51e38 100644
--- a/src/views/exam/exam/MarkPaperDetail.vue
+++ b/src/views/exam/exam/MarkPaperDetail.vue
@@ -1,10 +1,19 @@
 <template>
   <div>
-    <el-row style="text-align: center">xxx鑰冭瘯</el-row>
-    <el-row>
-      <div>xxx濮撳悕</div>
-      <div>xxx浜ゅ嵎鏃堕棿</div>
-      <div>xxx绛旈鏃堕棿</div>
+    <el-row style="text-align: center;margin-top: 20px;margin-bottom: 20px; font-size: 28px">xxx鑰冭瘯</el-row>
+    <el-row :gutter="20">
+      <el-col :span="8" class="info">
+        <span class="exam-info">瀛﹀憳濮撳悕锛�</span>
+        <span class="exam-info">{{userName}}</span>
+      </el-col>
+      <el-col :span="8" class="info">
+        <span class="exam-info">浜ゅ嵎鏃堕棿锛�</span>
+        <span class="exam-info">{{examInfo.updateTime}}</span>
+      </el-col>
+      <el-col :span="8" class="info">
+        <span class="exam-info">瀹屾垚鑰楁椂锛�</span>
+        <span class="exam-info">{{examInfo.doTime}}</span>
+      </el-col>
     </el-row>
     <el-row class="paper-warp">
       <div v-for="(paper,index) in examInfo.paperQuestionList" :key="index" class="paperTitleWarp">
@@ -36,19 +45,24 @@
   },
   data () {
     return {
+      paperQuestionList: [
+
+      ],
       userId: null,
+      userName: null,
       questionLoading: false,
       examInfo: {
         examId: null,
         examName: '',
         doTime: 0,
+        updateTime: null,
         paperQuestionList: []
       }
     }
   },
   methods: {
     getStudentPaper () {
-      this.getStudentExam(this.examInfo.examId, this.userId).then(res => {
+      getStudentExam(this.examInfo.examId, this.userId).then(res => {
         this.examInfo = res.data.data
       })
     }
@@ -61,4 +75,13 @@
   margin-top: 50px;
 
 }
+
+.exam-info {
+}
+
+.info {
+  display: flex;
+  flex-direction: row;
+  justify-content: center;
+}
 </style>

--
Gitblit v1.8.0