From 80c5030e286ebbf931bd8c78d87502816015a084 Mon Sep 17 00:00:00 2001 From: taoxu <2622874537@qq.com> Date: Fri, 15 Dec 2023 21:52:39 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=9C=E4=B8=9A=E6=B8=B2=E6=9F=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- common/http.interceptor.js | 4 +- pages/Mystudent/Formteacher.vue | 12 +-- pages/Mystudent/arrange_work.vue | 80 +++++++++++++------ pages_teacher/teacher_class/class_detail.vue | 27 +++++-- .../teacher_teachers/teacher_addOperation.vue | 6 +- 5 files changed, 84 insertions(+), 45 deletions(-) diff --git a/common/http.interceptor.js b/common/http.interceptor.js index 62a6a14..9e7a09e 100644 --- a/common/http.interceptor.js +++ b/common/http.interceptor.js @@ -4,9 +4,9 @@ const install = (Vue, vm) => { // baseUrl: 'http://2087p773d1.wicp.vip', // 请求的本域名 // baseUrl: 'https://lchighpass.zhieasy.cn', // baseUrl: 'http://speaking.viphk.91tunnel.com',//测试https://speaking.iava.top/ - // baseUrl: 'http://89h83e.natappfree.cc',// + baseUrl: 'http://yml.dev.bc3.top',// // baseUrl: 'https://ielts.zhieasy.cn',//正式 - baseURL: 'https://api.admin-v2.langsi.online', + // baseURL: 'https://api.admin-v2.langsi.online', // baseUrl: 'http://i3qsdb.natappfree.cc',//正式 // baseUrl: 'http://hwihh5.natappfree.cc', diff --git a/pages/Mystudent/Formteacher.vue b/pages/Mystudent/Formteacher.vue index bc11c16..2656825 100644 --- a/pages/Mystudent/Formteacher.vue +++ b/pages/Mystudent/Formteacher.vue @@ -25,10 +25,10 @@ - {{item.name}} + {{item.teacherInfo.nickname}} - 听力 + {{item.roleText}} @@ -48,17 +48,17 @@ export default { } }, onLoad(option) { - // this.classid=option.id - this.classid=15 + this.classid=option.id + // this.classid=15 this.getclassteacher() }, methods: { getclassteacher(){ - this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/teacher/list?classId=${this.classid}`).then(res => { + this.$u.get(`/admin-api/classroom/teacher/list?classId=${this.classid}`).then(res => { if (res.code == 0) { - this.teacherlist=res.data.list + this.teacherlist=res.data // this.classlist = res.data.list // this.isloding = false diff --git a/pages/Mystudent/arrange_work.vue b/pages/Mystudent/arrange_work.vue index 310779d..3f1a6f4 100644 --- a/pages/Mystudent/arrange_work.vue +++ b/pages/Mystudent/arrange_work.vue @@ -32,14 +32,14 @@ - - 课后作业 + {{item.name}} @@ -47,32 +47,29 @@ - + - - IELTS 18-Test 2-Part 1 + + {{items.paperName}}-{{items.testName}} - + 听力 + + 阅读 + + + 写作 + + + 口语 + + - + + + - - IELTS 18-Test 2-Part 1 - - - 听力 - - - - - - IELTS 18-Test 2-Part 1 - - - 听力 - @@ -83,7 +80,7 @@ 描述 - 最好在中午十二点之前完成交上作业，过期不候 + {{item.des}} @@ -97,7 +94,8 @@ - 02-12 12:00 + {{item.doneTime}} + @@ -124,10 +122,40 @@ export default { { "iswork": "2" }, { "iswork": "0" } ], + classid:0, + workinfo:[] } }, + onLoad(option) { + console.log(option); + this.classid=option.classId + // this.classid=15 + this.getworklist() + }, methods: { - + formatTimestamp(timestamp) { + const date = new Date(timestamp); + const year = date.getFullYear(); + const month = (date.getMonth() + 1).toString().padStart(2, '0'); + const day = date.getDate().toString().padStart(2, '0'); + const hours = date.getHours().toString().padStart(2, '0'); + const minutes = date.getMinutes().toString().padStart(2, '0'); + + return `${year}-${month}-${day} ${hours}:${minutes}`; + }, + + getworklist(){ + this.$u.get(`/admin-api/classroom/work-record/list?classId=${this.classid}`).then(res => { + + + if (res.code == 0) { + this.workinfo=res.data + // this.classlist = res.data.list + // this.isloding = false + + } + }) + } } } @@ -305,7 +333,7 @@ page { display: flex; flex-wrap: wrap; margin-top: 22rpx; - + width: 100%; .work_card_info_top { display: flex; flex-wrap: nowrap; diff --git a/pages_teacher/teacher_class/class_detail.vue b/pages_teacher/teacher_class/class_detail.vue index 80931ad..5bef695 100644 --- a/pages_teacher/teacher_class/class_detail.vue +++ b/pages_teacher/teacher_class/class_detail.vue @@ -52,9 +52,9 @@ - - - {{classinfo.members.length}} + + + {{classinfo.teachers.length}} @@ -62,14 +62,14 @@ - + 作业安排 - + 暂未安排作业哦!去安排 - + {{item.title}} @@ -157,8 +157,19 @@ }); }, + toworkdetail(){ + let classinofs=this.classid + console.log('跳转作业详情'); + uni.navigateTo({ + url: "/pages/Mystudent/arrange_work?classId=" +classinofs + }).then(res => { + + }).catch(err => { + + }); + }, getclassinfo() { - this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/detail?id=${this.classid}`).then(res => { + this.$u.get(`/admin-api/classroom/detail?id=${this.classid}`).then(res => { if (res.code == 0) { @@ -172,7 +183,7 @@ }) }, getworkinfo() { - this.$u.get(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/list?classId=${this.classid}`).then(res => { + this.$u.get(`/admin-api/classroom/work-record/list?classId=${this.classid}`).then(res => { if (res.code == 0) { diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue index 255f26d..140f900 100644 --- a/pages_teacher/teacher_teachers/teacher_addOperation.vue +++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue @@ -312,7 +312,7 @@ onLoad(option) { uni.removeStorageSync('selectedClassInfo'); uni.removeStorageSync('selectedStuInfo'); - uni.removeStorageSync('selectforwork'); + // uni.removeStorageSync('selectforwork'); this.classinfo = JSON.parse(decodeURIComponent(option.classinfo)) // let classinofs = [{ // name: '阅读5班', @@ -567,6 +567,7 @@ workDetailsPageReqVOList:workDetailsPageReqVOList } + console.log(data,'datadata'); this.$u.post(`https://api.admin-v2.langsi.online/admin-api/classroom/work-record/add`, data).then(res => { if (res.code === 0) { this.$refs.uToast.show({ @@ -587,8 +588,7 @@ this.fuwei() } }); - // let json = JSON.stringify(data) - // console.log(json, 'workDetailsPageReqVOList'); + } } }