diff --git a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
index fc2bc7de7a6c64677dbbe86f7dfdb1c9a939f6ce..aa511c49b95610fbc49b7e4c6d5022927dcdbf3b 100644
--- a/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
+++ b/HomeWork-java/src/com/wetoband/template/service/HomeWorkService.java
@@ -16,6 +16,5 @@ 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;
-
     void submitHomework(Integer student_id, Integer homeworkId, Date submitTimeDate, Map<String, List<String>> userAnswers) throws Exception;
 }
diff --git a/HomeWork-vite/src/components/Sidebar.vue b/HomeWork-vite/src/components/Sidebar.vue
index 9728e4f2bd2c2f7890744bbbaa6916e682df2fba..67db55afc3dd9bb5ce1cdced70b932a44a6982fd 100644
--- a/HomeWork-vite/src/components/Sidebar.vue
+++ b/HomeWork-vite/src/components/Sidebar.vue
@@ -25,7 +25,7 @@ const WrongManager = () => {
 
 <style scoped>
 .sidebar {
-  height: 97vh;
+  height: 100%;
   width: 200px;
   border: 1px solid gray;  
 }
diff --git a/HomeWork-vite/src/views/Home/AssignmentList.vue b/HomeWork-vite/src/views/Home/AssignmentList.vue
index 742b85b42cc600976040ce80362575ba2124d5c6..c17320bf666061dcefbbd8828b4155c27e10a162 100644
--- a/HomeWork-vite/src/views/Home/AssignmentList.vue
+++ b/HomeWork-vite/src/views/Home/AssignmentList.vue
@@ -1,30 +1,44 @@
 <template>
   <!-- 学生端作业列表 -->
-  <el-table :data="tableData" style="width: 100% ; height: 100%;" :row-class-name="tableRowClassName">
+  <el-table :data="tableData" style="width: 100%; height: 100%;" :row-class-name="tableRowClassName">
     <el-table-column prop="date" label="日期" width="180" />
     <el-table-column prop="name" label="课程" width="180" />
     <el-table-column prop="address" label="作业描述" />
     <el-table-column prop="finish" label="完成状态" width="180" />
   </el-table>
-
-
 </template>
 
 <script lang="ts" setup>
+import { ref, onMounted } from 'vue';
+import { HttpClient } from '../../network/HttpClient';  
+
 interface User {
-  date: string
-  name: string
-  address: string
-  finish: string
+  date: string;
+  name: string;
+  address: string;
+  finish: string;
 }
 
-const tableRowClassName = ({
-  row,
-  rowIndex,
-}: {
-  row: User
-  rowIndex: number
-}) => {
+//计算完成状态
+const getFinishStatus =(finishTime: string, submitStatus:String): String =>{
+   const now =new Date();
+   const finishDate=new Date(finishTime);
+   const timeDiff =finishDate.getTime() -now.getTime();
+   const dayDiff =timeDiff / (100*60*60*24);
+
+   if(submitStatus === '已提交'){
+    return '已完成';
+   }else if(timeDiff < 0){
+    return '已截止';
+   }else if(dayDiff <= 3){
+    return '即将截止';
+   }else{
+    return '未完成';
+   }
+
+}
+// 根据完成状态设置行样式
+const tableRowClassName = ({ row, rowIndex }: { row: User; rowIndex: number }) => {
   if (row.finish === '已完成') {
     return 'success-row';
   } else if (row.finish === '即将截止') {
@@ -32,112 +46,48 @@ const tableRowClassName = ({
   } else if (row.finish === '已截止') {
     return 'error-row';
   }
-}
+};
+
+// 保存从后端获取的作业数据
+const tableData = ref<User[]>([]);
+
+onMounted(() => {
+  getHomeWork();  
+});
+
+
+const getHomeWork = async () => {
+  await HttpClient.get('getHomeWork', {
+    id: 1
+  }).then(res => {
+    const transformedData = res.data.data.map(item => {
+      return {
+        date: item.finish_time,           
+        name: item.course_name,           
+        address: item.homework_describe,  
+        finish: getFinishStatus(item.finish_time, item.submitStatus)       
+      };
+    });
+    tableData.value = transformedData; 
+    console.log(transformedData);  
+  }).catch(err => {
+    console.log(err);
+  });
+};
 
-const tableData: User[] = [
-  {
-    date: '2024-05-03',
-    name: '高等数学A',
-    address: '第二次作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '大学物理',
-    address: '第二章 刚体力学知识点总结',
-    finish: '即将截止',
-  },
-  {
-    date: '2024-05-04',
-    name: '大学生职业生涯规划',
-    address: '提交一份对于自己未来的职业生涯规划书',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-01',
-    name: '计算机组成原理',
-    address: '第二次上机实验报告',
-    finish: '已完成',
-  },
-  {
-    date: '2024-05-01',
-    name: '计算机组成原理',
-    address: '第一次上机实验报告',
-    finish: '已完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '大学物理',
-    address: '第二章 刚体力学知识点总结',
-    finish: '已截止',
-  },
-  {
-    date: '2024-05-03',
-    name: '高等数学A',
-    address: '第一次作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '大学物理',
-    address: '第一章 质点力学知识点总结',
-    finish: '已完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第七讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第六讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第五讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第四讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第三讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第二讲课后作业',
-    finish: '未完成',
-  },
-  {
-    date: '2024-05-02',
-    name: '形势与政策(五)',
-    address: '第一讲课后作业',
-    finish: '未完成',
-  },
-]
 </script>
 
-<style>
-.el-table .warning-row {
-  --el-table-tr-bg-color: rgb(235, 180.6, 99);
+<style scoped>
+/* 设置不同完成状态下的行颜色 */
+::v-deep(.warning-row) {
+  background-color: rgb(235, 180, 99) !important;
 }
 
-.el-table .success-row {
-  --el-table-tr-bg-color: rgb(133.4, 206.2, 97.4);
+::v-deep(.success-row) {
+  background-color: rgb(133, 206, 97) !important;
 }
 
-.el-table .error-row {
-  --el-table-tr-bg-color: rgb(247, 137.4, 137.4);
+::v-deep(.error-row) {
+  background-color: rgb(247, 137, 137) !important;
 }
 </style>
diff --git a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
index bdb8e6dc12c8f45aaf5fffaa1fcb5cc81029efc7..3b3a6930c4b495bf4d628d4bf143e5ef5eb57703 100644
--- a/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
+++ b/TeacherHomeWork-vite/src/views/GradeManager/GradeLMangerList.vue
@@ -9,7 +9,7 @@
       <el-button style="margin-left: 10px" type="primary" @click="unqualified">挂科学生</el-button>
     </div>
 
-    <el-table :data="computedTableData" :row-class-name="getRowClassName" style="width: 90%">
+    <el-table :data="computedTableData" :row-class-name="getRowClassName" style="width: 100%">
       <el-table-column prop="username" label="学号"></el-table-column>
       <el-table-column prop="name" label="姓名"></el-table-column>
       <el-table-column prop="midscore" label="期中成绩(40%)"></el-table-column>