From 80561b2bc83bb35582ba62e0c21a63c3ee5a0e82 Mon Sep 17 00:00:00 2001 From: lohir <3399054449@qq.com> Date: 星期三, 16 十月 2024 17:15:00 +0800 Subject: [PATCH] bug --- src/views/exam/exam/MarkPaper.vue | 67 ++++++++++++++++++++++----------- 1 files changed, 45 insertions(+), 22 deletions(-) diff --git a/src/views/exam/exam/MarkPaper.vue b/src/views/exam/exam/MarkPaper.vue index 4449396..49c8cde 100644 --- a/src/views/exam/exam/MarkPaper.vue +++ b/src/views/exam/exam/MarkPaper.vue @@ -4,31 +4,37 @@ <el-col :span="5"> <div class="nameClass"> <div class="bottom5">鑰冭瘯鍚嶇О</div> - <div class="title">{{examInfo.examName}}</div> + <div class="title">{{ examInfo.examName }}</div> </div> </el-col> <el-col :span="5"> <div class="nameClass"> <div class="bottom5">璇曞嵎鍚嶇О</div> - <div class="title">{{examInfo.examPaperName}}</div> + <div class="title">{{ examInfo.examPaperName }}</div> + </div> + </el-col> + <el-col :span="3"> + <div class="staticNum"> + <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.shouldJoinNum}}</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.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> @@ -71,12 +77,6 @@ > </el-table-column> <el-table-column - align="center" - prop="phone" - label="绯荤粺鑷姩浼板垎(閫夋嫨棰樺瀷)" - > - </el-table-column> - <el-table-column label="鎿嶄綔" align="center" width="300px" @@ -101,6 +101,13 @@ this.getExamInfo() } }, + // watch: { + // $route: { + // handler () { + // this.reloadPage() + // } + // } + // }, data () { return { examInfo: { @@ -117,15 +124,27 @@ } }, methods: { - statusFormatter (row) { - if (row.status === 'finish' || row.markPaperStatus === 'finish') { + // reloadPage () { + // this.examInfo.examName = this.$route.query.examName + // this.examInfo.examId = this.$route.query.examId + // console.log('------->' + this.examInfo.examName + '------->' + this.examInfo.examId) + // if (this.examInfo.examId) { + // this.getExamInfo() + // } + // }, + statusFormatter (row, column, cellValue, index) { + if (cellValue === 'finish') { return '瀹屾垚' - } else if (row.status === 'temp' || row.markPaperStatus === 'temp') { + } else if (cellValue === 'temp') { return '鏈畬鎴�' } }, markPaper (row) { // todo鎵撳紑闃呭嵎椤甸潰 + this.$router.push({ + path: '/exam/mark/paper/detail', + query: { examId: this.examInfo.examId, examName: this.examInfo.examName, userId: row.userId } + }) }, getExamInfo () { getExamMarkPaperInfo(this.examInfo.examId).then(res => { @@ -141,14 +160,17 @@ .title { font-size: 18px; } + .bottom5 { margin-bottom: 5px; } + .nameInfo { width: 100%; display: flex; flex-direction: column; } + .nameClass { width: 100%; display: flex; @@ -158,6 +180,7 @@ height: 70px; background-color: #cb5858; } + .staticNum { width: 100%; display: flex; -- Gitblit v1.8.0