diff --git a/pages.json b/pages.json index e21b33c..a4d67f3 100644 --- a/pages.json +++ b/pages.json @@ -90,7 +90,7 @@ } }, { - "path" : "pages/Mystudent/addforwork", + "path" : "pages/Mystudent/addclassforwork", "style" : { "navigationBarTitleText": "", @@ -195,6 +195,17 @@ "enablePullDownRefresh": false, "navigationStyle": "custom" } + }, + // 作业添加学生 + { + "path" : "pages_add/add_studentsforwork", + "style" : + { + "navigationBarTitleText": "", + "navigationBarBackgroundColor": "#4473f6", + "enablePullDownRefresh": false, + "navigationStyle": "custom" + } } ] diff --git a/pages/Mystudent/addforwork.vue b/pages/Mystudent/addclassforwork.vue similarity index 51% rename from pages/Mystudent/addforwork.vue rename to pages/Mystudent/addclassforwork.vue index 11885a4..24c840f 100644 --- a/pages/Mystudent/addforwork.vue +++ b/pages/Mystudent/addclassforwork.vue @@ -5,7 +5,7 @@ :background="bgc" title-color='#2E4975' title-size='36' - height='36'> + height='36' :custom-back="addclassinfo"> @@ -13,95 +13,34 @@ + placeholder-style="color:#C7CDD3" + @input="search()"> - - + + - - 雅思1班 + + - 共21人 - - - - - - - - - - 雅思1班 - - - 共21人 - - - - - - - - - - 雅思1班 - - - 共21人 + 共{{item.totalMembers}}人 + - - - - - - - - 李斯丹妮 - - - ID：3324 - - - - - - - - - - 李斯丹妮 - - - ID：3324 - - - - - - - - - - 李斯丹妮 - - - ID：3324 - - - + + - - - 确定添加（2） + + + 确定添加（{{selectclass.length}}） @@ -115,10 +54,104 @@ export default { backgroundColor: "#transparent", }, showpage:1, + classlist:{}, + changeclasslist:{}, + isloding:true, + selectclass: [], + searchKeyword:'' + } }, + onLoad(option) { + this.selectclass=JSON.parse(decodeURIComponent(option.classinfo)) + }, + onShow() { + this.getclassList() + }, methods: { - + addclassinfo(){ + uni.setStorageSync('selectedClassInfo', this.selectclass); + + // Navigate back to the previous page + uni.navigateBack({ + delta: 1, // Number of pages to go back + success(res) { + console.log(res); + }, + fail(err) { + console.error(err); + } + }); + }, + toggleSelection(item) { + const selectedIndex = this.selectclass.findIndex(selectedItem => selectedItem.id === item.id); + + if (selectedIndex === -1) { + // If not selected, add to the array and apply the 'act1' class + this.selectclass.push({ name: item.name, avatar: item.avatar, id: item.id }); + item.isSelected = true; + } else { + item.isSelected = false; + // If already selected, remove from the array and remove the 'act1' class + this.selectclass.splice(selectedIndex, 1); + } + console.log(this.selectclass, 'this.selectclass'); + }, + isSelectedClass(item) { + return this.selectclass.some(selectedItem => selectedItem.id === item.id); + }, + search() { + // 根据关键字过滤 this.classlist + if(this.searchKeyword!=''){ + const filteredList = JSON.parse(JSON.stringify(this.changeclasslist)).filter(item => item.name.includes(this.searchKeyword)); + // 更新 this.classlist 为过滤后的列表 + this.classlist = filteredList; + this.selectclass.forEach(selectedItem => { + const index = this.classlist.findIndex(item => item.id === selectedItem.id); + if (index !== -1) { + this.$set(this.classlist, index, { ...this.classlist[index], isSelected: true }); + } + }); + }else{ + this.fuwei() + } + + }, + highlightSearch(name) { + // 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字 + if (this.searchKeyword) { + const regex = new RegExp(this.searchKeyword, 'gi'); + return name.replace(regex, match => `${match}`); + } + return name; + }, + fuwei() { + + this.classlist = JSON.parse(JSON.stringify(this.changeclasslist)); + this.selectclass.forEach(selectedItem => { + const index = this.classlist.findIndex(item => item.id === selectedItem.id); + if (index !== -1) { + this.$set(this.classlist, index, { ...this.classlist[index], isSelected: true }); + } + }); + }, + getclassList() { + this.$u.get("https://api.admin-v2.langsi.online/admin-api/classroom/page").then(res => { + + if (res.code === 0) { + this.classlist = res.data.list; + this.changeclasslist = JSON.parse(JSON.stringify(this.classlist)); + this.isloding = false; + this.selectclass.forEach(selectedItem => { + const index = this.classlist.findIndex(item => item.id === selectedItem.id); + if (index !== -1) { + this.$set(this.classlist, index, { ...this.classlist[index], isSelected: true }); + } + }); + + } + }); + }, } } diff --git a/pages/Mystudent/addstu.vue b/pages/Mystudent/addstu.vue index 215860d..89d0a64 100644 --- a/pages/Mystudent/addstu.vue +++ b/pages/Mystudent/addstu.vue @@ -1,27 +1,33 @@ @@ -41,10 +52,13 @@ data() { return { bgc: { - backgroundColor: "#transparent", + backgroundColor: "#F6F9FC", }, checkindex: 1, - stulist:[] + stulist:[], + searchKeyword:'', + orgstulist:[], + selectedIds: [], } }, onLoad(option) { @@ -53,14 +67,81 @@ this.getallstu() }, methods: { + addstu() { + let data = { + memberId: this.selectedIds[0], + // memberId: '1522', + roomId: this.classid + }; + + this.$u.post(`https://api.admin-v2.langsi.online/admin-api/classroom/members/add`, data).then(res => { + if (res.code === 0) { + this.$refs.uToast.show({ + title: '添加成功', + type: 'success', + position:'top' + }) + this.selectedIds=[] + this.fuwei() + }else{ + this.$refs.uToast.show({ + title: '添加失败', + type: 'error', + position:'top' + + }) + this.selectedIds=[] + this.fuwei() + } + }); + }, + toggleSelection(item) { + const selectedIndex = this.selectedIds.indexOf(item.id); + + if (selectedIndex === -1) { + // If not selected, add to the array and apply the 'act1' class + this.selectedIds.push(item.id); + item.isSelected = true; // Add a property to the item to track selection + } else { + // If already selected, remove from the array and remove the 'act1' class + this.selectedIds.splice(selectedIndex, 1); + item.isSelected = false; + } + console.log(this.selectedIds,'selectedIdsselectedIdsselectedIds'); + }, + search() { + // 根据关键字过滤 this.classlist + if (this.searchKeyword !== '') { + const filteredList = JSON.parse(JSON.stringify(this.orgstulist)).filter(item => { + // 匹配 nickName 或者 id + return item.nickName.includes(this.searchKeyword) || item.id.toString().includes(this.searchKeyword); + }); + // 更新 this.classlist 为过滤后的列表 + this.stulist = filteredList; + } else { + this.fuwei(); + } + }, + fuwei() { + + this.stulist = JSON.parse(JSON.stringify(this.orgstulist)); + }, + highlightSearch(name) { + // 使用正则表达式替换匹配到的 searchKeyword 为带有颜色的文字 + if (this.searchKeyword) { + const regex = new RegExp(this.searchKeyword, 'gi'); + return name.replace(regex, match => `${match}`); + } + return name; + }, getallstu(){ this.$u.get(`https://api.admin-v2.langsi.online/admin-api/v2/ybs-user/page`).then(res => { if (res.code == 0) { - this.stulist=res.data.list - // this.classlist = res.data.list - // this.isloding = false + this.stulist=res.data.list + this.orgstulist = JSON.parse(JSON.stringify(res.data.list)); + } }) @@ -203,5 +284,29 @@ border: 2rpx solid #2D7CE6; } } + .botbtn{ + padding: 32rpx 32rpx 0 32rpx; + margin-left: -32rpx; + position: fixed; + bottom: 0; + width: 750rpx; + height: 200rpx; + background: #FFFFFF; + box-shadow: 0rpx -10rpx 16rpx 0rpx rgba(202,202,202,0.25); + border-radius: 40rpx 40rpx 0rpx 0rpx; + .btn{ + display: flex; + align-items: center; + justify-content: center; + font-size: 28rpx; + font-family:'PingFang','PingFang'; + font-weight: 800; + color: #FFFFFF; + width: 686rpx; + height: 80rpx; + background: linear-gradient(180deg, #74AFFF 0%, #2D7CE6 100%); + border-radius: 104rpx 104rpx 104rpx 104rpx; + } + } } \ No newline at end of file diff --git a/pages/Mystudent/formstu.vue b/pages/Mystudent/formstu.vue index 8a385f5..e174b40 100644 --- a/pages/Mystudent/formstu.vue +++ b/pages/Mystudent/formstu.vue @@ -20,9 +20,11 @@ + v-model="searchKeyword" + placeholder="搜索相关内容..." + class="input" + placeholder-style="color:#C7CDD3" + @input="search()"> @@ -32,51 +34,17 @@ - + - + - - 李斯丹妮 + + - ID：3324 - - - - - - - 平均成绩/分 - - - 6 - - - - - 作业完成度 - - - 80% - - - - - - - - - - - - - 李斯丹妮 - - - ID：3324 + ID：{{item.memberInfo.id}} @@ -101,6 +69,7 @@ + - + {{TextItem.name}} - + - - + + {{partitem.name}} - + - {{quesitem.typeText}} + {{quesitem.number}} {{quesitem.typeText}} - + @@ -59,6 +65,7 @@ itemActive: {}, image: true, tk: null, + selectwrite: [], } }, @@ -66,78 +73,165 @@ this.hearing() }, methods: { - // 听力调取接口渲染 + updatawrite(data){ + this.selectwrite=data + + }, hearing() { - this.$u.get('https://api.admin-v2.langsi.online/admin-api/ielts/paper/list', { - classify: 1 - }).then(res => { - this.listHearing = res.data - let activeindex = {} - let arr = res.data - for (let parper of arr) { - let test = parper.tests[0] - activeindex[parper.id] = 0 - } - this.itemActive = activeindex - }) + this.$u + .get("https://api.admin-v2.langsi.online/admin-api/ielts/paper/list", { + classify: 1, + }) + .then((res) => { + this.listHearing = res.data; + let activeindex = {}; + let arr = res.data; + for (let parper of arr) { + let test = parper.tests[0]; + activeindex[parper.id] = 0; + } + this.itemActive = activeindex; + this.updateSubsetsInListHearing() + console.log(this.listHearing, "this.itemActivethis.itemActive"); + }); }, - // 听力test点击事件 Bages_addActive(TextIndex, id) { - this.itemActive[id] = TextIndex - this.$forceUpdate() + this.itemActive[id] = TextIndex; + this.$forceUpdate(); }, - // 点击变化图表 icon(id) { - this.image = !this.image - this.tk = id + this.image = !this.image; + this.tk = id; if (this.image == false) { - this.tk = id - }else { - this.tk = null + this.tk = id; + } else { + this.tk = null; } }, - checkboxChange(parat, e) { + checkboxChange(partitem, e) { if (e.value) { - this.checked.push(parat.id) - const allItemsNoSubsets = parat.modules.every(item => !('subsets' in item)); - parat.modules.forEach(item=>{ - this.$set(item, 'subsets', item.id); - item.subsets = item.id; - this.subsets.push(item.id) - console.log( item.subsets) - }) - + this.listHearing.forEach((paper) => { + paper.tests.forEach((test, testIndex) => { + test.parts.forEach((part) => { + if (part.id === partitem.id) { + part.modules.forEach((quesitem, quesIndex) => { + this.addToSelectWrite( + quesitem, + partitem.id, + testIndex + 1, + paper.title + ); + }); + } + }); + }); + }); } else { - let index = this.checked.indexOf(parat.id); - if (index !== -1) { - this.checked.splice(index, 1); - parat.modules.forEach(item=>{ - this.$delete(item, 'subsets'); - const index = this.subsets.indexOf(item.id); - if (index !== -1) { - this.subsets.splice(index, 1); - } - }) - - } + partitem.modules.forEach((quesitem) => { + this.removeFromSelectWrite(quesitem.id); + }); } - console.log(this.checked,'part数组') - this.$forceUpdate() + this.$forceUpdate(); + console.log(this.selectwrite, "selectwriteselectwrite"); + console.log(this.listHearing, "this.listHearing"); + // 在这里执行额外的操作，遍历 selectwrite 中的每一项，更新 listHearing 中的 subsets + this.updateSubsetsInListHearing(); + this.$parent.updatalisten(this.selectwrite) }, - checkoutzj(quesitem, id) { - if (id.value) { - this.subsets.push(quesitem.id) - console.log(quesitem) - } else { - let index2 = this.subsets.indexOf(quesitem.id); - if (index2 !== -1) { - this.subsets.splice(index2, 1); - } + handleCheckboxChange(quesitems) { + const existingIndex = this.selectwrite.findIndex(item => item.id === quesitems.id); + + if (existingIndex !== -1) { + // 如果已存在，将 subsets 设为 false，并清除该项 + this.selectwrite.splice(existingIndex, 1); + quesitems.subsets = false; + } else { + // 如果不存在，添加该项，并将 subsets 设为 true + this.listHearing.forEach((paper) => { + paper.tests.forEach((test, testIndex) => { + test.parts.forEach((part) => { + part.modules.forEach((quesitem, quesIndex) => { + if (quesitem.id == quesitems.id) { + this.addToSelectWrite( + quesitems, + quesitems.id, // 使用 quesitem 的 id + testIndex + 1, // 使用内层循环的 testIndex + paper.title // 使用 quesitem 的 paperTitle + ); + } + }); + }); + }); + }); + quesitems.subsets = true; + } + + console.log(this.selectwrite, 'selectwriteselectwrite'); + this.updateSubsetsInListHearing() + this.$parent.updatalisten(this.selectwrite) + }, + + + + // 在这里添加一个新的方法，用于更新 listHearing 中的 subsets + updateSubsetsInListHearing() { + this.listHearing.forEach((paper) => { + paper.tests.forEach((test) => { + test.parts.forEach((part) => { + part.modules.forEach((quesitem) => { + const selected = this.selectwrite.find((item) => { + return item.id === quesitem.id; + }); + if (selected) { + quesitem.subsets = true; + } else { + quesitem.subsets = false; + } + }); + }); + }); + }); + + // 额外的逻辑，遍历 listHearing 中的每一个 part，判断是否全部 modules 的 subsets 都为 true + this.listHearing.forEach((paper) => { + paper.tests.forEach((test) => { + test.parts.forEach((part) => { + part.checked = part.modules.every((quesitem) => quesitem.subsets); + }); + }); + }); + }, + + // 添加信息到selectwrite数组 + addToSelectWrite(quesitem, partId, testIndex, paperTitle) { + // Split the guideText into words + const words = quesitem.guideText.split(/\s+/); + + // Take the first five words excluding "Complete" + const questionname = words.slice(0, 5).filter(word => word !== "Complete").join(' '); + + const item = { + id: quesitem.id, + paperId: quesitem.paperId, + papername: paperTitle, + partId: partId, + testId: quesitem.testId, + testname: `Test ${testIndex}`, + typeName: quesitem.typeText, + questionname: questionname, + }; + + this.selectwrite.push(item); + }, + + removeFromSelectWrite(itemId) { + const index = this.selectwrite.findIndex((item) => item.id === itemId); + if (index !== -1) { + this.selectwrite.splice(index, 1); } - console.log(this.subsets,'题型数组') - } - } + }, + }, } @@ -200,4 +294,4 @@ height: 20rpx; margin-right: 10rpx; } - + \ No newline at end of file diff --git a/pages_teacher/teacher_teachers/components/compose.vue b/pages_teacher/teacher_teachers/components/compose.vue index 4e33ba1..9e8cb11 100644 --- a/pages_teacher/teacher_teachers/components/compose.vue +++ b/pages_teacher/teacher_teachers/components/compose.vue @@ -1,153 +1,232 @@ diff --git a/pages_teacher/teacher_teachers/components/reading.vue b/pages_teacher/teacher_teachers/components/reading.vue index c550597..9196442 100644 --- a/pages_teacher/teacher_teachers/components/reading.vue +++ b/pages_teacher/teacher_teachers/components/reading.vue @@ -9,36 +9,42 @@ - + {{TextItem.name}} - + - - + + {{partitem.name}} - + - {{quesitem.typeText}} + {{quesitem.number}}{{quesitem.typeText}} - + @@ -59,6 +65,7 @@ itemActive: {}, image: true, tk: null, + selectwrite: [], } }, @@ -66,6 +73,10 @@ this.hearing() }, methods: { + updatawrite(data){ + this.selectwrite=data + + }, // 听力调取接口渲染 hearing() { this.$u.get('https://api.admin-v2.langsi.online/admin-api/ielts/paper/list', { @@ -79,6 +90,7 @@ activeindex[parper.id] = 0 } this.itemActive = activeindex + this.updateSubsetsInListHearing() }) }, // 听力test点击事件 @@ -92,51 +104,128 @@ this.tk = id if (this.image == false) { this.tk = id - }else { + } else { this.tk = null } }, - checkboxChange(parat, e) { + checkboxChange(partitem, e) { if (e.value) { - this.checked.push(parat.id) - const allItemsNoSubsets = parat.modules.every(item => !('subsets' in item)); - parat.modules.forEach(item=>{ - this.$set(item, 'subsets', item.id); - item.subsets = item.id; - this.subsets.push(item.id) - console.log( item.subsets) - }) - + this.listHearing.forEach((paper) => { + paper.tests.forEach((test, testIndex) => { + test.parts.forEach((part) => { + if (part.id === partitem.id) { + part.modules.forEach((quesitem, quesIndex) => { + this.addToSelectWrite( + quesitem, + partitem.id, + testIndex + 1, + paper.title + ); + }); + } + }); + }); + }); } else { - let index = this.checked.indexOf(parat.id); - if (index !== -1) { - this.checked.splice(index, 1); - parat.modules.forEach(item=>{ - this.$delete(item, 'subsets'); - const index = this.subsets.indexOf(item.id); - if (index !== -1) { - this.subsets.splice(index, 1); - } - }) - - } + partitem.modules.forEach((quesitem) => { + this.removeFromSelectWrite(quesitem.id); + }); } - console.log(this.checked,'part数组') - this.$forceUpdate() + this.$forceUpdate(); + + // 在这里执行额外的操作，遍历 selectwrite 中的每一项，更新 listHearing 中的 subsets + this.updateSubsetsInListHearing(); + this.$parent.updataread(this.selectwrite) }, - checkoutzj(quesitem, id) { - if (id.value) { - this.subsets.push(quesitem.id) - console.log(quesitem) + handleCheckboxChange(quesitems) { + const existingIndex = this.selectwrite.findIndex(item => item.id === quesitems.id); + + if (existingIndex !== -1) { + // 如果已存在，将 subsets 设为 false，并清除该项 + this.selectwrite.splice(existingIndex, 1); + quesitems.subsets = false; } else { - let index2 = this.subsets.indexOf(quesitem.id); - if (index2 !== -1) { - this.subsets.splice(index2, 1); - } + // 如果不存在，添加该项，并将 subsets 设为 true + this.listHearing.forEach((paper) => { + paper.tests.forEach((test, testIndex) => { + test.parts.forEach((part) => { + part.modules.forEach((quesitem, quesIndex) => { + if (quesitem.id == quesitems.id) { + this.addToSelectWrite( + quesitems, + quesitems.id, // 使用 quesitem 的 id + testIndex + 1, // 使用内层循环的 testIndex + paper.title // 使用 quesitem 的 paperTitle + ); + } + }); + }); + }); + }); + quesitems.subsets = true; } - console.log(this.subsets,'题型数组') - } + + console.log(this.selectwrite, 'selectwriteselectwrite'); + this.updateSubsetsInListHearing() + this.$parent.updataread(this.selectwrite) + }, + + + + // 在这里添加一个新的方法，用于更新 listHearing 中的 subsets + updateSubsetsInListHearing() { + this.listHearing.forEach((paper) => { + paper.tests.forEach((test) => { + test.parts.forEach((part) => { + part.modules.forEach((quesitem) => { + const selected = this.selectwrite.find((item) => { + return item.id === quesitem.id; + }); + if (selected) { + quesitem.subsets = true; + } else { + quesitem.subsets = false; + } + }); + }); + }); + }); + + // 额外的逻辑，遍历 listHearing 中的每一个 part，判断是否全部 modules 的 subsets 都为 true + this.listHearing.forEach((paper) => { + paper.tests.forEach((test) => { + test.parts.forEach((part) => { + part.checked = part.modules.every((quesitem) => quesitem.subsets); + }); + }); + }); + }, + + // 添加信息到selectwrite数组 + addToSelectWrite(quesitem, partId, testIndex, paperTitle) { + // Split the guideText into words + + const item = { + id: quesitem.id, + paperId: quesitem.paperId, + papername: paperTitle, + partId: partId, + testId: quesitem.testId, + testname: `Test ${testIndex}`, + typeName: quesitem.typeText, + questionname: quesitem.number, + }; + + this.selectwrite.push(item); + }, + + removeFromSelectWrite(itemId) { + const index = this.selectwrite.findIndex((item) => item.id === itemId); + if (index !== -1) { + this.selectwrite.splice(index, 1); + } + }, } } @@ -200,4 +289,4 @@ height: 20rpx; margin-right: 10rpx; } - + \ No newline at end of file diff --git a/pages_teacher/teacher_teachers/teacher_addOperation.vue b/pages_teacher/teacher_teachers/teacher_addOperation.vue index eefbc23..350d9a2 100644 --- a/pages_teacher/teacher_teachers/teacher_addOperation.vue +++ b/pages_teacher/teacher_teachers/teacher_addOperation.vue @@ -1,13 +1,21 @@