diff --git a/common/css/iconfont.css b/common/css/iconfont.css index 36c7f17..12be79d 100644 --- a/common/css/iconfont.css +++ b/common/css/iconfont.css @@ -1,8 +1,8 @@ @font-face { font-family: "iconfont"; /* Project id 3598721 */ - src: url('//at.alicdn.com/t/c/font_3598721_fd8phfvkjv.woff2?t=1691978562796') format('woff2'), - url('//at.alicdn.com/t/c/font_3598721_fd8phfvkjv.woff?t=1691978562796') format('woff'), - url('//at.alicdn.com/t/c/font_3598721_fd8phfvkjv.ttf?t=1691978562796') format('truetype'); + src: url('//at.alicdn.com/t/c/font_3598721_z5jk4kgjfv.woff2?t=1703600739909') format('woff2'), + url('//at.alicdn.com/t/c/font_3598721_z5jk4kgjfv.woff?t=1703600739909') format('woff'), + url('//at.alicdn.com/t/c/font_3598721_z5jk4kgjfv.ttf?t=1703600739909') format('truetype'); } .iconfont { @@ -13,6 +13,14 @@ -moz-osx-font-smoothing: grayscale; } +.icon-xiangxiajiantoucuxiao:before { + content: "\e8c8"; +} + +.icon-xiangshangjiantoucuxiao:before { + content: "\e8d8"; +} + .icon-yiwancheng:before { content: "\e630"; } diff --git a/common/http.interceptor.js b/common/http.interceptor.js index c62fbe8..74ddf6b 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -42,7 +42,7 @@ const install = (Vue, vm) => { // 所以哪怕您重新登录修改了Storage，下一次的请求将会是最新值 // const token = uni.getStorageSync('token'); - const token = " Bearer 794bed8faaf14a00b07befd07b8402b2" + const token = " Bearer 5791a135fff342a4b7e70109b6936826" // console.log("我是token", token) config.header.Authorization = token; diff --git a/pages.json b/pages.json index 0a2b316..16e574f 100644 --- a/pages.json +++ b/pages.json @@ -228,6 +228,16 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + { + "path" : "teacher_class/class_members", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } } ] diff --git a/pages/Mystudent/Mystudent.vue b/pages/Mystudent/Mystudent.vue index 9452838..754c631 100644 --- a/pages/Mystudent/Mystudent.vue +++ b/pages/Mystudent/Mystudent.vue @@ -1,21 +1,16 @@ - + \ No newline at end of file diff --git a/pages_teacher/pages_add/add_class.vue b/pages_teacher/pages_add/add_class.vue index cc4d372..31713db 100644 --- a/pages_teacher/pages_add/add_class.vue +++ b/pages_teacher/pages_add/add_class.vue @@ -19,51 +19,28 @@ --> - + + - + - 雅思1班 + {{item.name}} - - 共21人 + + + 听力 - - - - - - 平均成绩/分 + + 阅读 - - 6 + + 写作 - - - - 作业完成度 - - - 80% - - - - - - - - - - - - - 雅思1班 - - - 共21人 + + 口语 @@ -103,19 +80,23 @@ backgroundColor: "#F6F9FC", }, checkindex: 0, - id:13, + id:12, workinfo:[], orgworkinfo:[] } }, - onLoad() { + onLoad(option) { + console.log(option); + this.id = option.id + // this.classid=15 this.getworklist() }, + methods: { getworklist() { - this.$u.get(`https://api.admin-v2.langsi.online//admin-api/classroom/work-record/classrooms?workId=${this.id}`).then(res => { + this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/classrooms?workId=${this.id}`).then(res => { if (res.code == 0) { diff --git a/pages_teacher/teacher_class/class_members.vue b/pages_teacher/teacher_class/class_members.vue index cc4d372..4334764 100644 --- a/pages_teacher/teacher_class/class_members.vue +++ b/pages_teacher/teacher_class/class_members.vue @@ -19,21 +19,21 @@ --> - - + + - + - 雅思1班 + {{item.name}} - 共21人 + ID：{{item.id}} - + 平均成绩/分 @@ -50,43 +50,11 @@ 80% - - - - - - - - - - - 雅思1班 - - - 共21人 - - - - - - - 平均成绩/分 - - - 6 - - - - - 作业完成度 - - - 80% - - - + + + @@ -96,7 +64,7 @@ export default { data() { return { - title: '班级安排', + title: '学生安排', // 班级名称数据绑定 bgc: { @@ -110,12 +78,16 @@ } }, - onLoad() { + onLoad(option) { + console.log(option); + this.id = option.id + // this.classid=15 this.getworklist() }, + methods: { getworklist() { - this.$u.get(`https://api.admin-v2.langsi.online//admin-api/classroom/work-record/classrooms?workId=${this.id}`).then(res => { + this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/members?workId=${this.id}`).then(res => { if (res.code == 0) { diff --git a/pages_teacher/teacher_teachers/operation_detail.vue b/pages_teacher/teacher_teachers/operation_detail.vue index ae98431..02f62f3 100644 --- a/pages_teacher/teacher_teachers/operation_detail.vue +++ b/pages_teacher/teacher_teachers/operation_detail.vue @@ -53,7 +53,7 @@ - + 班级安排 @@ -70,7 +70,7 @@ - + 成员安排 @@ -96,17 +96,20 @@ - + - + @@ -179,18 +188,38 @@ }, methods: { - getTypeText(type) { - switch (type) { - case '1': - return '串题'+" "; - case '2': - return '跟读'+" "; - case '3': - return '模考'+" "; - default: - return '其他类型'; - } - }, + getTypeText(type) { + switch (type) { + case '1': + return '串题' + " "; + case '2': + return '跟读' + " "; + case '3': + return '模考' + " "; + default: + return '其他类型'; + } + }, + toclass(){ + uni.navigateTo({ + url: "/pages_teacher/pages_add/add_class?id=" +this.workinfo.id + + }).then(res => { + + }).catch(err => { + + }); + }, + tostu(){ + uni.navigateTo({ + url: "/pages_teacher/teacher_class/class_members?id=" + this.workinfo.id + + }).then(res => { + + }).catch(err => { + + }); + }, getworklist() { this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/detail?workId=${this.id}`) .then(res => { @@ -199,17 +228,17 @@ if (res.code == 0) { this.workinfo = res.data this.uploadspeath = (this.workinfo.doneNum / this.workinfo.totalNum) * 100; - - let json = JSON.stringify(this.workinfo ) - - for (const paper of this.workinfo.papers) { - // Loop through items in each paper - for (const item of paper.items) { - // Calculate speedwidth and add it to the item - item.speedwidth = (item.doneNum / item.totalNum) * 100; - } - } - + + let json = JSON.stringify(this.workinfo) + + for (const paper of this.workinfo.papers) { + // Loop through items in each paper + for (const item of paper.items) { + // Calculate speedwidth and add it to the item + item.speedwidth = (item.doneNum / item.totalNum) * 100; + } + } + // this.orgworkinfo = JSON.parse(JSON.stringify(res.data)); // this.classlist = res.data.list // this.isloding = false @@ -231,7 +260,7 @@ .title { margin-top: 32rpx; font-size: 40rpx; - font-family: 'YOUSHEBIAOTIHEI-2', 'YOUSHEBIAOTIHEI-2'; + font-family: 'YOUSHEBIAOTIHEI-2', 'YOUSHEBIAOTIHEI-2'; font-weight: 400; color: #2E4975; } @@ -439,12 +468,13 @@ font-family: 'PingFang', 'PingFang'; font-weight: 500; color: #2E4975; - + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } - .word{ + + .word { z-index: 2; font-size: 24rpx; font-family: 'PingFang', 'PingFang';