From b17c2ddebcfaeaa48edc1eeca5ee0dc03d9fde90 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期二, 02 七月 2024 09:25:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/answer/info.vue | 17 +++++++++--------
1 files changed, 9 insertions(+), 8 deletions(-)
diff --git a/src/views/answer/info.vue b/src/views/answer/info.vue
index 3d2a382..5541c42 100644
--- a/src/views/answer/info.vue
+++ b/src/views/answer/info.vue
@@ -20,11 +20,12 @@
</div>
<!-- 琛ㄦ牸 -->
<el-table v-loading="listLoading" :data="tableData" border fit highlight-current-row>
+ <el-table-column prop="examName" label="鑰冭瘯鍚嶇О" align="center" />
<el-table-column prop="paperName" label="璇曞嵎鍚嶇О" align="center" />
- <el-table-column prop="userName" label="鍙傝�冧汉" align="center" />
- <el-table-column label="寰楀垎" width="100px">
+ <el-table-column prop="userName" width="150" label="鍙傝�冧汉" align="center" />
+ <el-table-column label="寰楀垎" width="150px" align="center">
<template slot-scope="{row}">
- {{ row.userScore }} / {{ row.paperScore }}
+ {{ row.score }} / {{ row.totalScore }}
</template>
</el-table-column>
<el-table-column label="棰樼洰瀵归敊" width="100px" align="center">
@@ -33,8 +34,8 @@
</template>
</el-table-column>
<el-table-column prop="doTime" label="鑰楁椂" width="80px" align="center" />
- <el-table-column prop="createTime" label="鎻愪氦鏃堕棿" width="160px" align="center" />
- <el-table-column label="鎿嶄綔" width="200px" align="center">
+ <el-table-column prop="submitTime" label="鎻愪氦鏃堕棿" width="240px" align="center" />
+ <el-table-column label="鎿嶄綔" width="120px" align="center">
<template slot-scope="{row}">
<el-button size="mini" @click="view(row)">璇︽儏</el-button>
</template>
@@ -61,7 +62,7 @@
return {
listLoading: true,
queryParam: {
- examPaperId: '',
+ examId: '',
userName: '',
pageIndex: 1,
pageSize: 10
@@ -74,7 +75,7 @@
};
},
created() {
- this.queryParam.examPaperId = this.$route.query.id
+ this.queryParam.examId = this.$route.query.id
this.search()
},
methods: {
@@ -94,7 +95,7 @@
},
handleExport() {
let that = this
- let url = '/api/admin/examPaperAnswer/exportExcel?examPaperId=' + this.queryParam.examPaperId + '&userName=' + this.queryParam.userName
+ let url = '/api/admin/examPaperAnswer/exportExcel?examId=' + this.queryParam.examId + '&userName=' + this.queryParam.userName
var x = new XMLHttpRequest();
x.open("POST", url, true);
x.responseType = "blob";
--
Gitblit v1.8.0