From 35e2e16f92ca4932407ed16783d17e06e2bdae0b Mon Sep 17 00:00:00 2001
From: luohairen <3399054449@qq.com>
Date: 星期一, 28 十月 2024 17:13:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/exam/exam/MarkPaper.vue | 22 ++++++++++++++--------
1 files changed, 14 insertions(+), 8 deletions(-)
diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue
index 77dca0d..49c8cde 100644
--- a/src/views/exam/exam/MarkPaper.vue
+++ b/src/views/exam/exam/MarkPaper.vue
@@ -13,22 +13,28 @@
<div class="title">{{ examInfo.examPaperName }}</div>
</div>
</el-col>
- <el-col :span="4">
+ <el-col :span="3">
<div class="staticNum">
- <div class="bottom5">搴旇�冧汉鏁�</div>
- <div class="title">{{ examInfo.shouldJoinNum }}</div>
+ <div class="bottom5">搴旇��</div>
+ <div class="title">{{ examInfo.shouldJoinNum }}浜�</div>
</div>
</el-col>
<el-col :span="4">
<div class="staticNum">
- <div class="bottom5">缂鸿�冧汉鏁�</div>
- <div class="title">{{ examInfo.missJoinNum }}</div>
+ <div class="bottom5">鍙傝��</div>
+ <div class="title">{{ examInfo.joinNum }}浜�</div>
+ </div>
+ </el-col>
+ <el-col :span="3">
+ <div class="staticNum">
+ <div class="bottom5">缂鸿��</div>
+ <div class="title">{{ examInfo.missJoinNum }}浜�</div>
</div>
</el-col>
<el-col :span="4">
<div class="staticNum">
- <div class="bottom5">鍙傚姞浣嗘湭瀹屾垚浜烘暟</div>
- <div class="title">{{ examInfo.joinButNotFinishNum }}</div>
+ <div class="bottom5">鍙傝�冧絾鏈彁浜�</div>
+ <div class="title">{{ examInfo.joinButNotFinishNum }}浜�</div>
</div>
</el-col>
</el-row>
@@ -40,7 +46,7 @@
>
<el-table-column
align="center"
- prop="id"
+ prop="userId"
label="瀛﹀彿"
>
</el-table-column>
--
Gitblit v1.8.0