From 5a9d35a6ae68ae010d2261261049970a8bcbbcc9 Mon Sep 17 00:00:00 2001
From: Hexianren <1979181470@qq.com>
Date: Tue, 11 Mar 2025 12:47:53 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../template/dao/impl/HomeWorkDaoImpl.java    |  5 +-
 .../wetoband/template/entity/HomeWork.java    |  2 +
 .../views/HomeWorkManager/HomeWorkManger.vue  | 52 +++++++++++++++----
 .../src/views/WrongManager/WrongManager.vue   | 37 ++++++++-----
 4 files changed, 70 insertions(+), 26 deletions(-)

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 2d6419f..fad1f8f 100644
--- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
+++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java
@@ -17,7 +17,7 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
     @Override
     public List<HomeWork> getHomeWork(Connection connection, int id) throws SQLException {
         // SQL语句
-        String sql ="SELECT homework.*,teacher.name , submit.submitStatus FROM homework " +
+        String sql ="SELECT homework.*,teacher.name,submit.submitStatus,submit.score 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<>();
@@ -34,12 +34,13 @@ public class HomeWorkDaoImpl extends BaseDaoImpl<HomeWork> implements HomeWorkDa
                     homework.setHomework_name(rs.getString("homework_name"));
                     homework.setCourse_name(rs.getString("course_name"));
                     homework.setTeacher_name(rs.getString("name"));
-                    homework.setHomework_name(rs.getString("homework_name"));
+                    homework.setScore(rs.getDouble("score"));
                     if (rs.getInt("submitStatus") == 0){
                         homework.setSubmitStatus("未提交");
                     }else {
                         homework.setSubmitStatus("已提交");
                     }
+
                     homeworkList.add(homework);
                 }
             }
diff --git a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
index bc94be6..7603250 100644
--- a/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
+++ b/HomeWork-java/src/com/wetoband/template/entity/HomeWork.java
@@ -27,6 +27,8 @@ public class HomeWork {
     @Column(name = "teacher_id")
     private Integer teacher_id;
 
+
+    private Double score;
     private String teacher_name;
     private String submitStatus;
 
diff --git a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
index 664e33d..baf9250 100644
--- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
+++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue
@@ -1,18 +1,24 @@
 <template>
   <div class="container">
 
-    <el-card>
-      <div class="head">
-        <span style="float: left; margin-left: 2%;">
-          我的作业>
-        </span>
-      </div>
+    <el-card class="card">
+      <template #header>
+          <div class="card-header">
+              <h2>我的作业</h2>
+          </div>
+      </template>
+
       <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-select>
-          <el-input v-model="input1" style="width: 150px;margin-right: 8px;" size="middle" placeholder="请输入搜索内容" :suffix-icon="Search" />
+          <el-input v-model="input1" style="width: 30vh;margin-right: 8px;" size="middle" placeholder="请输入搜索内容"  >
+            <!-- 未绑定搜索接口 -->
+            <template #append>
+              <el-button style="background-color: #409EFF;color: #fff; " :icon="Search" />
+            </template>
+          </el-input>
           <el-button @click="worng" type="danger">查看错题</el-button>
         </div>
 
@@ -32,6 +38,7 @@
           <el-table-column prop="teacher_name" label="发布教师" />
           <el-table-column prop="finish_time" label="截止时间" sortable />
           <el-table-column prop="homework_name" label="作业名称" />
+          <el-table-column prop="score" label="成绩" />
           <el-table-column prop="submitStatus" label="完成状态" sortable :sort-method="sortStatus" />
 
           <el-table-column prop="options" label="操作">
@@ -47,9 +54,16 @@
 
 
         <div class="final" style="float: right;">
-          <el-pagination size="small" background layout="prev,pager,next,jumper" :total="50"
-            v-model:current-page="currentPage" v-model:page-size="pageSize" @size-change="handleSizeChange"
-            @current-change="handleCurrentChange" class="mt-4" />
+          <el-pagination 
+            size="small" 
+            background layout="prev,pager,next,jumper" 
+            :total="50"
+            v-model:current-page="currentPage" 
+            v-model:page-size="pageSize" 
+            @size-change="handleSizeChange"
+            @current-change="handleCurrentChange" 
+            class="mt-4" 
+          />
         </div>
       </div>
     </el-card>
@@ -94,6 +108,10 @@ const options = [
     value: '作业名称',
     label: '作业名称',
   },
+  {
+    value: '成绩',
+    label: '成绩',
+  },
   {
     value: '完成状态',
     label: '完成状态',
@@ -125,10 +143,11 @@ const upload = (type, homework_id, start_time, finish_time, homework_name) => {
   }
 }
 
-const tableData = ref([])
+const tableData = ref([]) 
 onMounted(() => {
   getHomeWork()
 })
+
 //获取所有作业
 const getHomeWork = async () => {
   await HttpClient.get('getHomeWork', {
@@ -184,6 +203,10 @@ const sortStatus = (rowA: any, rowB: any) => {
 
 }
 
+.card{
+  height: 100%;
+}
+
 
 .head {
 
@@ -194,6 +217,7 @@ const sortStatus = (rowA: any, rowB: any) => {
 .body {
   flex: 10;
   padding: 20px;
+  height: 100%;
 }
 
 .final {
@@ -208,6 +232,12 @@ const sortStatus = (rowA: any, rowB: any) => {
   width: 100%;
 }
 
+.card-header {
+    display: flex;
+    justify-content: space-between;
+    align-items: center;
+}
+
 .search {
   margin-bottom: 10px;
 
diff --git a/HomeWork-vite/src/views/WrongManager/WrongManager.vue b/HomeWork-vite/src/views/WrongManager/WrongManager.vue
index a7a7ceb..ec3ce43 100644
--- a/HomeWork-vite/src/views/WrongManager/WrongManager.vue
+++ b/HomeWork-vite/src/views/WrongManager/WrongManager.vue
@@ -1,16 +1,18 @@
 <template>
     <div class="mistakes-view">
+
         <el-card class="box-card">
+
             <template #header>
                 <div class="card-header">
                     <h2>错题管理</h2>
-                    <el-button type="primary" :icon="Refresh" circle @click="refreshData"></el-button>
+                    <!-- <el-button type="primary" :icon="Refresh" circle @click="refreshData"></el-button> -->
                 </div>
             </template>
 
-            <div class="wrong-questions-manager">
+            <div>
                 <div class="search-filter">
-                    <el-select v-model="filterValue" :placeholder="selectPlaceholder" style="width: 150px;">
+                    <el-select v-model="filterValue" :placeholder="selectPlaceholder" style="width: 120px;">
                         <el-option label="全部" value=""></el-option>
                         <el-option label="科目" value="subject"></el-option>
                         <el-option label="章节" value="chapter"></el-option>
@@ -18,7 +20,12 @@
                         <el-option label="分数" value="score"></el-option>
                     </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: 30vh;"  @input="handleSearch">
+                        <!-- 未绑定搜索接口 -->
+                        <template #append>
+                            <el-button style="background-color: #409EFF;color: #fff; " :icon="Search" />
+                        </template>
+                    </el-input>
                 </div>
 
                 <el-table :data="filteredWrongQuestions" style="width: 100%" :stripe="true" 
@@ -52,10 +59,16 @@
                 </el-table>
 
                 <div class="pagination">
-                    <el-pagination v-model:current-page="currentPage" v-model:page-size="pageSize"
-                        :page-sizes="[10, 20, 50, 100]" :small="true" background
-                        layout="total, sizes, prev, pager, next, jumper" :total="totalItems"
-                        @size-change="handleSizeChange" @current-change="handleCurrentChange">
+                    <el-pagination 
+                        v-model:current-page="currentPage"
+                        v-model:page-size="pageSize"
+                        :page-sizes="[10, 20, 50, 100]"
+                        :small="true" background
+                        layout="prev, pager, next, jumper"
+                        :total="totalItems"
+                        @size-change="handleSizeChange"
+                        @current-change="handleCurrentChange"
+                    >
                         <template #jumper>
                             <span class="el-pagination__jump">
                                 前往
@@ -157,14 +170,16 @@ const getWrongHomework = async () => {
 <style scoped>
 .mistakes-view {
     width: 90%;
+    height: 80vh;
     margin-top: 2%;
+    padding: 20px;
     margin-right: auto;
     margin-left: auto;
-    padding: 20px;
 }
 
 .box-card {
     width: 100%;
+    height: 80vh;
 }
 
 .card-header {
@@ -179,10 +194,6 @@ h2 {
     color: #333;
 }
 
-.wrong-questions-manager {
-    padding: 20px;
-}
-
 .search-filter {
     display: flex;
     justify-content: flex-end;
-- 
Gitee