From 67214093013229578910108030e4c64fed0c6283 Mon Sep 17 00:00:00 2001 From: Hexianren <1979181470@qq.com> Date: Mon, 17 Mar 2025 18:16:45 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=B2=A1=E7=94=A8=E7=9A=84=E6=8F=90?= =?UTF-8?q?=E4=BA=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../template/dao/impl/HomeWorkDaoImpl.java | 22 +++++++--- .../target/classes/config.properties | 2 +- HomeWork-java/tempResources/config.properties | 2 +- .../views/HomeWorkManager/HomeWorkManger.vue | 43 +++++++++++-------- .../src/views/WrongManager/WrongManager.vue | 28 +++++++----- 5 files changed, 62 insertions(+), 35 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 c787979..0d784a8 100644 --- a/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java +++ b/HomeWork-java/src/com/wetoband/template/dao/impl/HomeWorkDaoImpl.java @@ -80,14 +80,26 @@ public class HomeWorkDaoImpl extends BaseDaoImpl implements HomeWorkDa return homeworkList; } + @Override - public List 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 "; + public List getHomeWorkByCourse(Connection connection, String course_name, int id) 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 homework.course_name LIKE ? " + + "LIMIT ?, ?"; + List homeworkList = new ArrayList<>(); try (PreparedStatement pstm = connection.prepareStatement(sql)) { - pstm.setString(1, course_name); + pstm.setString(1, "%" + course_name + "%"); pstm.setInt(2,id); try (ResultSet rs = pstm.executeQuery()) { while (rs.next()) { diff --git a/HomeWork-java/target/classes/config.properties b/HomeWork-java/target/classes/config.properties index 49cc81a..b061f9a 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 49cc81a..b061f9a 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/views/HomeWorkManager/HomeWorkManger.vue b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue index d19fe85..2e5acad 100644 --- a/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue +++ b/HomeWork-vite/src/views/HomeWorkManager/HomeWorkManger.vue @@ -10,15 +10,18 @@
+ - + - + + + 查看错题
@@ -77,7 +80,7 @@ import { useRouter } from 'vue-router'; import { HttpClient } from '../../network/HttpClient' -const input1 = ref('') +const search = ref('') const selectedFilter = ref('') const router = useRouter() const currentPage = ref(1) @@ -124,7 +127,7 @@ const worng = () => { // } // } -const options = [ +const options = ref([ { value: '课程', label: '课程', @@ -133,26 +136,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 +165,15 @@ const getHomeWorkCount = async () => { }) } +//模糊搜索作业(等待后续接口) +const FindHomework = async (search: string,selectedFilter: string) => { + const response = await HttpClient.get('findHomework',{ + selectedFilter: selectedFilter, + search: search + }) +} + + // // 计算属性：根据筛选条件和搜索内容过滤数据 // const filteredData = computed(() => { // let filtered = tableData.value @@ -181,6 +187,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 e252c7e..18345a8 100644 --- a/HomeWork-vite/src/views/WrongManager/WrongManager.vue +++ b/HomeWork-vite/src/views/WrongManager/WrongManager.vue @@ -11,11 +11,7 @@
- - - - - + - + - - + + - - + +