diff --git a/pages/Mystudent/Mystudent.vue b/pages/Mystudent/Mystudent.vue
index fa06730..c1c45fe 100644
--- a/pages/Mystudent/Mystudent.vue
+++ b/pages/Mystudent/Mystudent.vue
@@ -123,137 +123,85 @@
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
- 课后作业
-
-
- 进行中
-
-
-
-
-
-
- IELTS 18-Test 2-Part 1
-
-
- 听力
+
+ 进行中
-
-
-
- IELTS 18-Test 2-Part 1
+
+
+
+
+
+ {{items.paperName}}-{{items.testName}}-{{items.partName}}
+
+
+ {{items.moduleName}}-{{items.partName}}-{{items.questionName}}-跟读
+
+
+ {{items.paperName}}-{{items.testName}}-{{items.partName}}
+
+
+ 听力
+
+
+ 阅读
+
+
+ 写作
+
+
+ 口语
+
+
-
- 听力
+
+
+
+
-
-
-
- IELTS 18-Test 2-Part 1
+
+
+
+
+
+ 描述
-
- 听力
+
+ {{item.des}}
-
-
-
-
-
+
+
+
+
+
+
+
+ 时间
- 描述
-
-
- 最好在中午十二点之前完成交上作业，过期不候
-
-
-
-
-
-
-
-
+
+
+ {{item.doneTime}}
+
- 时间
-
-
-
- 02-12 12:00
-
-
-
-
-
-
-
-
-
- 课后作业
-
-
- 进行中
-
-
-
-
-
-
- IELTS 18-Test 2-Part 1
-
-
- 听力
-
-
-
-
-
- IELTS 18-Test 2-Part 1
-
-
- 听力
-
-
-
-
-
- IELTS 18-Test 2-Part 1
-
-
- 听力
-
-
-
-
-
-
-
-
- 描述
-
-
- 最好在中午十二点之前完成交上作业，过期不候
-
-
-
-
-
-
-
-
-
- 时间
-
-
-
- 02-12 12:00
@@ -289,7 +237,8 @@
workinfo: {},
orgworkinfo: {},
beforyes: '',
- isup: ''
+ isup: '',
+ works:{}
// https://file.langsi.online/yasiimg/web/static/uBHiWpVS8LQdX241DdjX
}
},
@@ -302,6 +251,14 @@
},
methods: {
+ highlightSearch(name) {
+ // 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字
+ if (this.searchKeyword) {
+ const regex = new RegExp(this.searchKeyword, 'gi');
+ return name.replace(regex, match => `${match}`);
+ }
+ return name;
+ },
getinfo() {
this.$u.get(
`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/statistics?memberId=${this.id}`
@@ -327,6 +284,20 @@
}
})
+ this.$u.get(
+ `https://api.admin-v2.langsi.online/admin-api/classroom/work-member/list?memberId=${501}`
+ ).then(res => {
+
+
+ if (res.code == 0) {
+ this.works = res.data
+
+
+ // this.classlist = res.data.list
+ // this.isloding = false
+
+ }
+ })
},
async initChart() {
let _this = this
@@ -851,130 +822,147 @@
}
}
- .work_card {
- margin-top: 20rpx;
- display: flex;
- flex-wrap: wrap;
- width: 686rpx;
- padding: 32rpx;
- background: #FFFFFF;
- border-radius: 20rpx 20rpx 20rpx 20rpx;
-
- border-left: 8rpx solid #F18F21;
-
- .work_card_top {
- width: 100%;
+ .card_bigbox {
+ .work_card {
+ margin-top: 20rpx;
display: flex;
- flex-wrap: nowrap;
- align-items: center;
- justify-content: space-between;
-
- .work_card_top_left {
- display: flex;
- flex-wrap: nowrap;
- align-items: center;
- font-size: 28rpx;
- font-family: 'PingFang', 'PingFang';
- font-weight: 800;
- color: #2E4975;
-
- .work_card_top_left_img {
- margin-right: 8rpx;
- width: 38rpx;
- height: 32rpx;
- }
- }
-
- .work_card_top_right {
- font-size: 24rpx;
- font-family: 'PingFang', 'PingFang';
- font-weight: 500;
- color: #F18F21;
- }
-
- .act2 {
- color: #2D7CE6;
- }
- }
-
- .work_card_cont_box {
- margin-top: 16rpx;
- padding: 24rpx;
- width: 100%;
- background: #F9F9F9;
+ flex-wrap: wrap;
+ width: 686rpx;
+ padding: 32rpx;
+ background: #FFFFFF;
border-radius: 20rpx 20rpx 20rpx 20rpx;
-
- .work_card_cont:last-child {
- margin-bottom: 0;
- }
-
- .work_card_cont {
- margin-bottom: 24rpx;
+
+ border-left: 8rpx solid #F18F21;
+
+ .work_card_top {
+ width: 100%;
display: flex;
flex-wrap: nowrap;
align-items: center;
-
- .work_card_cont_point {
- width: 8rpx;
- height: 8rpx;
- background: #2E4975;
- border-radius: 50%;
+ justify-content: space-between;
+
+ .work_card_top_left {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ font-size: 28rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 800;
+ color: #2E4975;
+
+ .work_card_top_left_img {
+ margin-right: 8rpx;
+ width: 38rpx;
+ height: 32rpx;
+ }
+ .txt{
+ font-size: 28rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 800;
+ color: #2E4975;
+ }
}
-
- .work_card_cont_text {
- margin-left: 20rpx;
+
+ .work_card_top_right {
+ font-size: 24rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 500;
+ color: #F18F21;
+ }
+
+ .act2 {
+ color: #2D7CE6;
+ }
+ }
+
+ .work_card_cont_box {
+ margin-top: 16rpx;
+ padding: 24rpx;
+ width: 100%;
+ background: #F9F9F9;
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+
+ .work_card_cont:last-child {
+ margin-bottom: 0;
+ }
+
+ .work_card_cont {
+ margin-bottom: 24rpx;
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+
+ .work_card_cont_point {
+ width: 8rpx;
+ height: 8rpx;
+ background: #2E4975;
+ border-radius: 50%;
+ }
+
+ .work_card_cont_text {
+ margin-left: 20rpx;
+ font-size: 24rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 500;
+ color: #2E4975;
+ }
+
+ .work_card_cont_tag {
+ margin-left: 30rpx;
+ padding: 8rpx 18rpx;
+ background: #FFF2E4;
+ border-radius: 20rpx 20rpx 20rpx 20rpx;
+ font-size: 20rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 500;
+ color: #F18F21;
+ }
+
+ }
+ }
+
+ .work_card_info_box {
+ display: flex;
+ flex-wrap: wrap;
+ margin-top: 22rpx;
+ width: 100%;
+
+ .work_card_info_top {
+ display: flex;
+ flex-wrap: nowrap;
+ align-items: center;
+ width: 100%;
+ font-size: 20rpx;
+ font-family: 'PingFang', 'PingFang';
+ font-weight: 500;
+ color: rgba(46, 73, 117, 0.6);
+
+ .work_card_info_topimg {
+ margin-right: 8rpx;
+ width: 18.74rpx;
+ height: 20rpx;
+ }
+ }
+
+ .work_card_info_bot {
+ margin-top: 4rpx;
font-size: 24rpx;
font-family: 'PingFang', 'PingFang';
font-weight: 500;
color: #2E4975;
}
-
- .work_card_cont_tag {
- margin-left: 30rpx;
- padding: 8rpx 18rpx;
- background: #FFF2E4;
- border-radius: 20rpx 20rpx 20rpx 20rpx;
- font-size: 20rpx;
- font-family: 'PingFang', 'PingFang';
- font-weight: 500;
- color: #F18F21;
- }
-
}
}
-
- .work_card_info_box {
- display: flex;
- flex-wrap: wrap;
- margin-top: 22rpx;
-
- .work_card_info_top {
- display: flex;
- flex-wrap: nowrap;
- align-items: center;
- width: 100%;
- font-size: 20rpx;
- font-family: 'PingFang', 'PingFang';
- font-weight: 500;
- color: rgba(46, 73, 117, 0.6);
-
- .work_card_info_topimg {
- margin-right: 8rpx;
- width: 18.74rpx;
- height: 20rpx;
- }
- }
-
- .work_card_info_bot {
- margin-top: 4rpx;
- font-size: 24rpx;
- font-family: 'PingFang', 'PingFang';
- font-weight: 500;
- color: #2E4975;
- }
+
+ .act1 {
+ border-left: 8rpx solid #2D7CE6;
+ }
+
+ .act3 {
+ border-left: 8rpx solid #DFDFDF;
}
}
-
+
.act1 {
border-left: 8rpx solid #2D7CE6;
}