From 4d8f0c85660d7dd77199e86e9af9e945a1611e52 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 08 七月 2024 09:41:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
src/views/answer/list.vue | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index 8b8e238..dd8f1a9 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -2,6 +2,9 @@
<div class="app-container">
<el-form :inline="true" :model="queryParam" class="demo-form-inline" label-width="80px">
<el-form-item>
+ <el-input v-model="queryParam.examName" placeholder="璇疯緭鍏ヨ�冭瘯鍚嶇О" clearable></el-input>
+ </el-form-item>
+ <el-form-item>
<el-input v-model="queryParam.name" placeholder="璇疯緭鍏ヨ瘯鍗峰悕绉�" clearable></el-input>
</el-form-item>
<el-form-item>
@@ -15,6 +18,7 @@
</el-form>
<el-table v-loading="listLoading" :data="tableData" border style="width: 100%;">
+ <el-table-column align="center" prop="examName" label="鑰冭瘯鍚嶇О" />
<el-table-column align="center" prop="paperName" label="璇曞嵎鍚嶇О" />
<el-table-column align="center" prop="subjectName" label="绉戠洰" />
<el-table-column align="center" prop="paperType" label="璇曞嵎绫诲瀷" width="150px">
@@ -25,14 +29,14 @@
</template>
</el-table-column>
<el-table-column align="center" prop="questionCount" label="棰樼洰鏁伴噺" width="100px" />
- <el-table-column align="center" prop="systemScore" label="鎬诲垎" width="100px" />
+ <el-table-column align="center" prop="totalScore" label="鎬诲垎" width="100px" />
<el-table-column align="center" prop="suggestTime" label="寤鸿鏃堕暱" width="100px" />
<el-table-column align="center" prop="personAnswerNum" label="鍙傝�冧汉鏁�" width="100px">
<template slot-scope="{row}">
<span>{{ row.personAnswerNum + "/" + row.personTotalNum }}</span>
</template>
</el-table-column>
- <el-table-column align="center" prop="userName" label="鍒涘缓浜�" width="100px" />
+ <el-table-column align="center" prop="userName" label="鍙戣捣浜�" width="100px" />
<el-table-column label="鎿嶄綔" align="center">
<template slot-scope="{row}">
<el-button size="mini" @click="view(row)">鏌ョ湅</el-button>
--
Gitblit v1.8.0