diff --git a/subpackage/teacher/report-detail/report-detail.js b/subpackage/teacher/report-detail/report-detail.js index 5635c03..0820e13 100644 --- a/subpackage/teacher/report-detail/report-detail.js +++ b/subpackage/teacher/report-detail/report-detail.js @@ -94,7 +94,7 @@ Page({ enableMarkLine: true, background: "#FFFFFF", color: that.data.chartType == 1 ? ["#FFA30C"] : that.data.chartType == 2 ? ["#6CB7FB"] : ["#FF4949"], - padding: [15, 15, 10, 15], + padding: [15, 10, 10, 5], enableScroll: true, // touchMoveLimit: 24, legend: { @@ -118,7 +118,8 @@ Page({ data: [{ // min: Math.max(0, that.data.moderateHR - 20), max: that.data.highHR + 20, - fontSize: 12 + fontSize: 12, + tofix:0 }] }, extra: { @@ -129,21 +130,21 @@ Page({ { value: that.data.moderateHR, lineColor: '#FFA30C', - showLabel: true, + showLabel: false, labelText: '中强度', labelFontColor: '#FFA30C', - labelBgColor: '#FFF8EC', + // labelBgColor: '#FFF8EC00', labelBgOpacity: 0.9, - labelAlign: 'left', + labelAlign: 'center', labelFontSize: 11 }, { value: that.data.highHR, lineColor: '#FF4949', - showLabel: true, + showLabel: false, labelText: '高强度', labelFontColor: '#FF4949', - labelBgColor: '#FFF0F0', + // labelBgColor: '#FFF0F000', labelBgOpacity: 0.9, labelAlign: 'left', labelFontSize: 11 diff --git a/subpackage/teacher/student-fitness-detail/student-fitness-detail.js b/subpackage/teacher/student-fitness-detail/student-fitness-detail.js index 0c7fe99..4d09b85 100644 --- a/subpackage/teacher/student-fitness-detail/student-fitness-detail.js +++ b/subpackage/teacher/student-fitness-detail/student-fitness-detail.js @@ -26,7 +26,7 @@ Page({ studentNo: '', readyFired: false, // Tab - activeTab: 0, // 0=课堂报告 1=体测报告 + activeTab: 1, // 0=课堂报告 1=体测报告 classroomSubTab: 0, // 0=月 1=季度 // 时间选择 selectedYear: 2026, @@ -280,7 +280,7 @@ Page({ tapLegend: true, background: 'rgba(0,0,0,0)', color: ['#4A90E2', '#E74C3C'], - padding: [0, 0, 0, 15], + padding: [0, 0, 0, 10], legend: { show: true, position: 'bottom', diff --git a/subpackage/teacher/student-fitness-detail/student-fitness-detail.wxml b/subpackage/teacher/student-fitness-detail/student-fitness-detail.wxml index 76edb19..fd781ab 100644 --- a/subpackage/teacher/student-fitness-detail/student-fitness-detail.wxml +++ b/subpackage/teacher/student-fitness-detail/student-fitness-detail.wxml @@ -2,135 +2,8 @@ - - - 课堂报告 - 体测报告 - - - - - - - 月 - 季度 - - - - - - {{selectedYear}}年{{selectedMonth}}月 - ▾ - - 心率统计 - - - - 心率范围 - {{monthData.heartRange}} - - - - 平均心率 - {{monthData.avgHeart}} - - - - 中高强度时长 - {{monthData.highDuration}} - - - - 中高时间占比 - {{monthData.highRatio}} - - - 跳绳统计 - 训练记录统计:仅智能跳绳,不含普通跳绳 - - - 个数 - 时长(分钟) - 平均速度(个/分钟) - - - {{monthData.jumpTotal}} - {{monthData.jumpDuration}} - {{monthData.jumpAvgSpeed}} - - - - - - - - - {{item.type}} - {{item.duration}} {{item.count}}个 - - - - - - - - - {{selectedYear}}年 第{{selectedQuarter}}季度 - ▾ - - 心率统计 - - - - 心率范围 - {{quarterData.heartRange}} - - - - 平均心率 - {{quarterData.avgHeart}} - - - - 中高强度时长 - {{quarterData.highDuration}} - - - - 中高时间占比 - {{quarterData.highRatio}} - - - 跳绳统计 - 训练记录统计:仅智能跳绳,不含普通跳绳 - - - 个数 - 时长(分钟) - 平均速度(个/分钟) - - - {{quarterData.jumpTotal}} - {{quarterData.jumpDuration}} - {{quarterData.jumpAvgSpeed}} - - - - - - - - - {{item.type}} - {{item.duration}} {{item.count}}个 - - - - - - 体测成绩对比 @@ -147,7 +20,6 @@ 暂无体测数据 -