diff --git a/pages/student/index/index.vue b/pages/student/index/index.vue
index 5d85119..6e85635 100644
--- a/pages/student/index/index.vue
+++ b/pages/student/index/index.vue
@@ -46,7 +46,7 @@
- 更多
+ 更多
@@ -333,10 +333,10 @@
})
},
//跳转体测列表
- physical_examination(e){
- let students_id = e.students_id
+ physical_examination(){
+ let resource_id = this.member_info.id
uni.navigateTo({
- url: `/pages/student/index/physical_examination?students_id=${students_id}`
+ url: `/pages/student/index/physical_examination?resource_id=${resource_id}`
})
},
//跳转作业列表页
diff --git a/pages/student/index/physical_examination.vue b/pages/student/index/physical_examination.vue
index 13f9ad2..7646c8e 100644
--- a/pages/student/index/physical_examination.vue
+++ b/pages/student/index/physical_examination.vue
@@ -11,33 +11,85 @@
>
- {{$util.formatToDateTime(v.create_time, 'Y-m-d')}}
+ {{$util.formatToDateTime(v.created_at, 'Y-m-d')}}
- {{v.score}}
+ {{v.calculateChildHealthScore}}
综合评分
身高 (CM)
- {{(v.height * 100)}}
+ {{(v.height)}}
体重 (KG)
{{v.weight}}
-
-
-
+
+
+
+
+
+
+
+
+
+ 坐位体前屈
+ 测试结果：{{v.seated_forward_bend}}
+
+
+
+ 仰卧卷腹
+ 测试结果：{{v.sit_ups}}
+
+
+
+ 九十度仰卧撑
+ 测试结果：{{v.push_ups}}
+
+
+
+ 火烈鸟平衡测试
+ 测试结果：{{v.flamingo_balance}}
+
+
+
+ 三十秒双脚连续跳
+ 测试结果：{{v.thirty_sec_jump}}
+
+
+
+ 立定跳远
+ 测试结果：{{v.standing_long_jump}}
+
+
+
+ 4乘10m灵敏折返跑
+ 测试结果：{{v.agility_run}}
+
+
+
+ 走平衡木
+ 测试结果：{{v.balance_beam}}
+
+
+
+ 网球掷远
+ 测试结果：{{v.tennis_throw}}
+
+
+
+ 十米往返跑
+ 测试结果：{{v.ten_meter_shuttle_run}}
+
- {{v.content}}
- 详细数据信息
@@ -60,14 +112,14 @@ export default {
page: 1,//当前页码
limit: 10,//每页返回数据条数
total: 10,//数据总条数
- students_id: '',//学员id
+ resource_id: '',//学员资源id
},
tableList: [],//表格数据
}
},
onLoad(options) {
- this.filteredData.students_id = options.students_id//学员id
+ this.filteredData.resource_id = options.resource_id//学员资源id
},
onShow() {
this.init()
@@ -116,7 +168,7 @@ export default {
}
//学员-体测列表
- let res = await apiRoute.surveyList(data)
+ let res = await apiRoute.xy_physicalTest(data)
this.loading = false
this.isReachedBottom = false;
if (res.code != 1) {
@@ -127,10 +179,10 @@ export default {
return
}
- this.tableList = this.tableList.concat(res.data.list.data); // 使用 concat 方法 将新数据追加到数组中
+ this.tableList = this.tableList.concat(res.data.data); // 使用 concat 方法 将新数据追加到数组中
// console.log('列表',this.tableList)
- this.filteredData.total = res.data.list.total
+ this.filteredData.total = res.data.total
this.filteredData.page++
},
}
@@ -150,6 +202,33 @@ export default {
flex-direction: column;
.item{
margin-bottom: 40rpx;
+ .content{
+ .list_box{
+ font-size: 30rpx;
+ text-align: center;
+ margin-top: 120rpx;
+ .ul{
+ padding: 0 20rpx;
+ display: flex;
+ flex-wrap: wrap; /* 允许换行 */
+ justify-content: space-between;
+ align-items: center;
+ gap: 20rpx;
+ .li{
+ width: 48%; /* 每个列表项占宽度的48%，留出一些间距 */
+ display: flex;
+ flex-direction: column;
+ gap: 5rpx;
+ .li_title{
+ text-align: left;
+ }
+ .li_content{
+ text-align: left;
+ }
+ }
+ }
+ }
+ }
}
}