From 0a5557a65304d3c5f8fc35200cfbb38f85778970 Mon Sep 17 00:00:00 2001
From: fuliqi <fuliqi@qq.com>
Date: 星期一, 17 六月 2024 13:52:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/views/answer/list.vue |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/views/answer/list.vue b/src/views/answer/list.vue
index 4789557..63d1414 100644
--- a/src/views/answer/list.vue
+++ b/src/views/answer/list.vue
@@ -2,7 +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.name" placeholder="璇疯緭鍏ュ悕绉�" clearable></el-input>
+        <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>
         <el-select v-model="queryParam.subjectId" placeholder="璇烽�夋嫨绉戠洰" clearable multiple @change="search">
@@ -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">

--
Gitblit v1.8.0