diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/ExamDOController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/ExamDOController.java
index 57ffa80..fd55bcb 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/ExamDOController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/test/ExamDOController.java
@@ -12,6 +12,7 @@ import com.ruoyi.test.domain.Questionbank;
 import com.ruoyi.test.domain.Vo.ExamCreateVo;
 import com.ruoyi.test.domain.Vo.QuestionbankVo;
 import com.ruoyi.test.domain.Vo.QuestionbankVo1;
+import com.ruoyi.test.domain.Vo.QuestionbankVo2;
 import com.ruoyi.test.seriver.IExamCreateService;
 import com.ruoyi.test.seriver.IExamDOService;
 import com.ruoyi.test.seriver.IExamPaperService;
@@ -40,7 +41,7 @@ public class ExamDOController {
 
     @ApiOperation("题库列表")
     @GetMapping("selectList")
-    public R<IPage<QuestionbankVo>> selectList(int pagenum,int pagesize){
+    public R<IPage<QuestionbankVo2>> selectList(int pagenum, int pagesize){
         return R.ok(iExamDOService.selectExamDoList(pagenum,pagesize));
     }
 
diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/QuestionbankVo2.java b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/QuestionbankVo2.java
new file mode 100644
index 0000000..bace822
--- /dev/null
+++ b/ruoyi-test/src/main/java/com/ruoyi/test/domain/Vo/QuestionbankVo2.java
@@ -0,0 +1,20 @@
+package com.ruoyi.test.domain.Vo;
+
+import lombok.Data;
+
+import java.util.List;
+import java.util.Map;
+
+@Data
+public class QuestionbankVo2 {
+    private Long id;
+    private Long questiontype;
+    private String subject;
+    private String content;
+    private List<Map<String,String>> chance;
+    private String answer;
+    private Double score;
+    private String analysis;
+    private Long difficulty;
+    private String createtime;
+}
diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamDOService.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamDOService.java
index 8517662..c8ff85f 100644
--- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamDOService.java
+++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/IExamDOService.java
@@ -8,12 +8,13 @@ import com.ruoyi.test.domain.Questionbank;
 import com.ruoyi.test.domain.Vo.ExamCreateVo;
 import com.ruoyi.test.domain.Vo.QuestionbankVo;
 import com.ruoyi.test.domain.Vo.QuestionbankVo1;
+import com.ruoyi.test.domain.Vo.QuestionbankVo2;
 
 import java.util.List;
 
 public interface IExamDOService {
 
-    IPage<QuestionbankVo> selectExamDoList(int pagenum,int pagesize);
+    IPage<QuestionbankVo2> selectExamDoList(int pagenum, int pagesize);
 
     QuestionbankVo1 preview(Long id);
 
diff --git a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamDOServiceImpl.java b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamDOServiceImpl.java
index 62896e8..f0d41f0 100644
--- a/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamDOServiceImpl.java
+++ b/ruoyi-test/src/main/java/com/ruoyi/test/seriver/Impl/ExamDOServiceImpl.java
@@ -12,12 +12,10 @@ import com.ruoyi.test.domain.ExamCreate;
 import com.ruoyi.test.domain.ExamPaper;
 import com.ruoyi.test.domain.QuestionType;
 import com.ruoyi.test.domain.Questionbank;
-import com.ruoyi.test.domain.Vo.ExamCreateVo;
-import com.ruoyi.test.domain.Vo.QuestionanswerVo;
-import com.ruoyi.test.domain.Vo.QuestionbankVo;
-import com.ruoyi.test.domain.Vo.QuestionbankVo1;
+import com.ruoyi.test.domain.Vo.*;
 import com.ruoyi.test.mapper.*;
 import com.ruoyi.test.seriver.IExamDOService;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.parameters.P;
 import org.springframework.stereotype.Service;
@@ -60,31 +58,23 @@ public class ExamDOServiceImpl extends ServiceImpl<ExamDOMapper, ExamDO> impleme
     }
 
     @Override
-    public IPage<QuestionbankVo> selectExamDoList(int pagenum,int pagesize) {
+    public IPage<QuestionbankVo2> selectExamDoList(int pagenum, int pagesize) {
         Page<Questionbank> page = new Page<>(pagenum,pagesize);
         LambdaQueryWrapper<Questionbank> queryWrapper = new LambdaQueryWrapper<>();
-        IPage<Questionbank> iPage = questionbankMapper.selectPage(page,queryWrapper);
-        List<QuestionbankVo> list = new ArrayList<>();
-        List<Questionbank> questionbankList = page.getRecords();
+        List<QuestionbankVo2> list = new ArrayList<>();
+        List<Questionbank> questionbankList = questionbankMapper.selectList(queryWrapper);
         for(Questionbank questionbank : questionbankList){
-            QuestionbankVo questionbankVo = new QuestionbankVo();
-            questionbankVo.setId(questionbank.getId());
-            questionbankVo.setQuestiontype(questionbank.getQuestiontype());
-            questionbankVo.setContent(questionbank.getContent());
-            String chance = questionbank.getChance();
+            QuestionbankVo2 questionbankVo2 = new QuestionbankVo2();
+            BeanUtils.copyProperties(questionbank,questionbankVo2);
             Gson gson = new Gson();
             // 将 JSON 字符串转换为 List<Map<String, String>>
-            List<Map<String, String>> listMap = gson.fromJson(chance, List.class);
-            questionbankVo.setChance(listMap);
-            questionbankVo.setAnswer(questionbank.getAnswer());
-            questionbankVo.setScore(questionbank.getScore());
-            questionbankVo.setAnalysis(questionbank.getAnalysis());
-            questionbankVo.setDifficulty(questionbank.getDifficulty());
-            questionbankVo.setCreatetime(questionbank.getCreatetime());
-            list.add(questionbankVo);
+            List<Map<String, String>> listMap = gson.fromJson(questionbank.getChance(), List.class);
+            questionbankVo2.setChance(listMap);
+            list.add(questionbankVo2);
         }
-        IPage<QuestionbankVo> pageVo = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
+        IPage<QuestionbankVo2> pageVo = new Page<>(page.getCurrent(), page.getSize(), page.getTotal());
         pageVo.setRecords(list);
+        System.out.println("++++++++++++"+pageVo);
         return pageVo;
     }
 
diff --git a/vue2/vue/package-lock.json b/vue2/vue/package-lock.json
index 37a3d3b..eb6f08e 100644
--- a/vue2/vue/package-lock.json
+++ b/vue2/vue/package-lock.json
@@ -12,6 +12,7 @@
         "core-js": "^3.39.0",
         "echarts": "^4.9.0",
         "element-ui": "^2.15.14",
+        "lodash": "^4.17.21",
         "vue": "^2.6.14",
         "vue-router": "^3.5.1",
         "vuex": "^3.6.2"
@@ -6532,8 +6533,7 @@
     "node_modules/lodash": {
       "version": "4.17.21",
       "resolved": "https://registry.npmmirror.com/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==",
-      "dev": true
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
     "node_modules/lodash.debounce": {
       "version": "4.0.8",
diff --git a/vue2/vue/package.json b/vue2/vue/package.json
index 318e4fe..29d162d 100644
--- a/vue2/vue/package.json
+++ b/vue2/vue/package.json
@@ -11,6 +11,7 @@
     "core-js": "^3.39.0",
     "echarts": "^4.9.0",
     "element-ui": "^2.15.14",
+    "lodash": "^4.17.21",
     "vue": "^2.6.14",
     "vue-router": "^3.5.1",
     "vuex": "^3.6.2"
diff --git a/vue2/vue/src/components/Login.vue b/vue2/vue/src/components/Login.vue
index a823405..33dc829 100644
--- a/vue2/vue/src/components/Login.vue
+++ b/vue2/vue/src/components/Login.vue
@@ -94,7 +94,7 @@ export default {
               });
             }else if(res.data.roles[0] === 'teacher'){
               this.$router.push({
-                path: '/teacher/correct',
+                path: '/teacher/homePage',
                 query: { userId: userId }
               });
               // window.location.href = 'http://localhost:8081/teacher/correct';
diff --git a/vue2/vue/src/views/Teacher/Questions.vue b/vue2/vue/src/views/Teacher/Questions.vue
index 9f6c096..6e47ba8 100644
--- a/vue2/vue/src/views/Teacher/Questions.vue
+++ b/vue2/vue/src/views/Teacher/Questions.vue
@@ -13,36 +13,60 @@
       </el-header>
 
       <el-main>
-        <!-- 加载中显示 -->
-        <el-spin v-if="loading" size="large" />
+        <!-- 筛选部分 -->
+        <div class="filter-container">
+          <el-row gutter={20} class="filter-row">
+            <!-- 学科筛选 -->
+            <el-col :span="7">
+              <el-select v-model="selectedSubject" placeholder="选择学科" @change="filterQuestions" class="filter-item">
+                <el-option label="数学" value="数学" />
+                <el-option label="语文" value="语文" />
+                <el-option label="英语" value="英语" />
+                <el-option label="物理" value="物理" />
+                <el-option label="化学" value="化学" />
+                <el-option label="无" value="" />
+              </el-select>
+            </el-col>
 
-        <!-- 添加题目部分 -->
-        <div class="question-add-container" v-if="!loading">
-          <el-input
-              placeholder="请输入题目内容"
-              v-model="newQuestion"
-              clearable
-              style="width: 60%; margin-right: 10px;"
-          />
-          <el-button
-              type="primary"
-              @click="addQuestion"
-              icon="el-icon-plus"
-              :loading="isAddingQuestion"
-          >
-            添加题目
-          </el-button>
+            <!-- 题型筛选 -->
+            <el-col :span="7">
+              <el-select v-model="selectedType" placeholder="选择题型" @change="filterQuestions" class="filter-item">
+                <el-option label="单选题" value="1" />
+                <el-option label="多选题" value="2" />
+                <el-option label="填空题" value="3" />
+                <el-option label="判断题" value="4" />
+                <el-option label="解答题" value="5" />
+                <el-option label="无" value="" />
+              </el-select>
+            </el-col>
+
+            <!-- 重置和添加题目按钮 -->
+            <el-col :span="10" class="button-group">
+              <el-button type="primary" @click="resetFilters" class="reset-btn">重置</el-button>
+              <el-button
+                type="primary"
+                @click="addQuestion"
+                icon="el-icon-plus"
+                :loading="isAddingQuestion"
+                class="add-btn"
+              >
+                添加题目
+              </el-button>
+            </el-col>
+          </el-row>
         </div>
 
+        <!-- 加载中显示 -->
+        <el-spin v-if="loading" size="large" />
+
         <!-- 题目列表展示 -->
-        <el-list v-if="!loading">
+        <el-list v-if="!loading && filteredQuestions.length > 0">
           <el-list-item
-              v-for="(question, index) in questionList"
+              v-for="(question, index) in filteredQuestions"
               :key="question.id"
               class="question-item"
           >
             <div class="question-item-content">
-              <!-- 题目标题和操作按钮 -->
               <div class="question-title-container">
                 <span class="question-title">{{ question.id }}</span>
                 <div class="button-group">
@@ -62,13 +86,12 @@
                   />
                 </div>
               </div>
-              <!-- 题目内容及元数据 -->
               <div class="question-content">
                 <p>{{ question.content }}</p>
                 <div class="question-meta">
                   <span class="subject-type">学科类型: {{ question.subject }}</span>
                   <span class="question-difficulty">难度: {{ question.difficulty }}</span>
-                  <span class="created-at">创建时间: {{ question.createtime}}</span>
+                  <span class="created-at">创建时间: {{ question.createtime }}</span>
                 </div>
               </div>
             </div>
@@ -99,7 +122,7 @@
         <p><strong>题目内容:</strong> {{ previewQuestionData.content }}</p>
         <div v-if="previewQuestionData.chance && previewQuestionData.chance.length > 0">
           <p><strong>选项:</strong></p>
-          <el-row v-for="(option, index) in previewQuestionData.chance" :key="index" type="flex" justify="start" align="middle" class="option-row">
+          <el-row v-for="(option, index) in previewQuestionData.chance" :key="index" class="option-row">
             <el-col :span="24">
               <el-tag :type="'success'" class="option-tag">
                 {{ option.label }}: {{ option.text }}
@@ -121,7 +144,7 @@
 <script>
 import Header from "@/components/Teacher/Header.vue";
 import Aside from "@/components/Teacher/Aside.vue";
-import axios from "axios"; // Import axios for API requests
+import axios from "axios";
 
 export default {
   name: "Questions",
@@ -132,76 +155,38 @@ export default {
       isCollapse: false,
       sideWidth: 200,
       logoTextShow: true,
-      questionList: [], // Store question data
-      newQuestion: "", // For binding the input field
-      activeNames: [], // Manage the collapse panel state
-      isAddingQuestion: false, // Flag to show if question is being added
-      currentPage: 1, // Current page for pagination
-      pageSize: 10, // Number of questions per page
-      totalQuestions: 0, // Total number of questions
-      loading: true, // Loading state
-      previewVisible: false, // Control visibility of preview modal
-      previewQuestionData: {}, // Data to be shown in the preview modal
-      questionTypes: {
-        1: '单选题',
-        2: '多选题',
-        3: '填空题',
-        4: '判断题',
-        5: '解答题',
-      },
+      questionList: [],
+      filteredQuestions: [],
+      newQuestion: "",
+      isAddingQuestion: false,
+      currentPage: 1,
+      pageSize: 10,
+      totalQuestions: 0,
+      loading: true,
+      previewVisible: false,
+      previewQuestionData: {},
+      selectedSubject: "",
+      selectedType: "",
     };
   },
   methods: {
-    // Toggle the sidebar collapse state
     collapse() {
       this.isCollapse = !this.isCollapse;
-      if (this.isCollapse) {
-        this.sideWidth = 64;
-        this.collapseBtnClass = "el-icon-s-unfold";
-        this.logoTextShow = false;
-      } else {
-        this.sideWidth = 200;
-        this.collapseBtnClass = "el-icon-s-fold";
-        this.logoTextShow = true;
-      }
+      this.sideWidth = this.isCollapse ? 64 : 200;
+      this.collapseBtnClass = this.isCollapse ? "el-icon-s-unfold" : "el-icon-s-fold";
+      this.logoTextShow = !this.isCollapse;
     },
 
-    // Add a new question
-    addQuestion() {
-      this.isAddingQuestion = true;
-      setTimeout(() => {
-        if (this.newQuestion.trim() !== "") {
-          this.questionList.push({
-            title: `题目${this.questionList.length + 1}`,
-            content: this.newQuestion,
-            subjectType: "数学", // Example subject type
-            difficulty: "中等",  // Example difficulty level
-            createdAt: new Date(), // Current time
-          });
-          this.newQuestion = ""; // Clear input field
-        }
-        this.isAddingQuestion = false;
-      }, 500);
-    },
-
-    // Delete a question
-    deleteQuestion(index) {
-      this.questionList.splice(index, 1);
-    },
-
-    // Preview a question in a modal
     previewQuestion(question) {
-      this.previewQuestionData = question; // Set data for preview
-      this.previewVisible = true; // Open the preview modal
+      this.previewQuestionData = question;
+      this.previewVisible = true;
     },
 
-    // Handle page change
     handlePageChange(page) {
       this.currentPage = page;
       this.fetchQuestions();
     },
 
-    // Fetch questions from backend API
     async fetchQuestions() {
       try {
         const token = this.$store.state.tokens[this.userId];
@@ -223,38 +208,83 @@ export default {
         });
 
         if (response.data.code === 200) {
-          this.questionList = response.data.data.records.map((item) => ({
-            ...item,
-            subjectType: item.subjectType || "未分类", // Set default values
-            difficulty: item.difficulty || "未知",
-            createdAt: item.createdAt || new Date(),
-          }));
+          this.questionList = response.data.data.records;
           this.totalQuestions = response.data.data.total;
+          this.filterQuestions();
         } else {
           this.$message.error("获取数据失败");
         }
       } catch (error) {
         console.error("获取数据失败", error);
-        this.$message.error("获取题库失败");
       } finally {
-        this.loading = false; // Stop loading once data is fetched
+        this.loading = false;
+      }
+    },
+
+    filterQuestions() {
+      let filteredQuestions = this.questionList;
+
+      if (this.selectedSubject) {
+        filteredQuestions = filteredQuestions.filter(item => item.subject === this.selectedSubject);
+      }
+
+      if (this.selectedType) {
+        filteredQuestions = filteredQuestions.filter(item => item.questiontype === parseInt(this.selectedType));
+      }
+
+      this.filteredQuestions = filteredQuestions;
+      this.totalQuestions = filteredQuestions.length;
+      this.currentPage = 1;
+      this.fetchQuestions();
+      this.loading = false;
+    },
+
+    resetFilters() {
+      this.selectedSubject = "";
+      this.selectedType = "";
+      this.filterQuestions();
+    },
+
+    deleteQuestion(index) {
+      this.filteredQuestions.splice(index, 1);
+      this.totalQuestions -= 1;
+    },
+
+    async addQuestion() {
+      if (!this.newQuestion) {
+        this.$message.warning("请输入题目内容");
+        return;
+      }
+      this.isAddingQuestion = true;
+      try {
+        const response = await axios.post("http://localhost:8080/examcreate/addQuestion", {
+          content: this.newQuestion,
+        });
+        if (response.data.code === 200) {
+          this.newQuestion = "";
+          this.fetchQuestions();
+        } else {
+          this.$message.error("添加题目失败");
+        }
+      } catch (error) {
+        console.error("添加题目失败", error);
+        this.$message.error("添加题目失败");
+      } finally {
+        this.isAddingQuestion = false;
       }
     },
 
-    // Close preview modal
     handleClosePreview() {
       this.previewVisible = false;
-      this.previewQuestionData = {}; // Clear preview data
-    }
+      this.previewQuestionData = {};
+    },
   },
 
-  // Fetch data when component is created
   created() {
     this.userId = this.$route.query.userId;
     this.fetchQuestions();
   },
 
-  // Format date filter for display
   filters: {
     formatDate(value) {
       if (!value) return '';
@@ -263,111 +293,68 @@ export default {
     },
   },
 };
-
 </script>
-<style scoped lang="scss">
-.question-add-container {
-  display: flex;
-  align-items: center;
-  margin-bottom: 20px; /* Increased margin for better spacing */
-}
 
-.question-item {
-  border: 1px solid #e0e0e0;
-  border-radius: 8px;
-  margin-bottom: 20px; /* Increased space between items */
-  background-color: #fff;
-  transition: transform 0.3s ease, box-shadow 0.3s ease;
-}
-
-.question-item:hover {
-  transform: scale(1.02); /* Slight zoom effect on hover */
-  box-shadow: 0 4px 8px rgba(0, 0, 0, 0.1);
+<style scoped>
+.filter-container {
+  margin-bottom: 20px;
 }
 
-.question-title-container {
+.filter-row {
   display: flex;
-  justify-content: space-between; /* Ensures that title and button are on the same line */
-  align-items: center; /* Vertically aligns items */
-  padding: 12px 15px;
-  background-color: #f9f9f9;
-  border-bottom: 2px solid #e0e0e0;
+  gap: 20px;
 }
 
-.question-title {
-  font-size: 18px;
-  font-weight: bold;
-  color: #333;
-  margin-right: 15px;
-  text-transform: capitalize; /* Capitalize first letters */
+.filter-item {
+  width: 100%;
 }
 
 .button-group {
   display: flex;
-  align-items: center;
-}
-
-.preview-button {
-  background-color: #20a0ff;
-  margin-right: 10px;
-}
-
-.delete-button {
-  background-color: #f56c6c;
-  border: none;
-  transition: background-color 0.3s ease, transform 0.2s ease;
+  gap: 10px;
+  justify-content: flex-end;
 }
 
-.delete-button:hover {
-  background-color: #e74c3c;
-  transform: scale(1.1); /* Zoom effect on hover */
+.reset-btn, .add-btn {
+  width: 100px;
+  height: 38px;
 }
 
-.question-content {
+.question-item {
+  margin-bottom: 15px;
   padding: 15px;
-  font-size: 16px;
-  color: #666;
-  line-height: 1.6;
-  border-top: 1px solid #e0e0e0;
+  //border: 1px solid #ddd;
+  border-radius: 8px;
 }
 
-.question-meta {
-  margin-top: 12px;
-  font-size: 14px;
-  color: #999;
+.question-title-container {
   display: flex;
-  flex-wrap: wrap;
+  justify-content: space-between;
+  align-items: center;
 }
 
-.subject-type,
-.question-difficulty,
-.created-at {
-  margin-right: 20px;
+.preview-button, .delete-button {
+  margin-left: 10px;
 }
 
-.el-pagination {
-  margin-top: 30px;
-  text-align: center;
-  font-size: 14px;
-  color: #666;
+.question-content {
+  margin-top: 10px;
 }
 
-.el-pagination .el-button {
-  font-size: 14px; /* Slightly smaller pagination buttons */
+.question-meta {
+  font-size: 12px;
+  color: #999;
 }
 
-.el-pagination .el-button:hover {
-  background-color: #f0f0f0;
+.option-row {
+  margin-top: 5px;
 }
 
-/* Modal styling */
-.question-preview p {
-  margin: 10px 0;
-  font-size: 16px;
+.option-tag {
+  margin-right: 5px;
 }
 
 .dialog-footer {
-  display: flex;
-  justify-content: flex-end;
+  text-align: right;
 }
 </style>