From 4f5952a740fad6ba1b329bfa0168bf05772e026e Mon Sep 17 00:00:00 2001 From: ltx <1006158920@qq.com> Date: Wed, 13 Aug 2025 15:17:19 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E5=88=97=E8=A1=A8=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/TrainingData.js | 4 +- src/api/http.js | 2 +- src/views/homeWork/index.vue | 90 +++++++++++++++++++++++++----------- 3 files changed, 65 insertions(+), 31 deletions(-) diff --git a/src/api/TrainingData.js b/src/api/TrainingData.js index 4a3b4a6..5e6fc79 100644 --- a/src/api/TrainingData.js +++ b/src/api/TrainingData.js @@ -98,8 +98,8 @@ export function GetActivitiesStatisticsPageList(a, b, c, d,e,f) { return http.get(`/api/Activities/GetActivitiesStatisticsPageList?ActivitiesName=${a}&StartDate=${b}&EndDate=${c}&CategoryId=${d}&PageIndex=${e}&PageSize=${f}`) } // 作业列表 -export function GetHomeWorkPageList(a, b, c, d, e, f,g) { - return http.get(`/api/HomeWork/GetHomeWorkPageList?WorkType=${a}&StudentScope=${b}&WorkStatus=${c}&StartTime=${d}&EndTime=${e}&PageIndex=${f}&PageSize=${g}`) +export function GetHomeWorkPageList(a, b, c, d, e, f,g,h) { + return http.get(`/api/HomeWork/GetHomeWorkPageList?WorkType=${a}&StudentScope=${b}&WorkStatus=${c}&StartTime=${d}&EndTime=${e}&PageIndex=${f}&PageSize=${g}&TeacherName=${h}`) } // 作业下学生列表 export function GetHomeWorkStudents(a,b,c) { diff --git a/src/api/http.js b/src/api/http.js index dea8996..06d6efc 100644 --- a/src/api/http.js +++ b/src/api/http.js @@ -14,8 +14,8 @@ let loadingStatus = false; console.log(process.env.NODE_ENV, 'process.env.NODE_ENV') if (process.env.NODE_ENV == 'development') { // axios.defaults.baseURL = 'http://101.132.164.149:9991/'; - // axios.defaults.baseURL = 'http://212.129.154.46:9991/'; //测试 axios.defaults.baseURL = 'http://8.153.108.90:9991/'; //测试 + // axios.defaults.baseURL = 'https://smartsports.yuedongsports.com/'; //正式 // axios.defaults.baseURL = 'http://192.168.0.146:9991/'; //汤龙本地 // axios.defaults.baseURL = 'http://47.101.60.251:9991/'; // axios.defaults.baseURL = 'http://localhost:9991/'; diff --git a/src/views/homeWork/index.vue b/src/views/homeWork/index.vue index 4e28f0a..2a67a9a 100644 --- a/src/views/homeWork/index.vue +++ b/src/views/homeWork/index.vue @@ -12,12 +12,8 @@
-

学生范围:

- - - - +

教师手机:

+

状态:

@@ -58,10 +54,12 @@

{{ item.studentName }}

-

作业详情

+ +

未完成

+

用时：{{ formatTime(item.value) }}

+

个数：{{ item.value }}

 -
@@ -107,15 +105,28 @@ const data = ref({ classroomModeData: { refreshTable: false, type: '', + teacherPhone: '', typeData: [{ id: '', name: '全部' }, { id: 1, - name: '跳绳作业' + name: '跳绳' }, { id: 2, - name: '体育作业' + name: '开合跳' + }, { + id: 3, + name: '仰卧起坐' + }, { + id: 4, + name: '俯卧撑' + }, { + id: 5, + name: '深蹲起' + }, { + id: 7, + name: '高抬腿' }], range: '', rangeData: [{ @@ -134,9 +145,12 @@ const data = ref({ name: '全部' }, { id: 1, - name: '进行中' + name: '未开始' }, { id: 2, + name: '进行中' + }, { + id: 3, name: '已结束' }], startTime: [], @@ -157,7 +171,7 @@ const data = ref({ }, { label: "作业类型", - prop: "workTypeStr", + prop: "workTypeName", }, { label: "老师", @@ -169,7 +183,7 @@ const data = ref({ }, { label: "年级-班级", - prop: "activitiesStatusName", + prop: "gradeAndClassName", }, { label: "学生范围", @@ -208,7 +222,7 @@ const data = ref({ width: 800, title: '作业详情' }, - + nowIsTime: false, }) // 切换tab function changeTab(e) { @@ -231,7 +245,7 @@ function workDetail(e) { function cancle(val) { if (val == 0) { data.value.dialogData.dialogVisible = false - data.value.tabActive=1 + data.value.tabActive = 1 } else { data.value.detailDialogData.dialogVisible = false } @@ -239,7 +253,7 @@ function cancle(val) { function confirm(val) { if (val == 0) { data.value.dialogData.dialogVisible = false - data.value.tabActive=1 + data.value.tabActive = 1 } else { @@ -251,12 +265,22 @@ async function toView(e) { if (e) { console.log(e, 'eeeee') data.value.dialogData.dialogVisible = true - data.value.dialogData.title = '详情' + data.value.dialogData.title = e.workTypeName + data.value.nowIsTime = e.workModeType == 2 ? true : false GetHomeWorkStudentsApi(e) - } } + +function formatTime(seconds) { + // 1. 计算小时、分钟、秒 + const hours = Math.floor(seconds / 3600); // 总小时数 + const minutes = Math.floor((seconds % 3600) / 60); // 剩余分钟数 + const secs = seconds % 60; // 剩余秒数 + + // 2. 补零确保两位数（使用 padStart） + return `${String(hours).padStart(2, '0')}:${String(minutes).padStart(2, '0')}:${String(secs).padStart(2, '0')}`; +} // 点击重置 function reset() { data.value.classroomModeData.refreshTable = false @@ -295,7 +319,7 @@ onMounted(() => { async function GetActivitiesPageListApi() { let k = data.value.classroomModeData try { - const res = await _api.GetHomeWorkPageList(k.type, k.range, k.statu, k.startTime ? k.startTime[0] : '', k.startTime ? k.startTime[1] : '', k.tableNeed.pageIndex, k.tableNeed.pageSize); + const res = await _api.GetHomeWorkPageList(k.type, k.range, k.statu, k.startTime ? k.startTime[0] : '', k.startTime ? k.startTime[1] : '', k.tableNeed.pageIndex, k.tableNeed.pageSize, k.teacherPhone); if (res.code == 200) { if (res.data) { // console.log(res.data, 'res.GetActivitiesPageListApi') @@ -351,6 +375,12 @@ async function GetSubmittedAssignmentsApi(val) { } } + +