diff --git a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
index f493e934ad4854fe299d7bedc5b5b281914d8a6b..469d47a8cdab59a33eff6dc1f6ec5094b360912d 100644
--- a/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
+++ b/HomeWork-java/src/com/wetoband/template/action/ToolTemplateAction.java
@@ -26,6 +26,8 @@ import java.util.*;
     TroubleshootingService troubleshootingService=IOC.getBean(TroubleshootingServiceImpl.class);
     QuestionService questionService=IOC.getBean(QuestionServiceImpl.class);
     NoticeService noticeService=IOC.getBean(NoticeServiceImpl.class);
+    SubmitService submitService=IOC.getBean(SubmitServiceImpl.class);
+
     WordService wordService = IOC.getBean(WordServiceImpl.class);
 
     @Action
@@ -199,4 +201,26 @@ import java.util.*;
 //        }
         return userAnswersMap;
     }
+
+
+    //教师端获取作业
+    @Action
+    public R getTHomeWork(HttpServletRequest request) throws Exception {
+        Integer id =Integer.parseInt(request.getParameter("id"));
+        List<HomeWork> homeWork = homeWorkService.getTHomeWork(id);
+        return R.ok().put("data",homeWork);
+    }
+    //教师端根据作业id查找作业
+    @Action
+    public R getSubmitHomeWorkByid(HttpServletRequest request) throws Exception {
+        Integer id =Integer.parseInt(request.getParameter("id"));
+        List<Submit> submitHomeWork = submitService.getSubmitHomeWorkByid(id);
+        return R.ok().put("data",submitHomeWork);
+    }
+    //教师端查找所有提交的作业
+    public R getSubmitHomeWork(HttpServletRequest request) throws Exception {
+        Integer id=Integer.parseInt(request.getParameter("id"));
+        List<Submit> submitHomeWork = homeWorkService.getSubmitHomeWork(id);
+        return  R.ok().put("data",submitHomeWork);
+    }
 }
diff --git a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
index bbd4e8b53461bc8745ce3b5d115f338ab389c6bc..d8202c3650fe153485bf1d42b1322cc0b0a4b77e 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/HomeWorkDao.java
@@ -15,6 +15,10 @@ public interface HomeWorkDao extends IBaseDao<HomeWork> {
     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> getTHomeWork(Connection connection, int id);
+    List<Submit> getSubmitHomeWork(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
new file mode 100644
index 0000000000000000000000000000000000000000..6d0692df458ebf7679fcfa0a7125d638ac1daa4c
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/dao/SubmitDao.java
@@ -0,0 +1,10 @@
+package com.wetoband.template.dao;
+
+import java.sql.Connection;
+
+public interface SubmitDao {
+    public void getSubmitHomeWork(Connection connection, int id);
+
+    public void getSubmitHomeWorkByid(Connection connection, int id);
+
+}
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 3de27eae22a18d9579d62d56c0f5485e5c5e35dc..c674d8693fa88f187870277a12cf111370f19e18 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
@@ -39,7 +39,6 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
     @Override
     public List<HomeWork> getHomeWork(Connection connection, int id,int offset, int pageSize) throws SQLException {
 
-
         // SQL语句
         String sql ="SELECT homework.*,teacher.name,submit.submitStatus,submit.score FROM homework " +
                 "JOIN teacher ON homework.teacher_id = teacher.id " +
@@ -170,6 +169,49 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
         return homeworkList;
     }
 
+    @Override
+    public List<HomeWork> getTHomeWork(Connection connection, int id) {
+        String sql = "SELECT homework.homework_name, homework.startTime, homework.finishTime, " +
+                "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, " +
+                "SUM(CASE WHEN submit.submitStatus = 2 THEN 1 ELSE 0 END) AS graded_count, " +
+                "SUM(CASE WHEN submit.submitStatus = 1 THEN 1 ELSE 0 END) AS ungraded_count " +
+                "FROM homework " +
+                "RIGHT JOIN submit ON homework.homework_id = submit.homework_id " +
+                "WHERE submit.teacher_id = ? " +
+                "GROUP BY homework.homework_id";
+        List<HomeWork> homeworkList = new ArrayList<>();
+        try (PreparedStatement pstm = connection.prepareStatement(sql)) {
+            pstm.setInt(1,id);
+            try (ResultSet rs = pstm.executeQuery()) {
+                while (rs.next()) {
+                    HomeWork homework = new HomeWork();
+                    homework.setHomework_name(rs.getString("homework_name"));
+                    homework.setStart_time(rs.getString("startTime"));
+                    homework.setFinish_time(rs.getString("finishTime"));
+                    homework.setGraded(rs.getInt("graded_count"));
+                    homework.setUngraded(rs.getInt("ungraded_count"));
+                    homework.setSubmit(rs.getInt("submitted_count"));
+                    homework.setUnsubmitted(rs.getInt("unsubmitted_count"));
+                    homeworkList.add(homework);
+                }
+            }
+        } catch (SQLException e) {
+            throw new RuntimeException(e);
+        }
+        return homeworkList;
+    }
+
+
+    @Override
+    public List<Submit> getSubmitHomeWork(Connection connection, int id) {
+        String sql = "SELECT submit.* FROM submit " +
+                "JOIN teacher ON submit.teacher_id = teacher.id " +
+                "WHERE teacher.id = ? ";
+
+        List<Submit> submitList = new ArrayList<>();
+return null;
+    }
     @Override
     public void submitHomework(Connection connection, Submit submitHomework) {
         int submitId = submitHomework.getSubmitId();
diff --git a/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..9c69c1cceb296601f568846fd2c5d5b67ada6637
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/SubmitDaoImpl.java
@@ -0,0 +1,18 @@
+package com.wetoband.template.dao.impl;
+
+import com.wetoband.template.dao.SubmitDao;
+
+import java.sql.Connection;
+
+public class SubmitDaoImpl implements SubmitDao {
+
+    @Override
+    public void getSubmitHomeWork(Connection connection, int id) {
+
+    }
+
+    @Override
+    public void getSubmitHomeWorkByid(Connection connection, int id) {
+
+    }
+}
diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
index b53225f114fe6180cf8ec4995824beb0c6bf067e..62ba792b2f8dd382326d44db29684dbc787fba0c 100644
--- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
+++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
@@ -26,6 +26,14 @@ public class HomeWork {
     private String course_name;
     @Column(name = "teacher_id")
     private Integer teacher_id;
+    @Column(name ="answer")
+    private String answer;
+
+
+    private Integer graded;
+    private Integer ungraded;
+    private Integer unsubmitted;
+    private Integer submit;
 
 
     private Double score;
diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
index 2e9cf967c5ed360eeee42a9e2d871dd5864fb77b..7942dd95d2345e109779d1931c8c3add105c0294 100644
--- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
+++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
@@ -1,13 +1,11 @@
 package com.wetoband.template.service;
 
 import com.wetoband.template.entity.HomeWork;
+import com.wetoband.template.entity.Submit;
 
 
-import java.sql.Connection;
-import java.sql.SQLException;
 import java.util.Date;
 import java.util.List;
-import java.util.Map;
 
 
 public interface HomeWorkService {
@@ -16,6 +14,8 @@ public interface HomeWorkService {
     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<Submit> getSubmitHomeWork(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
new file mode 100644
index 0000000000000000000000000000000000000000..2b72a2bd2bd7bbf9556e91dd2e560bc5e176f0c9
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/service/SubmitService.java
@@ -0,0 +1,12 @@
+package com.wetoband.template.service;
+
+import com.wetoband.template.entity.Submit;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+
+
+public interface SubmitService {
+    public List<Submit> getSubmitHomeWork(int id) throws Exception;
+    public List<Submit> getSubmitHomeWorkByid(int id) throws Exception;
+}
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 0849f5ad295611f9cb1d0d4cc45760f8f8c15922..022b56725247b01fa0b0205a292da13a2edc43f2 100644
--- a/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/HomeWorkServiceImpl.java
@@ -48,6 +48,18 @@ public class HomeWorkServiceImpl implements HomeWorkService {
         return  homeWorkDao.getHomeWorkByHomeworkName(connection,homework_name,id);
     }
 
+    public List<HomeWork> getTHomeWork(int id) throws Exception {
+        final Connection connection = ActionToolBase.getDBConnection();
+        return  homeWorkDao.getTHomeWork(connection,id);
+    }
+
+    @Override
+    public List<Submit> getSubmitHomeWork(int id) throws Exception {
+        final Connection conntion =ActionToolBase.getDBConnection();
+        return homeWorkDao.getSubmitHomeWork(conntion,id);
+    }
+
+    //    @Transactional()
     @Override
     public void submitHomework(Integer studentId, Integer homeworkId, Date submitTimeDate, String userAnswersJson ) throws Exception {
         final Connection connection = ActionToolBase.getDBConnection();
diff --git a/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java
new file mode 100644
index 0000000000000000000000000000000000000000..dc39554c205988767c4cf6484599ab2e0be0ead0
--- /dev/null
+++ b/HomeWork-java/src/com/wetoband/template/service/impl/SubmitServiceImpl.java
@@ -0,0 +1,19 @@
+package com.wetoband.template.service.impl;
+
+import com.wetoband.template.entity.Submit;
+import com.wetoband.template.service.SubmitService;
+import org.springframework.stereotype.Service;
+
+import java.util.List;
+@Service
+public class SubmitServiceImpl implements SubmitService {
+
+    @Override
+    public List<Submit> getSubmitHomeWork(int id) throws Exception {
+        return null;
+    }
+    @Override
+    public List<Submit> getSubmitHomeWorkByid(int id) throws Exception {
+        return null;
+    }
+}
diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties
index 49cc81a4ae0e5f90dbcc2869ba3283037f11966f..b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf 100644
--- a/HomeWork-java/target/classes/config.properties
+++ b/HomeWork-java/target/classes/config.properties
@@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6
 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60
 
 JDBC_DRIVER=com.mysql.jdbc.Driver
-JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8
+JDBC_URL=jdbc:mysql://8.138.41.70:3306/homework?useUnicode=true&characterEncoding=utf8
 
 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8
 JDBC_USERNAME=root
diff --git a/HomeWork-java/tempResources/config.properties b/HomeWork-java/tempResources/config.properties
index 49cc81a4ae0e5f90dbcc2869ba3283037f11966f..b061f9ab32bc6291cc9d2aed8fdf96eb49a90dbf 100644
--- a/HomeWork-java/tempResources/config.properties
+++ b/HomeWork-java/tempResources/config.properties
@@ -17,7 +17,7 @@ HTTP_SOCKET_TIMEOUT_SECOND=6
 HTTP_LONG_CONNECTION_TIMEOUT_SECOND=60
 
 JDBC_DRIVER=com.mysql.jdbc.Driver
-JDBC_URL=jdbc:mysql://8.138.182.34:3306/homework?useUnicode=true&characterEncoding=utf8
+JDBC_URL=jdbc:mysql://8.138.41.70:3306/homework?useUnicode=true&characterEncoding=utf8
 
 #JDBC_URL=jdbc:mysql://192.168.88.47:3306/blp?useUnicode=true&characterEncoding=utf8
 JDBC_USERNAME=root
diff --git a/HomeWork-vite/src/App.vue b/HomeWork-vite/src/App.vue
index 80a01cecbbc16d25ef605721607f17402671b930..55a037f0a0563d7f0af9778ac65c7323556c7d6d 100644
--- a/HomeWork-vite/src/App.vue
+++ b/HomeWork-vite/src/App.vue
@@ -27,7 +27,6 @@
 </template>
 
 <script setup>
-import Sidebar from './components/Sidebar.vue';
 import Header from './components/Header.vue';
 import { onBeforeMount, provide, ref } from 'vue';
 import { getRtParam } from './base/constant';
diff --git a/TeacherHomeWork-vite/src/App.vue b/TeacherHomeWork-vite/src/App.vue
index 69b7aa8abd90cbfba3519dc8892b104b7234c49c..6903b4e5d0cff474b3be1f7eb3b81c2cd46ea1dc 100644
--- a/TeacherHomeWork-vite/src/App.vue
+++ b/TeacherHomeWork-vite/src/App.vue
@@ -1,27 +1,44 @@
 <template>
   <div class="container">
-    <el-container class="layout">
-      <!-- 头部 -->
-      <el-header class="header">
-        <h1>教师作业系统</h1>
+    <el-container>
+
+      <el-header class="custom-header">
+        <Header/>
       </el-header>
+      <!-- 头部 -->
+      <!-- <el-header class="header">
+        <div class="header-title">
+          <h1 style=" flex-grow: 1;text-align: center; ">作业系统</h1>
+          <sapn @click="toHome" style="text-align: right;cursor: pointer;">返回</sapn>
+        </div>
+
+      </el-header> -->
       <el-container>
-        <el-aside width="200px" height="100%">
+        <!-- <el-aside width="200px" height="100%">
           <Sidebar />
-        </el-aside>
-        <el-main height="100%">
+        </el-aside> -->
+
+        <el-main class="content">
           <RouterView />
         </el-main>
       </el-container>
     </el-container>
   </div>
 </template>
+
 <script setup>
-import Sidebar from './components/Sidebar.vue';
+import Header from './components/Header.vue';
 import { onBeforeMount, provide, ref } from 'vue';
 import { getRtParam } from './base/constant';
 import { RouterView } from 'vue-router';
+import { useRouter } from 'vue-router';
 const runToolParam = ref('');
+const router = useRouter();
+const toHome = () => {
+  console.log(123);
+
+  router.push('/');
+};
 onBeforeMount(() => {
   runToolParam.value = getRtParam() || '';
   if (/^\{.*\}$/.test(runToolParam.value)) {
@@ -32,6 +49,7 @@ onBeforeMount(() => {
   }
 });
 </script>
+
 <style lang="scss">
 #app {
   font-family: Avenir, Helvetica, Arial, sans-serif;
@@ -39,6 +57,14 @@ onBeforeMount(() => {
   -moz-osx-font-smoothing: grayscale;
   text-align: center;
   color: #2c3e50;
+  padding: 0; 
+  max-width:100%;
+}
+
+.header-title {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
 }
 
 body {
@@ -51,11 +77,9 @@ body {
 
 }
 
-.footer {
-  background-color: darkorchid;
-  color: white;
-  text-align: center;
-  line-height: 40px;
+.content{
+  flex: 1;
+  margin-top:20px;
 }
 
 * {
@@ -70,7 +94,10 @@ body {
   font-size: 24px;
   font-family: "楷体";
 }
-
+.custom-header {
+  padding-left: 0 !important;
+  padding-right: 0 !important;
+}
 nav {
   padding: 30px;
 
diff --git a/TeacherHomeWork-vite/src/components/Header.vue b/TeacherHomeWork-vite/src/components/Header.vue
new file mode 100644
index 0000000000000000000000000000000000000000..44e1abc32be5df40f9b9de833a66f62dd020a9d4
--- /dev/null
+++ b/TeacherHomeWork-vite/src/components/Header.vue
@@ -0,0 +1,68 @@
+<template>
+    <el-menu
+      :default-active="activeIndex"
+      class="el-menu-demo"
+      mode="horizontal"
+      :ellipsis="false"
+      @select="handleSelect"
+      text-color="#fff"
+      :background-color="'darkorchid'"   
+    >
+      <el-menu-item index="1" @click="Home">首页</el-menu-item>
+      <el-menu-item index="2" @click="HomeWorkManager">作业管理</el-menu-item>
+      <el-menu-item index="3" @click="WrongManager">成绩管理</el-menu-item>
+    </el-menu>
+</template>
+  
+<script lang="ts" setup>
+import { ref } from 'vue';
+import { useRouter } from 'vue-router';
+  
+const activeIndex = ref('1')
+  const handleSelect = (key: string, keyPath: string[]) => {
+    console.log(key, keyPath)
+  }
+
+  //路由器
+    const router = useRouter();
+    const Home = () =>{
+        router.push("/")
+    }
+    const HomeWorkManager = () => {
+        router.push("/HomeWorkManager")
+    }
+    const WrongManager = () => {
+        router.push("/GradeManger")
+    }
+/*     const Home = () => {
+        router.push("/")
+    } */
+
+</script>
+  
+<style scoped>
+.el-menu-demo{
+    display: flex;
+    justify-content: center;
+    align-items: center;
+    font-size: 20px;
+    background-color: darkorchid;
+    height: 150%;
+    width: 100%;
+    gap: 40px;
+}
+.el-menu-title{
+    display: flex;
+    justify-content: left;
+    align-items: baseline;
+    font-size: 20px;
+}
+.el-menu-item{
+  display: flex;
+  justify-content: center;
+  align-items: center;
+  font-size: 20px;
+  margin: 15px;
+}
+
+</style>
\ No newline at end of file
diff --git a/TeacherHomeWork-vite/src/components/Sidebar.vue b/TeacherHomeWork-vite/src/components/Sidebar.vue
index d5e02446916d5fb2c5c751577474049460a48790..7c8f735706093d4e3b2e267d69eb5b8ea2db3ec9 100644
--- a/TeacherHomeWork-vite/src/components/Sidebar.vue
+++ b/TeacherHomeWork-vite/src/components/Sidebar.vue
@@ -6,8 +6,7 @@
      >
         <el-menu-item index="1" @Click="HomeworkManager">作业管理</el-menu-item>
         <el-menu-item index="2" @Click="GradeManger">成绩管理</el-menu-item>
-        <el-menu-item index="3" @Click="LearningProgress">学习进度</el-menu-item>
-        <el-menu-item index="4" @Click="">学期作业统计</el-menu-item>
+        <!--<el-menu-item index="3" @Click="LearningProgress">学习进度</el-menu-item>-->
     </el-menu>
 </template>
 
@@ -23,9 +22,9 @@ const HomeworkManager = () => {
 const GradeManger = () => {
   router.push("/GradeManger")
 }
-const LearningProgress  = () => {
-  router.push("/LearningProgress")
-}
+//const LearningProgress  = () => {
+// router.push("/LearningProgress")
+//}
 </script>
 
 <style scoped>
diff --git a/TeacherHomeWork-vite/src/views/Home/Dashboard.vue b/TeacherHomeWork-vite/src/views/Home/Dashboard.vue
index a38b50656cdff9af603db0b9cf6aa22fccf52b48..5302320ff85bc1c2ce182d2db4f8c66ed31fc0e7 100644
--- a/TeacherHomeWork-vite/src/views/Home/Dashboard.vue
+++ b/TeacherHomeWork-vite/src/views/Home/Dashboard.vue
@@ -28,12 +28,12 @@
                 <span>整体作业完成率: 88.9%</span>
             </div>
 
-            <el-divider direction="vertical" />
+           <!--  <el-divider direction="vertical" />
 
-            <div class="stat-box">
+          <div class="stat-box">
                 <el-icon><reading /></el-icon>
                 <span>整体学习进度: 65%</span>
-            </div>
+            </div> -->
 
         </div>
     </el-card>
@@ -57,7 +57,7 @@ const selectedCourse = ref("高等数学A");
 .stat-box {
   display: flex;
   align-items: center;
-  font-size: 16px;
+  font-size: 25px;
   gap: 5px;
 }
 .el-icon{
diff --git a/TeacherHomeWork-vite/src/views/Home/index.vue b/TeacherHomeWork-vite/src/views/Home/index.vue
index fc8c097d9669355fc935ec7ac68ec3197d7e6d49..f8ec50ad68679986442c6f9f58a023f173b57c63 100644
--- a/TeacherHomeWork-vite/src/views/Home/index.vue
+++ b/TeacherHomeWork-vite/src/views/Home/index.vue
@@ -9,9 +9,9 @@
         </el-main>
 
         <!-- 右侧消息通知 -->
-        <el-aside class="main-message">
+     <!--    <el-aside class="main-message">
             <TeacherMessageList />
-        </el-aside>
+        </el-aside> -->
     </el-container>
 </template>
 
diff --git a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
index 562944316023e3576ed71e0d8bd16db2f34dafcd..0e28c131b8a23ad390117eb3cce707e035dca9a1 100644
--- a/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
+++ b/TeacherHomeWork-vite/src/views/HomeWorkManager/HomeworkList.vue
@@ -9,13 +9,12 @@
       </div>
   
       <el-table :data="tableData" style="width: 100%">
-        <el-table-column prop="homework" label="作业"></el-table-column>
-        <el-table-column prop="createtime" label="发布时间"></el-table-column>
-        <el-table-column prop="endtime" label="截止时间"></el-table-column>
-        <el-table-column prop="correct" label="待批"></el-table-column>
-        <el-table-column prop="submitted" label="已交"></el-table-column>
+        <el-table-column prop="homework_name" label="作业"></el-table-column>
+        <el-table-column prop="start_time" label="发布时间"></el-table-column>
+        <el-table-column prop="finish_time" label="截止时间"></el-table-column>
+        <el-table-column prop="ungraded" label="待批"></el-table-column>
+        <el-table-column prop="submit" label="已交"></el-table-column>
         <el-table-column prop="unsubmitted" label="未交"></el-table-column>
-        <el-table-column prop="question" label="学生疑难点提问"></el-table-column>
 
         <el-table-column>
           <template #default="scope">
@@ -30,30 +29,52 @@
   
   </template>
   
-  <script setup>
-  import { ref } from 'vue';
+  <script lang="ts" setup>
+
+  import { onMounted, ref } from 'vue';
   import { useRouter } from 'vue-router';
+  import { HttpClient } from '../../network/HttpClient';  
 
   const router=useRouter();
   const search = ref('');
+
+  interface Homework {
+    homework_name: string;
+    start_time: string;
+    finish_time: string;
+    ungraded: number;
+    submit: number;
+    unsubmitted: number;
+  }
   
-  const tableData = ref([
-    { homework: '第一次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第二次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第三次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第四次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第五次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第六次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第七次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第八次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第九次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第十次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第十一次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第十二次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第十三次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
-    { homework: '第十四次作业', createtime: '2024-12-04 09:47', endtime: '2024-12-04 09:47', correct: 38, submitted: 18, unsubmitted: 19, question:8},
+  const tableData = ref<Homework[]>([]);
+
+  onMounted(() => {
+    getHomeWork()
+  })
 
-  ]);
+//获取所有作业
+ const getHomeWork = async () => {
+  await HttpClient.get('getTHomeWork', {
+    id: 1
+  }).then(res => {
+    
+    const transformedData = res.data.data.map(item => {
+      return {
+        homework_name:item.homework_name,
+        start_time: item.start_time,           
+        finish_time: item.finish_time,           
+        ungraded: item.ungraded,
+        submit:item.submit,
+        unsubmitted:item.unsubmitted
+      };
+    });
+    tableData.value = transformedData; 
+    console.log(transformedData);  
+  }).catch(err => {
+    console.log(err);
+  });
+};
 
   const handleEdit = () =>{
     router.push('/GradeHomework')
diff --git a/TeacherHomeWork-vite/src/views/TermAssignmentReport/index.vue b/TeacherHomeWork-vite/src/views/TermAssignmentReport/index.vue
deleted file mode 100644
index d4e1e6b113e8de9a1f8169cc662a243ef39c525a..0000000000000000000000000000000000000000
--- a/TeacherHomeWork-vite/src/views/TermAssignmentReport/index.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<template>
-
-</template>
-
-<script setup>
-
-
-</script>
-
-<style scoped>
-
-</style>
\ No newline at end of file