diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index 5520ddc745661ae2f98461869fb586c29a6c5d0e..f39bb1c6b0f828730abb6c0da6a11cdd00b7af91 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -27,6 +27,7 @@ import java.util.*;
     QuestionService questionService = IOC.getBean(QuestionServiceImpl.class);
     NoticeService noticeService = IOC.getBean(NoticeServiceImpl.class);
     SubmitService submitService = IOC.getBean(SubmitServiceImpl.class);
+    GradeService gradeService = IOC.getBean(GradeServiceImpl.class);
 
     WordService wordService = IOC.getBean(WordServiceImpl.class);
 
@@ -41,27 +42,11 @@ import java.util.*;
     }
 
     @Action
-    public R getHomeWorkByCourse(HttpServletRequest request) throws Exception {
-        String course_name = String.valueOf(request.getParameter("course_name"));
+    public R findHomeWork(HttpServletRequest request) throws Exception {
         Integer id = Integer.parseInt(request.getParameter("id"));
-        List<HomeWork> homeWork = homeWorkService.getHomeWorkByCourse(course_name, id);
-        return R.ok().put("data", homeWork);
-    }
-
-    @Action
-    public R getHomeWorkByTeacherName(HttpServletRequest request) throws Exception {
-        String name = String.valueOf(request.getParameter("name"));
-        Integer id = Integer.parseInt(request.getParameter("id"));
-        List<HomeWork> homeWork = homeWorkService.getHomeWorkByTeacherName(name, id);
-        return R.ok().put("data", homeWork);
-    }
-
-    @Action
-    public R getHomeWorkByHomeworkName(HttpServletRequest request) throws Exception {
-        String homework_name = String.valueOf(request.getParameter("homework_name"));
-        Integer id = Integer.parseInt(request.getParameter("id"));
-        List<HomeWork> homeWork = homeWorkService.getHomeWorkByHomeworkName(homework_name, id);
-        return R.ok().put("data", homeWork);
+        String input = String.valueOf(request.getParameter("input"));
+        List<HomeWork> homeWork = homeWorkService.findHomeWork(id,input);
+        return R.ok().put("data",homeWork);
     }
 
     //获取个人所有作业
@@ -217,17 +202,23 @@ import java.util.*;
     //教师端获取作业
     @Action
     public R getTHomeWork(HttpServletRequest request) throws Exception {
+        int Page = Integer.parseInt(request.getParameter("page"));
+        int pageSize = Integer.parseInt(request.getParameter("pageSize"));
+        int offset = (Page - 1) * pageSize;
         Integer id = Integer.parseInt(request.getParameter("id"));
-        List<HomeWork> homeWork = homeWorkService.getTHomeWork(id);
+        List<HomeWork> homeWork = homeWorkService.getTHomeWork(id, offset, pageSize);
         return R.ok().put("data", homeWork);
     }
 
     //教师端查找未批，已批和未提交的学生
     @Action
     public R getGradeHomeWork(HttpServletRequest request) throws Exception {
+        Integer page= Integer.parseInt(request.getParameter("page"));
+        Integer pageSize= Integer.parseInt(request.getParameter("pageSize"));
+        Integer offset = (page - 1) * pageSize;
         Integer id = Integer.parseInt(request.getParameter("id"));
         Integer submitStatus = Integer.parseInt(request.getParameter("submitStatus"));
-        List<Student> GradeHomeWork = submitService.getGradeHomeWork(submitStatus, id);
+        List<Student> GradeHomeWork = submitService.getGradeHomeWork(submitStatus, id, offset, pageSize);
         return R.ok().put("data", GradeHomeWork);
     }
     //教师端作业关键字查询
@@ -246,4 +237,28 @@ import java.util.*;
         List<HomeWork> homeWork = homeWorkService.getHomeWorkByStatus(id,submitStatus);
         return R.ok().put("data", homeWork);
     }
+
+    //教师端获取成绩
+    @Action
+    public R getScore(HttpServletRequest request) throws Exception {
+        Integer id = Integer.parseInt(request.getParameter("id"));
+        List<Grade> score = gradeService.getScore(id);
+        return R.ok().put("data", score);
+
+    }
+    //获取教师端作业数量
+    @Action
+    public R getTHomeWorkCount(HttpServletRequest request) throws Exception {
+        Integer id = Integer.parseInt(request.getParameter("id"));
+        int count = homeWorkService.getTHomeWorkCount(id);
+        return R.ok().put("data", count);
+    }
+    //获取批改页面作业数量
+    @Action
+    public R getGradeCount(HttpServletRequest request) throws Exception {
+        Integer id = Integer.parseInt(request.getParameter("id"));
+        Integer submitStatus = Integer.parseInt(request.getParameter("submitStatus"));
+        int count=submitService.getGradeCount(id,submitStatus);
+        return R.ok().put("data", count);
+    }
 }
\ No newline at end of file
diff --git a/HomeWork-java/src/com/wetoband/template/dao/GradeDao.java b/HomeWork-java/src/com/wetoband/template/dao/GradeDao.java
new file mode 100644
index 0000000000000000000000000000000000000000..ae58337406b0f22e07de98ecdb7c68a94cf11aaa
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/dao/GradeDao.java
@@ -0,0 +1,11 @@
+package com.wetoband.template.dao;
+
+import com.wetoband.template.entity.Grade;
+
+import java.sql.Connection;
+import java.sql.SQLException;
+import java.util.List;
+
+public interface GradeDao {
+    List<Grade> getScore(Connection connection, int id) throws SQLException;
+}
diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
index d3543e2f2b34d6942430bfeae981b975ec75a05b..0dc67cb9e777e3d158dc1e862167c6a7a74ef3f0 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
@@ -11,16 +11,17 @@ import java.util.List;
 public interface HomeWorkDao extends IBaseDao<HomeWork> {
     //HomeWork getHomeWorkById(Connection connection, int id) throws SQLException;
     List<HomeWork> getHomeWork(Connection connection, int id, int offset,int pageSize) throws SQLException;
-    List<HomeWork> getHomeWorkByCourse(Connection connection, String course_name,int id) throws SQLException;
-    List<HomeWork> getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException;
-    List<HomeWork> getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException;
 
+    List<HomeWork> findHomeWork(Connection connection, int id, String input) throws SQLException;
 
-    List<HomeWork> getTHomeWork(Connection connection, int id);
+    List<HomeWork> getTHomeWork(Connection connection, int id, int offset, int pageSize);
     List<HomeWork> getHomeWorkByKeyword(Connection connection, int id,String keyword);
     List<HomeWork> getHomeWorkByStatus(Connection connection, int id,String status);
+    int getTHomeWorkCount(Connection connection, int id);
 
     //提交作业
     void submitHomework(Connection connection, Submit submitHomework);
     int getCount(Connection connection, int id) throws SQLException;
+
+
 }
diff --git a/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java b/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java
index 294ee734a5662f8c7ce275969614e1b51211a0bf..5a463344141d492a2e6633c56b0b584b0dc1b355 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java
@@ -6,6 +6,7 @@ import java.sql.Connection;
 import java.util.List;
 
 public interface SubmitDao {
-    public List<Student> getGradeHomeWork(Connection connection, int submitStatus,int id);
+    public List<Student> getGradeHomeWork(Connection connection, int submitStatus,int id, Integer offset, Integer pageSize);
 
+    int getGradeCount(Connection conntion, Integer id, Integer submitStatus);
 }
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/GradeDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/GradeDaoImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..e0b7977e22d193597615a5634ffa9585cf9595aa
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/GradeDaoImpl.java
@@ -0,0 +1,55 @@
+package com.wetoband.template.dao.impl;
+
+import com.wetoband.template.dao.GradeDao;
+import com.wetoband.template.entity.Grade;
+import org.springframework.stereotype.Repository;
+
+import java.sql.Connection;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+
+@Repository
+public class GradeDaoImpl implements GradeDao {
+    @Override
+    public List<Grade> getScore(Connection connection, int id) throws SQLException {
+
+        // SQL语句
+        String sql = "SELECT student.sno,student.name,homework.homework_name,submit.submitTime,submit.score,submit.submitStatus,submit.correct " +
+                "FROM submit JOIN student ON submit.student_id = student.id " +
+                "JOIN homework ON submit.homework_id = homework.homework_id " +
+                "WHERE submit.teacher_id = ?";
+
+        List<Grade> gradeList = new ArrayList<>();
+        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
+            pstm.setInt(1, id);
+            try (ResultSet rs = pstm.executeQuery()) {
+                while (rs.next()) {
+                    Grade grade = new Grade();
+                    grade.setSno(rs.getString("sno"));
+                    grade.setName(rs.getString("name"));
+                    grade.setHomeworkName(rs.getString("homework_name"));
+                    grade.setSubmitTime(rs.getString("submitTime"));
+                    grade.setScore(rs.getDouble("score"));
+                    if (rs.getInt("submitStatus") == 0){
+                        grade.setSubmitStatus("否");
+                    }else {
+                        grade.setSubmitStatus("是");
+                    }
+                    if (rs.getInt("correct") == 0){
+                        grade.setCorrect("否");
+                    }else {
+                        grade.setCorrect("是");
+                    }
+                    gradeList.add(grade);
+                }
+            }
+        } catch (SQLException e) {
+            // 处理异常，这里只是简单地让异常继续抛出，但实际应用中可能需要更详细的错误处理
+            throw e;
+        }
+        return gradeList;
+    }
+}
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
index f8ae0b650a08bc9e04935d93480833f5078d639e..a2bc3b45312fde3aa01d69595deee39c9cc878de 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
@@ -31,6 +31,27 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
         return count;
     }
 
+    @Override
+    public int getTHomeWorkCount(Connection connection, int id) {
+        String sql="SELECT  " +
+                "COUNT(DISTINCT homework.homework_id) " +
+                "FROM homework " +
+                "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " +
+                "WHERE submit.teacher_id = ? ";
+        int count = 0;
+        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
+            pstm.setInt(1,id);
+            try (ResultSet rs = pstm.executeQuery()) {
+                while (rs.next()) {
+                    count = rs.getInt(1);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        return count;
+    }
+
     @Override
     public List<HomeWork> getHomeWork(Connection connection, int id,int offset, int pageSize) throws SQLException {
 
@@ -80,97 +101,48 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
         return homeworkList;
     }
 
+    //作业模糊查询
     @Override
-    public List<HomeWork> getHomeWorkByCourse(Connection connection, String course_name,int id) throws SQLException {
-        String sql = "SELECT homework.*,teacher.name , submit.submitStatus FROM homework " +
-                "JOIN teacher ON homework.teacher_id = teacher.id " +
-                "LEFT JOIN submit ON submit.student_id = ? AND homework.homework_id = submit.homework_id ";
-        List<HomeWork> homeworkList = new ArrayList<>();
-        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
-            pstm.setString(1, course_name);
-            pstm.setInt(2,id);
-            try (ResultSet rs = pstm.executeQuery()) {
-                while (rs.next()) {
-                    HomeWork homework = new HomeWork();
-                    homework.setHomework_id(rs.getInt("homework_id"));
-                    homework.setTeacher_id(rs.getInt("teacher_id"));
-                    homework.setType(rs.getInt("type"));
-                    homework.setHomework_describe(rs.getString("homeworkDescribe"));
-                    homework.setStart_time(rs.getString("startTime"));
-                    homework.setFinish_time(rs.getString("finishTime"));
-                    homework.setHomework_name(rs.getString("homework_name"));
-                    homework.setCourse_name(rs.getString("course_name"));
-                    homeworkList.add(homework);
-                }
-            }
-        } catch (SQLException e) {
-            throw e;
-        }
-        return homeworkList;
-    }
-
-    @Override
-    public List<HomeWork> getHomeWorkByTeacherName(Connection connection, String name,int id) throws SQLException {
-        String sql = "SELECT homework.* FROM homework " +
-                "JOIN teacher ON homework.teacher_id = teacher.id " +
-                "JOIN homework_student ON homework.homework_id = homework_student.homework_id " +
-                "WHERE  teacher.name = ? AND  homework_student.student_id = ?;";
-        List<HomeWork> homeworkList = new ArrayList<>();
-        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
-            pstm.setString(1, name);
-            pstm.setInt(2,id);
-            try (ResultSet rs = pstm.executeQuery()) {
-                while (rs.next()) {
-                    HomeWork homework = new HomeWork();
-                    homework.setHomework_id(rs.getInt("homework_id"));
-                    homework.setTeacher_id(rs.getInt("teacher_id"));
-                    homework.setType(rs.getInt("type"));
-                    homework.setHomework_describe(rs.getString("homeworkDescribe"));
-                    homework.setStart_time(rs.getString("startTime"));
-                    homework.setFinish_time(rs.getString("finishTime"));
-                    homework.setHomework_name(rs.getString("homework_name"));
-                    homework.setCourse_name(rs.getString("course_name"));
-                    homeworkList.add(homework);
-                }
-            }
-        } catch (SQLException e) {
-            throw e;
-        }
-        return homeworkList;
-    }
-
-    @Override
-    public List<HomeWork> getHomeWorkByHomeworkName(Connection connection, String homework_name,int id) throws SQLException {
-        String sql = "SELECT homework.* FROM homework " +
-                "JOIN homework_student ON homework_student.homework_id = homework.homework_id " +
-                "JOIN student ON homework_student.student_id = student.id " +
-                "WHERE homework.homework_name = ? AND student.id = ? ";
+    public List<HomeWork> findHomeWork(Connection connection, int id, String input) throws  SQLException{
+        // SQL语句
+        String sql = "SELECT " +
+                "    homework.*, " +
+                "    teacher.NAME, " +
+                "    submit.submitStatus, " +
+                "    submit.score " +
+                "FROM " +
+                "    homework " +
+                "    RIGHT JOIN submit ON submit.student_id = ? " +
+                "    INNER JOIN teacher ON teacher.id = submit.teacher_id " +
+                "    AND homework.homework_id = submit.homework_id " +
+                "    WHERE CONCAT(homework.course_name,homework.homework_name,teacher.name) LIKE ?";
         List<HomeWork> homeworkList = new ArrayList<>();
-        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
-            pstm.setString(1, homework_name);
-            pstm.setInt(2,id);
-            try (ResultSet rs = pstm.executeQuery()) {
-                while (rs.next()) {
+        try(PreparedStatement ptsm = connection.prepareStatement(sql)){
+            ptsm.setInt(1,id);
+            ptsm.setString(2,"%"+input+"%");
+            try(ResultSet rs = ptsm.executeQuery()){
+                while (rs.next()){
                     HomeWork homework = new HomeWork();
                     homework.setHomework_id(rs.getInt("homework_id"));
-                    homework.setTeacher_id(rs.getInt("teacher_id"));
                     homework.setType(rs.getInt("type"));
                     homework.setHomework_describe(rs.getString("homeworkDescribe"));
                     homework.setStart_time(rs.getString("startTime"));
                     homework.setFinish_time(rs.getString("finishTime"));
                     homework.setHomework_name(rs.getString("homework_name"));
                     homework.setCourse_name(rs.getString("course_name"));
+                    homework.setTeacher_name(rs.getString("name"));
+                    homework.setScore(rs.getDouble("score"));
                     homeworkList.add(homework);
                 }
             }
-        } catch (SQLException e) {
+        }catch (SQLException e){
             throw e;
         }
         return homeworkList;
     }
 
     @Override
-    public List<HomeWork> getTHomeWork(Connection connection, int id) {
+    public List<HomeWork> getTHomeWork(Connection connection, int id, int offset, int pageSize) {
         String sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, homework.homework_id, " +
                 "SUM(CASE WHEN submit.submitStatus = 0 THEN 1 ELSE 0 END) AS unsubmitted_count, " +
                 "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS submitted_count, " +
@@ -179,10 +151,13 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
                 "FROM homework " +
                 "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " +
                 "WHERE submit.teacher_id = ? " +
-                "GROUP BY homework.homework_id";
+                "GROUP BY homework.homework_id "+
+                "LIMIT ?,?";
         List<HomeWork> homeworkList = new ArrayList<>();
         try (PreparedStatement pstm = connection.prepareStatement(sql)) {
             pstm.setInt(1,id);
+            pstm.setInt(2,offset);
+            pstm.setInt(3,pageSize);
             try (ResultSet rs = pstm.executeQuery()) {
                 while (rs.next()) {
                     HomeWork homework = new HomeWork();
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java
index 6eb49f4f25a67a1a157c5ee74c50aeec288121bc..fb7ddbe5dbb217f1013a8ff241897c7e55eb81e3 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java
@@ -17,23 +17,25 @@ import java.util.List;
 public class SubmitDaoImpl implements SubmitDao {
 
     @Override
-    public List<Student> getGradeHomeWork(Connection connection, int submitStatus, int id) {
-        String sql = "SELECT " +
-                "  student.name, student.sno " +
+    public List<Student> getGradeHomeWork(Connection connection, int submitStatus, int id, Integer offset, Integer pageSize) {
+        String sql =
+                "SELECT " +
+                " student.name, student.sno " +
                 "FROM " +
-                "  student " +
+                " student " +
                 "JOIN " +
-                "  submit ON student.id = submit.student_id " +
+                " submit ON student.id = submit.student_id " +
                 "WHERE " +
-                "  submit.teacher_id=1 AND submit.submitStatus = ? AND submit.homework_id = ? " +
-                "GROUP BY " +
-                "  submit.student_id";
+                " submit.teacher_id=1 AND submit.submitStatus = ? AND submit.homework_id = ? " +
+                "LIMIT ?,?";
 
         List<Student> submitList = new ArrayList<>();
 
         try (PreparedStatement pstm = connection.prepareStatement(sql)) {
             pstm.setInt(1,submitStatus);
             pstm.setInt(2,id);
+            pstm.setInt(3,offset);
+            pstm.setInt(4,pageSize);
             try (ResultSet rs = pstm.executeQuery()) {
                 while (rs.next()) {
                     Student student = new Student();
@@ -48,4 +50,30 @@ public class SubmitDaoImpl implements SubmitDao {
         return submitList;
     }
 
+    @Override
+    public int getGradeCount(Connection conntion, Integer id, Integer submitStatus) {
+        String sql ="SELECT\n" +
+                "COUNT(DISTINCT student.name)" +
+                "FROM\n" +
+                "student \n" +
+                "JOIN\n" +
+                "submit ON student.id = submit.student_id\n" +
+                "WHERE\n" +
+                "submit.teacher_id=1 AND submit.submitStatus = ? AND submit.homework_id = ?";
+
+        int count = 0;
+
+        try (PreparedStatement pstm = conntion.prepareStatement(sql)) {
+            pstm.setInt(1, submitStatus);
+            pstm.setInt(2, id);
+            try (ResultSet rs = pstm.executeQuery()) {
+                while (rs.next()) {
+                    count = rs.getInt(1);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        return count;
+    }
 }
diff --git a/HomeWork-java/src/com/wetoband/template/entity/Grade.java b/HomeWork-java/src/com/wetoband/template/entity/Grade.java
new file mode 100644
index 0000000000000000000000000000000000000000..f85dc3daba879296feacd8925326dd7c57749f11
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/entity/Grade.java
@@ -0,0 +1,26 @@
+package com.wetoband.template.entity;
+
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.Table;
+
+@Data
+@Table(name = "grade")
+public class Grade {
+    @Column(name = "sno")
+    private String sno;
+    @Column(name = "name")
+    private String name;
+    @Column(name = "homework_name")
+    private String homeworkName;
+    @Column(name = "submit_time")
+    private String submitTime;
+    @Column(name = "score")
+    private double score;
+    @Column(name = "submitStatus")
+    private String submitStatus;
+    @Column(name = "correct")
+    private String correct;
+}
+
diff --git a/HomeWork-java/src/com/wetoband/template/service/GradeService.java b/HomeWork-java/src/com/wetoband/template/service/GradeService.java
new file mode 100644
index 0000000000000000000000000000000000000000..08f1c15b99cde1fe241f6a6e9a26896d0db04bcb
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/service/GradeService.java
@@ -0,0 +1,9 @@
+package com.wetoband.template.service;
+
+import com.wetoband.template.entity.Grade;
+
+import java.util.List;
+
+public interface GradeService {
+    public List<Grade> getScore(int id) throws Exception;
+}
diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
index b55e8b27ba8653e65cdb2936e7b764741742676c..279ed70bcff20adecfe7b35943f8f7d8b621e33e 100644
--- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
+++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
@@ -11,13 +11,14 @@ import java.util.List;
 public interface HomeWorkService {
     //public HomeWork getHomeWorkById(int id) throws Exception;
     public List<HomeWork> getHomeWork( int id,int offset,int pageSize) throws Exception;
-    public List<HomeWork> getHomeWorkByCourse(String course_name,int id) throws Exception;
-    public List<HomeWork> getHomeWorkByTeacherName(String name,int id) throws Exception;
-    public List<HomeWork> getHomeWorkByHomeworkName(String homework_name,int id) throws Exception;
-    public List<HomeWork> getTHomeWork(int id) throws Exception;
+    public List<HomeWork> findHomeWork( int id, String input ) throws Exception;
+    public List<HomeWork> getTHomeWork(int id,int offset,int pageSize) throws Exception;
     public List<HomeWork> getHomeWorkByKeyword(int id,String keyword) throws Exception;
     List<HomeWork> getHomeWorkByStatus(Integer id, String submitStatus) throws Exception;
+    public int getTHomeWorkCount(int id) throws Exception;
     void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, String userAnswersJson) throws Exception;
     public int getCount(int id) throws Exception;
 
+
+
 }
diff --git a/HomeWork-java/src/com/wetoband/template/service/SubmitService.java b/HomeWork-java/src/com/wetoband/template/service/SubmitService.java
index 9ba789fa3e6b7b63544325b9df1dfeb7047eefd0..a3211ebf7cdbeafda1fd1d514c98383db6d5d1fe 100644
--- a/HomeWork-java/src/com/wetoband/template/service/SubmitService.java
+++ b/HomeWork-java/src/com/wetoband/template/service/SubmitService.java
@@ -8,5 +8,7 @@ import java.util.List;
 
 
 public interface SubmitService {
-    public List<Student> getGradeHomeWork(int submitStatus,int id) throws Exception;
+    public List<Student> getGradeHomeWork(int submitStatus,Integer id, Integer offset, Integer pageSize) throws Exception;
+
+    int getGradeCount(Integer id, Integer submitStatus) throws Exception;
 }
diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/GradeServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/GradeServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..3304a35d780379e98fb8241977ff0d5eb30301af
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/GradeServiceImpl.java
@@ -0,0 +1,24 @@
+package com.wetoband.template.service.impl;
+
+import com.fy.basejar.tool.ActionToolBase;
+import com.wetoband.template.dao.GradeDao;
+import com.wetoband.template.entity.Grade;
+import com.wetoband.template.service.GradeService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import java.sql.Connection;
+import java.util.List;
+
+@Service
+public class GradeServiceImpl implements GradeService {
+    @Autowired
+    private GradeDao gradeDao;
+
+    @Override
+    public List<Grade> getScore(int id) throws Exception {
+        final Connection connection = ActionToolBase.getDBConnection();
+        return  gradeDao.getScore(connection,id);
+    }
+
+}
diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
index e9938118bc7fb03c6e2f2148c3ba34373a024d42..af96a15dd39c50a4624c374a2483fe49ad408be2 100644
--- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
@@ -33,24 +33,16 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         return homeWorkDao.getHomeWork(connection,id,offset,pageSize);
     }
 
-    public List<HomeWork> getHomeWorkByCourse(String course_name,int id) throws Exception {
+    //查询作业
+    public List<HomeWork> findHomeWork(int id, String input) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
-        return  homeWorkDao.getHomeWorkByCourse(connection,course_name,id);
+        return homeWorkDao.findHomeWork(connection,id,input);
     }
 
-    public List<HomeWork> getHomeWorkByTeacherName(String name,int id) throws Exception {
-        final Connection connection = ActionToolBase.getDBConnection();
-        return  homeWorkDao.getHomeWorkByTeacherName(connection,name,id);
-    }
-
-    public List<HomeWork> getHomeWorkByHomeworkName(String homework_name,int id) throws Exception {
-        final Connection connection = ActionToolBase.getDBConnection();
-        return  homeWorkDao.getHomeWorkByHomeworkName(connection,homework_name,id);
-    }
 
-    public List<HomeWork> getTHomeWork(int id) throws Exception {
+    public List<HomeWork> getTHomeWork(int id,int offset,int pageSize) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
-        return  homeWorkDao.getTHomeWork(connection,id);
+        return  homeWorkDao.getTHomeWork(connection,id,offset,pageSize);
     }
 
     @Override
@@ -65,6 +57,12 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         return homeWorkDao.getHomeWorkByStatus(connection,id,submitStatus);
     }
 
+    @Override
+    public int getTHomeWorkCount(int id) throws Exception {
+        final Connection connection = ActionToolBase.getDBConnection();
+        return homeWorkDao.getTHomeWorkCount(connection,id);
+    }
+
     //    @Transactional()
     @Override
     public void submitHomework(Integer studentId, Integer homeworkId, Date submitTimeDate, String userAnswersJson ) throws Exception {
diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java
index ba2ab7a7c6b89224fb0b177d886fc70ec43cf8d2..1f884a0f1eaf916d945b8e5c971ad61300e1ef21 100644
--- a/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java
@@ -16,9 +16,15 @@ public class SubmitServiceImpl implements SubmitService {
     private SubmitDao submitDao;
 
     @Override
-    public List<Student> getGradeHomeWork(int submitStatus,int id) throws Exception {
+    public List<Student> getGradeHomeWork(int submitStatus,Integer id, Integer offset, Integer pageSize) throws Exception {
        final Connection conntion = ActionToolBase.getDBConnection();
-       return submitDao.getGradeHomeWork(conntion,submitStatus,id);
+       return submitDao.getGradeHomeWork(conntion,submitStatus,id,offset,pageSize);
+    }
+
+    @Override
+    public int getGradeCount(Integer id, Integer submitStatus) throws Exception {
+        final Connection conntion = ActionToolBase.getDBConnection();
+        return submitDao.getGradeCount(conntion,id,submitStatus);
     }
 
 }
diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties
index b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf..77d8be97067836e271cf7fbdc9a13378376ae69e 100644
--- a/HomeWork-java/target/classes/config.properties
+++ b/HomeWork-java/target/classes/config.properties
@@ -32,7 +32,7 @@ SWAP_VALUE_SERVER_PORT=6666
 GET_SWAP_VALUE_IP=192.168.10.254
 GET_SWAP_VALUE_PORT=6666
 
-REDIS_HOST=8.138.182.34
+REDIS_HOST=8.138.41.70
 REDIS_PORT=6379
 REDIS_PASSWORD=123456
 
diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties
index b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf..77d8be97067836e271cf7fbdc9a13378376ae69e 100644
--- a/HomeWork-java/tempResources/config.properties
+++ b/HomeWork-java/tempResources/config.properties
@@ -32,7 +32,7 @@ SWAP_VALUE_SERVER_PORT=6666
 GET_SWAP_VALUE_IP=192.168.10.254
 GET_SWAP_VALUE_PORT=6666
 
-REDIS_HOST=8.138.182.34
+REDIS_HOST=8.138.41.70
 REDIS_PORT=6379
 REDIS_PASSWORD=123456
 
diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
index d19fe8571404b0393f940db24b5a0d9e59908deb..34ea85c903bd693b50653dc702e576d65602d31c 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
@@ -10,15 +10,18 @@
 
       <div class="body">
         <div class="search">
+          
           <el-select v-model="selectedFilter" placeholder="全部" style="width: 120px;margin-right: 8px;">
-            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value" />
+            <el-option v-for="item in options" :key="item.value" :label="item.label" :value="item.value"  />
           </el-select>
-          <el-input v-model="input1" style="width: 30vh;margin-right: 8px;" size="middle" placeholder="请输入搜索内容">
+
+          <el-input v-model="searchInput" style="width: 30vh;margin-right: 8px;" size="middle" placeholder="请输入搜索内容">
             <!-- 未绑定搜索接口 -->
             <template #append>
-              <el-button style="background-color: #409EFF;color: #fff; " :icon="Search" />
+              <el-button @click="FindHomework(searchInput)" style="background-color: #409EFF;color: #fff; " :icon="Search" />
             </template>
           </el-input>
+
           <el-button @click="worng" type="danger">查看错题</el-button>
         </div>
 
@@ -75,10 +78,11 @@ import { ref, computed, onMounted } from 'vue'
 import { Search } from '@element-plus/icons-vue'
 import { useRouter } from 'vue-router';
 import { HttpClient } from '../../network/HttpClient'
+import axios from 'axios';
 
 
-const input1 = ref('')
-const selectedFilter = ref('')
+const searchInput = ref('')  //模糊搜索
+const selectedFilter = ref('')  //标签选择（其实留着也没什么用）
 const router = useRouter()
 const currentPage = ref(1)
 const pageSize = ref(2)
@@ -124,7 +128,7 @@ const worng = () => {
 //   }
 // }
 
-const options = [
+const options = ref([
   {
     value: '课程',
     label: '课程',
@@ -133,26 +137,20 @@ const options = [
     value: '发布教师',
     label: '发布教师',
   },
-  {
-    value: '截止时间',
-    label: '截止时间',
-  },
   {
     value: '作业名称',
     label: '作业名称',
   },
-  {
-    value: '成绩',
-    label: '成绩',
-  },
-  {
-    value: '完成状态',
-    label: '完成状态',
-  },
-]
+])
+
 onMounted(() => {
   getHomeWorkCount()
   getHomeWork()
+
+  //让选项默认为第一项
+  if (options.value.length > 0) {  
+        selectedFilter.value = options.value[0].value;  
+  } 
 })
 
 
@@ -168,6 +166,20 @@ const getHomeWorkCount = async () => {
   })
 }
 
+//模糊搜索作业
+const FindHomework = async (searchInput) => {
+  await HttpClient.get('findHomeWork', {
+    id: 1,
+    input: searchInput
+  }).then(res => {
+    tableData.value = res.data.data
+    console.log("返回的数据:"+res)
+  }).catch(err => {
+    console.log("报错:"+err)
+  })
+}
+
+
 // // 计算属性：根据筛选条件和搜索内容过滤数据
 // const filteredData = computed(() => {
 //   let filtered = tableData.value
@@ -181,6 +193,7 @@ const getHomeWorkCount = async () => {
 //     )
 //   }
 // })
+
 //获取所有作业
 const getHomeWork = async () => {
   await HttpClient.get('getHomeWork', {
diff --git a/HomeWork-vite/src/views/WrongManager/WrongManager.vue b/HomeWork-vite/src/views/WrongManager/WrongManager.vue
index e252c7e882b549564b62e520c7ec101986e2099f..3ae40769ed3f5df2d83d68900926225f667d75e8 100644
--- a/HomeWork-vite/src/views/WrongManager/WrongManager.vue
+++ b/HomeWork-vite/src/views/WrongManager/WrongManager.vue
@@ -11,15 +11,12 @@
             <div class="wrong-questions-manager">
                 <div class="search-filter">
                     <el-select v-model="filterValue" :placeholder="selectPlaceholder" style="width: 150px;">
-                        <el-option label="全部" value=""></el-option>
-                        <el-option label="科目" value="subject"></el-option>
-                        <el-option label="章节" value="chapter"></el-option>
-                        <el-option label="复习状态" value="status"></el-option>
-                        <el-option label="分数" value="score"></el-option>
+                        <el-option v-for="item in WrongOptions" :key="item.value" :label="item.label" :value="item.value" />
                     </el-select>
 
-                    <el-input v-model="searchQuery" placeholder="搜索错题..." style="width: 300px;" :suffix-icon="Search"
-                        @input="handleSearch"></el-input>
+                    <el-input v-model="searchQuery" placeholder="搜索错题..." style="width: 300px;" :suffix-icon="Search" @input="handleSearch">
+
+                    </el-input>
                 </div>
 
                 <el-table :data="filteredWrongQuestions" style="width: 100%" :stripe="true" :header-cell-style="{
@@ -30,18 +27,18 @@
                 }" :cell-style="{
                     textAlign: 'center'
                 }">
-                    <el-table-column prop="course_name" label="课程" width="150" align="center"></el-table-column>
+                    <el-table-column prop="course_name" label="课程" width="200" align="center"></el-table-column>
                     <el-table-column prop="homework_name" label="作业名称" width="200" align="center"></el-table-column>
-                    <el-table-column prop="addTime" label="记录日期" width="150" align="center"></el-table-column>
-                    <el-table-column prop="reviewStatus" label="复习状态" width="120" align="center">
+                    <el-table-column prop="addTime" label="记录日期" width="200" align="center"></el-table-column>
+                    <el-table-column prop="reviewStatus" label="复习状态" width="200" align="center">
                         <template #default="scope">
                             <el-tag :type="scope.row.reviewStatus === '已复习' ? 'success' : 'warning'" effect="light">
                                 {{ scope.row.reviewStatus }}
                             </el-tag>
                         </template>
                     </el-table-column>
-                    <el-table-column prop="score" label="得分" width="100" align="center"></el-table-column>
-                    <el-table-column label="操作" min-width="120" align="center">
+                    <el-table-column prop="score" label="得分" width="200" align="center"></el-table-column>
+                    <el-table-column label="操作" min-width="200" align="center">
                         <template #default="scope">
                             <el-button type="primary" size="small"
                                 @click="viewWrongQuestion(scope.row)">错题重做</el-button>
@@ -83,6 +80,17 @@ const totalItems = ref(100)
 const jumpPage = ref('')
 const router = useRouter();
 
+const WrongOptions = ref([
+  {
+    value: '科目',
+    label: '章节',
+  },
+  {
+    value: '作业名称',
+    label: '作业名称',
+  },
+])
+
 onMounted(() => {
     getWrongHomework()
     getWrongHomeworkCount()
@@ -177,6 +185,7 @@ const getWrongHomeworkCount = async () => {
 
 .box-card {
     width: 100%;
+    height: 80vh;
 }
 
 .card-header {
diff --git a/TeacherHomeWork-vite/package-lock.json b/TeacherHomeWork-vite/package-lock.json
index 48f7493faab6f88b0c6e2bca4e7931e991946aae..7ca28aafd3fbb27732514ea931815c07285258c8 100644
--- a/TeacherHomeWork-vite/package-lock.json
+++ b/TeacherHomeWork-vite/package-lock.json
@@ -16,7 +16,8 @@
         "qs": "^6.11.2",
         "vue": "^3.3.11",
         "vue-echarts": "^7.0.3",
-        "vue-router": "^4.5.0"
+        "vue-router": "^4.5.0",
+        "xlsx": "^0.18.5"
       },
       "devDependencies": {
         "@vitejs/plugin-vue": "^4.5.2",
@@ -880,6 +881,15 @@
         }
       }
     },
+    "node_modules/adler-32": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz",
+      "integrity": "sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/anymatch": {
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz",
@@ -953,6 +963,19 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/cfb": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz",
+      "integrity": "sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "crc-32": "~1.2.0"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/chokidar": {
       "version": "3.5.3",
       "resolved": "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz",
@@ -981,6 +1004,15 @@
         "fsevents": "~2.3.2"
       }
     },
+    "node_modules/codepage": {
+      "version": "1.15.0",
+      "resolved": "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz",
+      "integrity": "sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/combined-stream": {
       "version": "1.0.8",
       "resolved": "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz",
@@ -993,6 +1025,18 @@
         "node": ">= 0.8"
       }
     },
+    "node_modules/crc-32": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz",
+      "integrity": "sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==",
+      "license": "Apache-2.0",
+      "bin": {
+        "crc32": "bin/crc32.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/csstype": {
       "version": "3.1.3",
       "resolved": "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz",
@@ -1158,6 +1202,15 @@
         "node": ">= 6"
       }
     },
+    "node_modules/frac": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz",
+      "integrity": "sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/fsevents": {
       "version": "2.3.3",
       "resolved": "https://registry.npmmirror.com/fsevents/-/fsevents-2.3.3.tgz",
@@ -1590,6 +1643,18 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/ssf": {
+      "version": "0.11.2",
+      "resolved": "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz",
+      "integrity": "sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "frac": "~1.1.2"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/to-regex-range": {
       "version": "5.0.1",
       "resolved": "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz",
@@ -1743,6 +1808,45 @@
         "vue": "^3.2.0"
       }
     },
+    "node_modules/wmf": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz",
+      "integrity": "sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/word": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmmirror.com/word/-/word-0.3.0.tgz",
+      "integrity": "sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==",
+      "license": "Apache-2.0",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/xlsx": {
+      "version": "0.18.5",
+      "resolved": "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz",
+      "integrity": "sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==",
+      "license": "Apache-2.0",
+      "dependencies": {
+        "adler-32": "~1.3.0",
+        "cfb": "~1.2.1",
+        "codepage": "~1.15.0",
+        "crc-32": "~1.2.1",
+        "ssf": "~0.11.2",
+        "wmf": "~1.0.1",
+        "word": "~0.3.0"
+      },
+      "bin": {
+        "xlsx": "bin/xlsx.njs"
+      },
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
     "node_modules/zrender": {
       "version": "5.6.1",
       "resolved": "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz",
diff --git a/TeacherHomeWork-vite/package.json b/TeacherHomeWork-vite/package.json
index c384ba9593491958e191afbdec38b62300772052..552e1d1b10b8cd765881d732a4b24f2a4d59f221 100644
--- a/TeacherHomeWork-vite/package.json
+++ b/TeacherHomeWork-vite/package.json
@@ -17,7 +17,8 @@
     "qs": "^6.11.2",
     "vue": "^3.3.11",
     "vue-echarts": "^7.0.3",
-    "vue-router": "^4.5.0"
+    "vue-router": "^4.5.0",
+    "xlsx": "^0.18.5"
   },
   "devDependencies": {
     "@vitejs/plugin-vue": "^4.5.2",
diff --git a/TeacherHomeWork-vite/src/router/index.js b/TeacherHomeWork-vite/src/router/index.js
index c2363019bf69c827566f8d4563c7e4dc293ff032..ee439ab2e1639cdd52d1b2567d6d08d492492ef0 100644
--- a/TeacherHomeWork-vite/src/router/index.js
+++ b/TeacherHomeWork-vite/src/router/index.js
@@ -4,9 +4,8 @@ import HomeworkManager from '@/views/HomeworkManager/index.vue';
 import GradeManger from '@/views/GradeManager/index.vue';
 import LearningProgress from '@/views/LearningProgress/index.vue';
 import GradeHomework from '@/views/GradeHomework/index.vue';
-import HomeworkQuestion from '@/views/HomeworkQuestion/index.vue';
 import correct from '@/views/GradeHomework/correct.vue';
-import answer from '@/views/HomeworkQuestion/answer.vue';
+
 
 const routes = [
   {
@@ -35,21 +34,11 @@ const routes = [
     component: GradeHomework,
     props: true,
   },
-  {
-    path: '/HomeworkQuestion',
-    name:'HomeworkQusetion',
-    component: HomeworkQuestion,
-  },
   {
     path: '/GradeHomework/correct',
     name: 'correct',
     component: correct,
   },
-  {
-    path: '/GradeHomework/answer',
-    name: 'answer',
-    component: answer,
-  },
   // {
   //   path: '/:pathMatch(.*)*',
   //   name: 'NotFound',
diff --git a/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue b/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue
index 539e4f58a277c0c2dae28e37613edf248cd01465..37fcc0ba759d16291420f312662d3a752c301c79 100644
--- a/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue
+++ b/TeacherHomeWork-vite/src/views/GradeHomework/GradeHomeworkList.vue
@@ -21,6 +21,21 @@
         </el-table-column>
 
       </el-table>
+
+      <div class="final" style="float: right;">
+        <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[2, 5, 10, 20]"
+            :small="true" background layout="total, sizes, prev, pager, next, jumper" :total="totalItems"
+            @size-change="handleSizeChange" @current-change="handleCurrentChange">
+            <template #jumper>
+              <span class="el-pagination__jump">
+                前往
+                <el-input v-model.number="jumpPage" class="jump-input" @keyup.enter="handleJumpTo" />
+                页
+              </span>
+            </template>
+          </el-pagination>
+        </div>
+
     </div>
   
   
@@ -38,30 +53,59 @@
   }
   const radio=ref(2)
   const router=useRoute();
+  const currentPage=ref('1')
+  const pageSize=ref('2')
+  const totalItems = ref('100')
+  const jumpPage = ref('')
   const tableData = ref<Student[]>([]);
 
   
   //获取作业ID
   const homeworkId = router.params.homeworkId;
 
-  // 获取待批作业信息
+  // 获取学生提交状态信息
   const getGradeHomework = async () => {
     await HttpClient.get('getGradeHomeWork', {
     submitStatus:radio.value,  
-    id: homeworkId
+    id:homeworkId,
+    page:currentPage.value,
+    pageSize:pageSize.value,
   }).then(res => {
-    tableData.value = res.data.data;
+    const transformedData = res.data.data.map(item => {
+      return {
+        studentSno:item.studentSno,
+        studentName:item.studentName
+      };
+    });
+    tableData.value = transformedData; 
+    console.log(transformedData);  
+   
   }).catch(err => {
     console.log(err);
   });  
   };
 
+  //获取列表总数
+  const getCount = async () =>{
+    await HttpClient.get('getGradeCount', {
+    submitStatus:radio.value,  
+    id:homeworkId,
+  }).then(res => {
+    totalItems.value = res.data.data;
+    console.log(res);
+  }).catch(err => {
+    console.log(err);
+  });  
+  } 
+
   onMounted(() => {
-  getGradeHomework(); // 页面加载时获取待批作业信息
+    getCount();  
+    getGradeHomework(); // 页面加载时获取待批作业信息
   });
 
   // 监听 radio 的变化，当它变化时重新调用 getGradeHomework 方法
   watch(radio, () => {
+    getCount();
     getGradeHomework();
   });
 
@@ -70,7 +114,17 @@
 
   }
   
-  
+  // 每页条数变化时触发
+  const handleSizeChange = (val: number) => {
+    pageSize.value = val
+    getHomeWork()
+  }
+  // 当前页变化时触发
+  const handleCurrentChange = (val: number) => {
+    currentPage.value = val
+    getHomeWork()
+  }
+
   </script>
   
   <style scoped>
@@ -81,5 +135,9 @@
     .head{
         float: left;
     }
+
+    .final{
+        margin-top: 10px;
+    }
   </style>
   
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
index 5c5a9babfab41d24cb7bcca131e67e76ad02cd45..baa121e34a296ba33d69ce7c89721c1789e4734b 100644
--- a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
+++ b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
@@ -1,56 +1,53 @@
 <template>
   <div class="manage">
+    <el-card class="custom-card">
     <div align="left" style="margin: 10px 0">
       <el-input v-model="search" placeholder="请输入关键字" style="width: 30%"></el-input>
       <el-button style="margin-left: 10px" type="primary" @click="list">查询</el-button>
-      <el-button style="margin-left: 10px" type="primary" @click="filterAll">全部学生</el-button>
-      <el-button style="margin-left: 10px" type="success" @click="filterQualified">合格学生</el-button>
-      <el-button style="margin-left: 10px" type="warning" @click="filterUnqualified">挂科学生</el-button>
+      <el-button style="margin-left: 10px" type="primary">统计</el-button>
+      <el-button style="margin-left: 10px" type="success" @click="exportToExcel">导出成绩表</el-button>
     </div>
 
-    <el-table :data="filteredTableData" style="width: 100%">
-      <el-table-column prop="username" label="学号"></el-table-column>
+    <el-table :data="paginatedTableData" style="width: 100%">
+      <el-table-column prop="sno" label="学号"></el-table-column>
       <el-table-column prop="name" label="姓名"></el-table-column>
-      <el-table-column prop="midscore" label="期中成绩(40%)"></el-table-column>
-      <el-table-column prop="finalscore" label="期末成绩(40%)"></el-table-column>
-      <el-table-column prop="dailyscore" label="平时成绩(20%)"></el-table-column>
-      <el-table-column sortable prop="totalscore" label="最终成绩"></el-table-column>
-      <el-table-column label="成绩等级">
-        <template #default="scope">
-          <span :class="getTagClass(scope.row.totalscore)">
-            {{ getTagText(scope.row.totalscore) }}
-          </span>
-        </template>
-      </el-table-column>
+      <el-table-column prop="homeworkName" label="作业名称"></el-table-column>
+      <el-table-column prop="submitStatus" label="是否已提交"></el-table-column>
+      <el-table-column prop="submitTime" label="提交时间"></el-table-column>
+      <el-table-column prop="correct" label="是否已批改"></el-table-column>
+
+      <el-table-column prop="score" label="成绩"></el-table-column>
+      
       <el-table-column label="操作">
         <template #default="scope">
           <el-button class="small-button" @click="handleEdit(scope.row)" type="info">编辑</el-button>
-          <el-popconfirm title="确认删除吗?" @confirm="handleDelete(scope.row.username)">
-            <template #reference>
-              <el-button type="danger" class="delete-button">删除</el-button>
-            </template>
-          </el-popconfirm>
         </template>
       </el-table-column>
     </el-table>
+    <div class="final" style="float: right;">
+      <el-pagination
+        style="margin-top: 20px; text-align: right;"
+        background
+        layout="prev, pager, next"
+        :total="filteredTableData.length"
+        :page-size="pageSize"
+        :current-page="currentPage"
+        @current-change="handlePageChange"
+      />
+    </div>
+    </el-card>
   </div>
 
   <el-dialog title="编辑学生成绩" v-model="dialogVisible" width="30%">
     <el-form :model="form" label-width="120px">
       <el-form-item label="学号">
-        <el-input v-model="form.username" disabled></el-input>
+        <el-input v-model="form.sno" disabled></el-input>
       </el-form-item>
       <el-form-item label="姓名">
-        <el-input v-model="form.name"></el-input>
+        <el-input v-model="form.name" disabled></el-input>
       </el-form-item>
-      <el-form-item label="期中成绩(40%)">
-        <el-input v-model="form.midscore"></el-input>
-      </el-form-item>
-      <el-form-item label="期末成绩(40%)">
-        <el-input v-model="form.finalscore"></el-input>
-      </el-form-item>
-      <el-form-item label="平时成绩(20%)">
-        <el-input v-model="form.dailyscore"></el-input>
+      <el-form-item label="分数">
+        <el-input v-model="form.score"></el-input>
       </el-form-item>
     </el-form>
     <template #footer>
@@ -61,40 +58,66 @@
 </template>
 
 <script setup>
-import { ref, computed } from 'vue';
+import { ref, computed,onMounted} from 'vue';
+import { useRouter } from 'vue-router';
+import { HttpClient } from '../../network/HttpClient';  
+import * as XLSX from 'xlsx';
 
 const dialogVisible = ref(false);
 const form = ref({
   username: '',
   name: '',
-  midscore: '',
-  finalscore: '',
-  dailyscore: ''
+  homeworkName: '',
+  submitTime: '',
+  score: ''
 });
 
 const search = ref('');
 const filterTag = ref('');
+const currentPage = ref(1);
+const pageSize = ref(12);
+
+const tableData = ref([]);
+
+/*const tableData = ref([
+  { sno: '202301', name: '张三', homeworkName: 35, submitTime: 38, score: 18 },
+  { sno: '202302', name: '李四', homeworkName: 28, submitTime: 30, score: 15 },
+  { sno: '202303', name: '王五', homeworkName: 90, submitTime: 88, score: 85 },
+  { sno: '202304', name: '赵六', homeworkName: 75, submitTime: 78, score: 70 },
+  { sno: '202305', name: '孙七', homeworkName: 60, submitTime: 65, score: 58 },
+  { sno: '202306', name: '周八', homeworkName: 50, submitTime: 55, score: 40 },
+  { sno: '202307', name: '吴九', homeworkName: 100, submitTime: 90, score: 30 },
+  { sno: '202308', name: '吴九', homeworkName: 100, submitTime: 90, score: 80 },
+  { sno: '202309', name: '吴九', homeworkName: 100, submitTime: 90, score: 70 },
+  { sno: '202310', name: '吴九', homeworkName: 100, submitTime: 90, score: 60 },
+  { sno: '202311', name: '吴九', homeworkName: 100, submitTime: 90, score: 50 },
+  { sno: '202312', name: '吴九', homeworkName: 100, submitTime: 90, score: 50 },
+  { sno: '202313', name: '吴九', homeworkName: 100, submitTime: 90, score: 40 },
+  { sno: '202314', name: '吴九', homeworkName: 100, submitTime: 90, score: 20 },
+  { sno: '202314', name: '吴九', homeworkName: 100, submitTime: 90, score: 20 },
+  { sno: '202314', name: '吴九', homeworkName: 100, submitTime: 90, score: 20 },
+  { sno: '202314', name: '吴九', homeworkName: 100, submitTime: 90, score: 20 },
+  { sno: '202314', name: '吴九', homeworkName: 100, submitTime: 90, score: 20 },
+]);*/
+
+//获取所有学生成绩
+//获取所有作业
+const getScore = async () => {
+  await HttpClient.get('getScore', {
+    id: 1,
+  }).then(res => {
+    tableData.value = res.data.data
+    console.log(res)
+  }).catch(err => {
+    console.log(err)
+  })
+}
+
+onMounted(() => {
+  getScore()
+})
+
 
-const tableData = ref([
-  { username: '202301', name: '张三', midscore: 35, finalscore: 38, dailyscore: 18 },
-  { username: '202302', name: '李四', midscore: 28, finalscore: 30, dailyscore: 15 },
-  { username: '202303', name: '王五', midscore: 90, finalscore: 88, dailyscore: 85 },
-  { username: '202304', name: '赵六', midscore: 75, finalscore: 78, dailyscore: 70 },
-  { username: '202305', name: '孙七', midscore: 60, finalscore: 65, dailyscore: 58 },
-  { username: '202306', name: '周八', midscore: 50, finalscore: 55, dailyscore: 40 },
-  { username: '202307', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 30 },
-  { username: '202308', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 80 },
-  { username: '202309', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 70 },
-  { username: '202310', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 60 },
-  { username: '202311', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 50 },
-  { username: '202312', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 50 },
-  { username: '202313', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 40 },
-  { username: '202314', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 20 },
-  { username: '202314', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 20 },
-  { username: '202314', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 20 },
-  { username: '202314', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 20 },
-  { username: '202314', name: '吴九', midscore: 100, finalscore: 90, dailyscore: 20 },
-]);
 
 const computedTableData = computed(() =>
   tableData.value.map(row => ({
@@ -107,58 +130,29 @@ const computedTableData = computed(() =>
 const filteredTableData = computed(() => {
   let data = computedTableData.value;
   if (search.value) {
+   const searchValueLowerCase = search.value.toLowerCase();
     data = data.filter(row => 
-      Object.values(row).some(val => 
-        String(val).toLowerCase().includes(search.value.toLowerCase())
-      )
+      row.name.toLowerCase().includes(searchValueLowerCase) ||
+      String(row.homeworkName).toLowerCase().includes(searchValueLowerCase)
     );
   }
-  if (filterTag.value) {
-    data = data.filter(row => {
-      switch (filterTag.value) {
-        case 'all':
-          return true;
-        case 'qualified':
-          return row.totalscore >= 60;
-        case 'unqualified':
-          return row.totalscore < 60;
-        default:
-          return true;
-      }
-    });
-  }
   return data;
 });
 
+const paginatedTableData = computed(() => {
+  const start = (currentPage.value - 1) * pageSize.value;
+  const end = start + pageSize.value;
+  return filteredTableData.value.slice(start, end);
+});
+
 const handleEdit = (student) => {
   dialogVisible.value = true;
   Object.assign(form.value, student); // 将选中学生的数据复制到表单中
   //console.log('编辑学生：', student.username);
 };
 
-const handleDelete = (username) => {
-  tableData.value = tableData.value.filter(student => student.username !== username);
-  console.log('删除学生：', username);
-};
 
 const list = () => console.log('进行搜索查询');
-const filterAll = () => filterTag.value = 'all';
-const filterQualified = () => filterTag.value = 'qualified';
-const filterUnqualified = () => filterTag.value = 'unqualified';
-
-const getTagClass = (totalScore) => {
-  if (totalScore >= 85) return 'excellent-tag';
-  if (totalScore >= 75) return 'good-tag';
-  if (totalScore >= 60) return 'pass-tag';
-  return 'fail-tag';
-};
-
-const getTagText = (totalScore) => {
-  if (totalScore >= 85) return '优秀';
-  if (totalScore >= 75) return '良好';
-  if (totalScore >= 60) return '及格';
-  return '不及格';
-};
 
 const save = () => {
   const index = tableData.value.findIndex(student => student.username === form.value.username);
@@ -167,64 +161,38 @@ const save = () => {
   }
   dialogVisible.value = false; // 关闭弹窗
 };
+
+const handlePageChange = page => {
+  currentPage.value = page;
+};
+
+// 导出 Excel 功能
+const exportToExcel = () => {
+  // 准备导出数据
+  const exportData = filteredTableData.value.map(item => ({
+    学号: item.username,
+    姓名: item.name,
+    作业名称: item.homeworkName,
+    提交日期: item.submitTime,
+    分数: item.score
+  }));
+ 
+  // 创建工作簿和工作表
+  const worksheet = XLSX.utils.json_to_sheet(exportData);
+  const workbook = XLSX.utils.book_new();
+  XLSX.utils.book_append_sheet(workbook, worksheet, '成绩表');
+ 
+  // 导出为 Excel 文件
+  XLSX.writeFile(workbook, '成绩表.xlsx');
+};
 </script>
 
 <style scoped>
 /* 自定义样式 */
-.excellent-tag {
-  background-color: #85ce61;
-  color: white;
-  padding: 4px 9px;
-  border-radius: 4px;
-  font-size: 14px; 
+.custom-card {
+  padding: 20px;
 }
-
-.good-tag {
-  background-color: #409eff;
-  color: white;
-  padding: 4px 9px;
-  border-radius: 4px;
-  font-size: 14px; 
-}
-
-.pass-tag {
-  background-color: #eba465;
-  color: white;
-  padding: 4px 9px;
-  border-radius: 4px;
-  font-size: 14px; 
-}
-
-.fail-tag {
-  background-color: #f56c6c;
-  color: white;
-  padding: 4px 9px;
-  border-radius: 4px;
-  font-size: 14px; 
-}
-
-.small-button {
-    padding: 2px 6px; 
-    font-size: 13px; 
-  }
-
-.delete-button {
-  background-color: #f44336;
-  border-color: #d32f2f;
-  color: white;
-  /*font-weight: bold;*/
-  text-transform: uppercase;
-  padding: 2px 6px; 
-  font-size: 13px;
-}
-
-.delete-button:hover {
-  background-color: #d32f2f; /* hover 状态下颜色变暗 */
-  border-color: #c2185b; /* 较暗的红色边框 */
-}
-
-.delete-button:active {
-  background-color: #c2185b;/* active 状态颜色 */
-  border-color: #c2185b;
+.manage{
+   padding: 20px;
 }
 </style>
diff --git a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
index 0fcd670c09e46b9e1884735d5cf69d251b117298..2b0ae58e24ed140578e07b8d309eaaf3c4db3521 100644
--- a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
+++ b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
@@ -23,9 +23,22 @@
         </el-table-column>
 
       </el-table>
+
+      <div class="final" style="float: right;">
+          <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize" :page-sizes="[2, 5, 10, 20]"
+            :small="true" background layout="total, sizes, prev, pager, next, jumper" :total="totalItems"
+            @size-change="handleSizeChange" @current-change="handleCurrentChange">
+            <template #jumper>
+              <span class="el-pagination__jump">
+                前往
+                <el-input v-model.number="jumpPage" class="jump-input" @keyup.enter="handleJumpTo" />
+                页
+              </span>
+            </template>
+          </el-pagination>
+        </div>
     </div>
   
-  
   </template>
   
   <script lang="ts" setup>
@@ -34,9 +47,6 @@
   import { useRouter } from 'vue-router';
   import { HttpClient } from '../../network/HttpClient';  
 
-  const router=useRouter();
-  const search = ref('');
-
   interface Homework {
     homework_id: number;
     homework_name: string;
@@ -46,17 +56,39 @@
     submit: number;
     unsubmitted: number;
   }
-  
+
+  const router=useRouter();
+  const search = ref('');
+  const currentPage = ref('1')
+  const pageSize = ref('2')
+  const totalItems = ref('100')
+  const jumpPage = ref('')
   const tableData = ref<Homework[]>([]);
 
   onMounted(() => {
+    getCount()
     getHomeWork()
   })
 
+//获取作业总数
+  const getCount = async() => {
+    await HttpClient.get('getTHomeWorkCount', {
+    id: 1
+  }).then(res => {
+    
+    totalItems.value = res.data.data
+    console.log(res);  
+  }).catch(err => {
+    console.log(err);
+  });
+  };  
+
 //获取所有作业
  const getHomeWork = async () => {
   await HttpClient.get('getTHomeWork', {
-    id: 1
+    id: 1,
+    page:currentPage.value,
+    pageSize:pageSize.value
   }).then(res => {
     
     const transformedData = res.data.data.map(item => {
@@ -158,11 +190,26 @@ const handleEdit = (homeworkId: number) => {
     console.log(err);
   });
   }
-  
+
+
+  // 每页条数变化时触发
+  const handleSizeChange = (val: number) => {
+    pageSize.value = val
+    getHomeWork()
+  }
+  // 当前页变化时触发
+  const handleCurrentChange = (val: number) => {
+    currentPage.value = val
+    getHomeWork()
+  }
+
+
   </script>
   
   <style scoped>
-
+   .final{
+    margin-top: 10px;
+   }
 
   </style>
   
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/src/views/HomeworkQuestion/HomeworkQuestionList.vue b/TeacherHomeWork-vite/src/views/HomeworkQuestion/HomeworkQuestionList.vue
deleted file mode 100644
index 8a71771a2de644c147ee0f85fa7e41100a27684e..0000000000000000000000000000000000000000
--- a/TeacherHomeWork-vite/src/views/HomeworkQuestion/HomeworkQuestionList.vue
+++ /dev/null
@@ -1,50 +0,0 @@
-<template>
-    <div class="manage">
-
-  
-      <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="student" label="姓名"></el-table-column>
-        <el-table-column prop="class" label="班级"></el-table-column>
-
-        <el-table-column>
-          <template #default="scope">
-            <el-button @click="answer(scope.row)" type="info">解答</el-button>
-          </template>
-        </el-table-column>
-
-      </el-table>
-    </div>
-  
-  
-  </template>
-  
-  <script setup>
-  import { ref } from 'vue';
-  import { useRouter } from 'vue-router';
-
-  const router=useRouter();
-  
-  const tableData = ref([
-   {student:'张麻子',class:'软件工程1班'},
-   {student:'李四郎',class:'软件工程1班'},
-   {student:'李四郎',class:'软件工程1班'},
-   {student:'李四郎',class:'软件工程1班'},
-   {student:'李四郎',class:'软件工程1班'},
-   {student:'李四郎',class:'软件工程2班'}
-  ]);
-
-  const answer = () =>{
-    router.push('HomeworkQuestion/answer')
-
-  }
-  
-  
-  </script>
-  
-  <style scoped>
-  .manage{
-      height: 100%;
-  }
-
-  </style>
-  
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/src/views/HomeworkQuestion/answer.vue b/TeacherHomeWork-vite/src/views/HomeworkQuestion/answer.vue
deleted file mode 100644
index 31895e2fc6622313750317f5e4f127855a661eb1..0000000000000000000000000000000000000000
--- a/TeacherHomeWork-vite/src/views/HomeworkQuestion/answer.vue
+++ /dev/null
@@ -1,11 +0,0 @@
-<template>
-111
-</template>
-
-<script setup>
-
-</script>
-
-<style scoped>
- 
-</style>
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/src/views/HomeworkQuestion/index.vue b/TeacherHomeWork-vite/src/views/HomeworkQuestion/index.vue
deleted file mode 100644
index 4bf76756d2bf3b460a1d6f8a4e9a081691254f83..0000000000000000000000000000000000000000
--- a/TeacherHomeWork-vite/src/views/HomeworkQuestion/index.vue
+++ /dev/null
@@ -1,17 +0,0 @@
-<template>
-    <el-container>
-        <el-main>
-            <HomeworkQuestionList/>
-        </el-main>
-    </el-container>    
-    </template>
-    
-    <script setup>
-    import HomeworkQuestionList from './HomeworkQuestionList.vue';
-    </script>
-    
-    <style scoped>
-    .el-container{
-        height: 100vh;
-    }
-    </style>
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/yarn.lock b/TeacherHomeWork-vite/yarn.lock
index a605530752ab9bcf540ec6b00db6c4c24a952782..ecdaee4c17035975ebf383ef1271296b2d01498f 100644
--- a/TeacherHomeWork-vite/yarn.lock
+++ b/TeacherHomeWork-vite/yarn.lock
@@ -196,6 +196,11 @@
   dependencies:
     vue-demi "*"
 
+adler-32@~1.3.0:
+  version "1.3.1"
+  resolved "https://registry.npmmirror.com/adler-32/-/adler-32-1.3.1.tgz"
+  integrity sha512-ynZ4w/nUUv5rrsR8UUGoe1VC9hZj6V5hU9Qw1HlMDJGEJw5S7TfTErWTjMys6M7vr0YWcPqs3qAr4ss0nDfP+A==
+
 anymatch@~3.1.2:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/anymatch/-/anymatch-3.1.3.tgz"
@@ -244,6 +249,14 @@ call-bind@^1.0.0:
     get-intrinsic "^1.2.1"
     set-function-length "^1.1.1"
 
+cfb@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/cfb/-/cfb-1.2.2.tgz"
+  integrity sha512-KfdUZsSOw19/ObEWasvBP/Ac4reZvAGauZhs6S/gqNhXhI7cKwvlH7ulj+dOEYnca4bm4SGo8C1bTAQvnTjgQA==
+  dependencies:
+    adler-32 "~1.3.0"
+    crc-32 "~1.2.0"
+
 "chokidar@>=3.0.0 <4.0.0":
   version "3.5.3"
   resolved "https://registry.npmmirror.com/chokidar/-/chokidar-3.5.3.tgz"
@@ -259,6 +272,11 @@ call-bind@^1.0.0:
   optionalDependencies:
     fsevents "~2.3.2"
 
+codepage@~1.15.0:
+  version "1.15.0"
+  resolved "https://registry.npmmirror.com/codepage/-/codepage-1.15.0.tgz"
+  integrity sha512-3g6NUTPd/YtuuGrhMnOMRjFc+LJw/bnMp3+0r/Wcz3IXUuCosKRJvMphm5+Q+bvTVGcJJuRvVLuYba+WojaFaA==
+
 combined-stream@^1.0.8:
   version "1.0.8"
   resolved "https://registry.npmmirror.com/combined-stream/-/combined-stream-1.0.8.tgz"
@@ -266,6 +284,11 @@ combined-stream@^1.0.8:
   dependencies:
     delayed-stream "~1.0.0"
 
+crc-32@~1.2.0, crc-32@~1.2.1:
+  version "1.2.2"
+  resolved "https://registry.npmmirror.com/crc-32/-/crc-32-1.2.2.tgz"
+  integrity sha512-ROmzCKrTnOwybPcJApAA6WBWij23HVfGVNKqqrZpuyZOHqK2CwHSvpGuyt/UNNvaIjEd8X5IFGp4Mh+Ie1IHJQ==
+
 csstype@^3.1.2:
   version "3.1.3"
   resolved "https://registry.npmmirror.com/csstype/-/csstype-3.1.3.tgz"
@@ -378,6 +401,11 @@ form-data@^4.0.0:
     combined-stream "^1.0.8"
     mime-types "^2.1.12"
 
+frac@~1.1.2:
+  version "1.1.2"
+  resolved "https://registry.npmmirror.com/frac/-/frac-1.1.2.tgz"
+  integrity sha512-w/XBfkibaTl3YDqASwfDUqkna4Z2p9cFSr1aHDt0WoMTECnRfBOv2WArlZILlqgWlmdIlALXGpM2AOhEk5W3IA==
+
 function-bind@^1.1.2:
   version "1.1.2"
   resolved "https://registry.npmmirror.com/function-bind/-/function-bind-1.1.2.tgz"
@@ -610,6 +638,13 @@ source-map-js@^1.0.2, "source-map-js@>=0.6.2 <2.0.0":
   resolved "https://registry.npmmirror.com/source-map-js/-/source-map-js-1.0.2.tgz"
   integrity sha512-R0XvVJ9WusLiqTCEiGCmICCMplcCkIwwR11mOSD9CR5u+IXYdiseeEuXCVAjS54zqwkLcPNnmU4OeJ6tUrWhDw==
 
+ssf@~0.11.2:
+  version "0.11.2"
+  resolved "https://registry.npmmirror.com/ssf/-/ssf-0.11.2.tgz"
+  integrity sha512-+idbmIXoYET47hH+d7dfm2epdOMUDjqcB4648sTZ+t2JwoyBFL/insLfB/racrDmsKB3diwsDA696pZMieAC5g==
+  dependencies:
+    frac "~1.1.2"
+
 to-regex-range@^5.0.1:
   version "5.0.1"
   resolved "https://registry.npmmirror.com/to-regex-range/-/to-regex-range-5.0.1.tgz"
@@ -668,6 +703,29 @@ vue-router@^4.5.0:
     "@vue/server-renderer" "3.3.11"
     "@vue/shared" "3.3.11"
 
+wmf@~1.0.1:
+  version "1.0.2"
+  resolved "https://registry.npmmirror.com/wmf/-/wmf-1.0.2.tgz"
+  integrity sha512-/p9K7bEh0Dj6WbXg4JG0xvLQmIadrner1bi45VMJTfnbVHsc7yIajZyoSoK60/dtVBs12Fm6WkUI5/3WAVsNMw==
+
+word@~0.3.0:
+  version "0.3.0"
+  resolved "https://registry.npmmirror.com/word/-/word-0.3.0.tgz"
+  integrity sha512-OELeY0Q61OXpdUfTp+oweA/vtLVg5VDOXh+3he3PNzLGG/y0oylSOC1xRVj0+l4vQ3tj/bB1HVHv1ocXkQceFA==
+
+xlsx@^0.18.5:
+  version "0.18.5"
+  resolved "https://registry.npmmirror.com/xlsx/-/xlsx-0.18.5.tgz"
+  integrity sha512-dmg3LCjBPHZnQp5/F/+nnTa+miPJxUXB6vtk42YjBBKayDNagxGEeIdWApkYPOf3Z3pm3k62Knjzp7lMeTEtFQ==
+  dependencies:
+    adler-32 "~1.3.0"
+    cfb "~1.2.1"
+    codepage "~1.15.0"
+    crc-32 "~1.2.1"
+    ssf "~0.11.2"
+    wmf "~1.0.1"
+    word "~0.3.0"
+
 zrender@5.6.1:
   version "5.6.1"
   resolved "https://registry.npmjs.org/zrender/-/zrender-5.6.1.tgz"