From c2a1c68a2a398e6d0f2f5854c65127efbff306b1 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 28 十月 2024 11:36:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/answer/list.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index 63d1414..ae3e396 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -2,10 +2,10 @@
<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-input v-model="queryParam.examName" placeholder="璇疯緭鍏ヨ�冭瘯鍚嶇О" @input="search" clearable></el-input>
</el-form-item>
<el-form-item>
- <el-input v-model="queryParam.name" placeholder="璇疯緭鍏ヨ瘯鍗峰悕绉�" clearable></el-input>
+ <el-input v-model="queryParam.name" placeholder="璇疯緭鍏ヨ瘯鍗峰悕绉�" @input="search" clearable></el-input>
</el-form-item>
<el-form-item>
<el-select v-model="queryParam.subjectId" placeholder="璇烽�夋嫨绉戠洰" clearable multiple @change="search">
@@ -20,7 +20,7 @@
<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="subjectName" label="绉戠洰" /> -->
<el-table-column align="center" prop="paperType" label="璇曞嵎绫诲瀷" width="150px">
<template slot-scope="{row}">
<span v-if="row.paperType === 1">鍥哄畾璇曞嵎</span>
@@ -29,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>
@@ -87,7 +87,7 @@
})
},
view(row) {
- this.$router.push({ path: '/answer/answer-list', query: { id: row.id } });
+ this.$router.push({ path: '/answer/answer-info', query: { id: row.id } });
},
...mapActions('exam', { initSubject: 'initSubject' })
},
--
Gitblit v1.8.0