diff --git a/src/views/faceteach/FaceTeach.vue b/src/views/faceteach/FaceTeach.vue index 6a4cbda..772c24e 100644 --- a/src/views/faceteach/FaceTeach.vue +++ b/src/views/faceteach/FaceTeach.vue @@ -327,9 +327,7 @@ const { data } = useRequest(STU_OFFCOURSE_DETAIL, { }); watch(data, (newVal) => { // newVal.planDto.offteachers.map(item => teacherInfos(item.teacherId)); - const teacherIdsArray = newVal.planDto.offteachers - .filter(item => item.teacherName !== 'BOE教师') - .map(item => item.teacherId); + const teacherIdsArray = newVal.planDto.offteachers.map(item => item.teacherId); const teacherItemArr = [] teacherIdsArray.forEach(id => { teacherItemArr.push(boeRequest(GET_USER_INFO_OLDURL, { userId: id })) @@ -342,6 +340,8 @@ watch(data, (newVal) => { ? userInfo?.avatar : '/upload' + userInfo?.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'; + const index = teacherIdsArray.indexOf(userInfo.userId) + userInfo.realName = newVal.planDto.offteachers[index].teacherName teacherItem.value.push(userInfo) }) }).catch(error => { diff --git a/src/views/faceteach/FaceTeachNoCommon.vue b/src/views/faceteach/FaceTeachNoCommon.vue index fbfe3f8..4299069 100644 --- a/src/views/faceteach/FaceTeachNoCommon.vue +++ b/src/views/faceteach/FaceTeachNoCommon.vue @@ -136,9 +136,7 @@ const { const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); watch(data, (newVal) => { // newVal.planDto.offteachers.map(item => teacherInfos(item.teacherId)); - const teacherIdsArray = newVal.planDto.offteachers - .filter(item => item.teacherName !== 'BOE教师') - .map(item => item.teacherId); + const teacherIdsArray = newVal.planDto.offteachers.map(item => item.teacherId); const teacherItemArr = [] teacherIdsArray.forEach(id => { teacherItemArr.push(boeRequest(GET_USER_INFO_OLDURL, { userId: id })) @@ -151,6 +149,8 @@ watch(data, (newVal) => { ? userInfo?.avatar : '/upload' + userInfo?.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'; + const index = teacherIdsArray.indexOf(userInfo.userId) + userInfo.realName = newVal.planDto.offteachers[index].teacherName teacherItem.value.push(userInfo) }) }).catch(error => { diff --git a/src/views/faceteach/FaceTeachNoCourse.vue b/src/views/faceteach/FaceTeachNoCourse.vue index 0ed5388..f125e54 100644 --- a/src/views/faceteach/FaceTeachNoCourse.vue +++ b/src/views/faceteach/FaceTeachNoCourse.vue @@ -134,9 +134,7 @@ const { const {data} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); watch(data, (newVal) => { // newVal.planDto.offteachers.map(item => teacherInfos(item.teacherId)); - const teacherIdsArray = newVal.planDto.offteachers - .filter(item => item.teacherName !== 'BOE教师') - .map(item => item.teacherId); + const teacherIdsArray = newVal.planDto.offteachers.map(item => item.teacherId); const teacherItemArr = [] teacherIdsArray.forEach(id => { teacherItemArr.push(boeRequest(GET_USER_INFO_OLDURL, { userId: id })) @@ -149,6 +147,8 @@ watch(data, (newVal) => { ? userInfo?.avatar : '/upload' + userInfo?.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'; + const index = teacherIdsArray.indexOf(userInfo.userId) + userInfo.realName = newVal.planDto.offteachers[index].teacherName teacherItem.value.push(userInfo) }) }).catch(error => { diff --git a/src/views/faceteach/FaceTeachSignUp.vue b/src/views/faceteach/FaceTeachSignUp.vue index bc8a349..ae004e8 100644 --- a/src/views/faceteach/FaceTeachSignUp.vue +++ b/src/views/faceteach/FaceTeachSignUp.vue @@ -348,9 +348,7 @@ const {data = {}} = useRequest(STU_OFFCOURSE_DETAIL, {courseId}); console.log(data.value); watch(data, (newVal) => { // newVal.planDto.offteachers.map(item => teacherInfos(item.teacherId)); - const teacherIdsArray = newVal.planDto.offteachers - .filter(item => item.teacherName !== 'BOE教师') - .map(item => item.teacherId); + const teacherIdsArray = newVal.planDto.offteachers.map(item => item.teacherId); const teacherItemArr = [] teacherIdsArray.forEach(id => { teacherItemArr.push(boeRequest(GET_USER_INFO_OLDURL, { userId: id })) @@ -363,6 +361,8 @@ watch(data, (newVal) => { ? userInfo?.avatar : '/upload' + userInfo?.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'; + const index = teacherIdsArray.indexOf(userInfo.userId) + userInfo.realName = newVal.planDto.offteachers[index].teacherName teacherItem.value.push(userInfo) }) }).catch(error => { diff --git a/src/views/faceteach/FaceTeachStuSign.vue b/src/views/faceteach/FaceTeachStuSign.vue index dfc7d1c..d7fab5b 100644 --- a/src/views/faceteach/FaceTeachStuSign.vue +++ b/src/views/faceteach/FaceTeachStuSign.vue @@ -187,9 +187,7 @@ const { query: { courseId }} = useRoute(); const { data } = useRequest(STU_OFFCOURSE_DETAIL, { courseId, usePermission: true, }); watch(data, (newVal) => { // newVal.planDto.offteachers.map(item => teacherInfos(item.teacherId)); - const teacherIdsArray = newVal.planDto.offteachers - .filter(item => item.teacherName !== 'BOE教师') - .map(item => item.teacherId); + const teacherIdsArray = newVal.planDto.offteachers.map(item => item.teacherId); const teacherItemArr = [] teacherIdsArray.forEach(id => { teacherItemArr.push(boeRequest(GET_USER_INFO_OLDURL, { userId: id })) @@ -202,6 +200,8 @@ watch(data, (newVal) => { ? userInfo?.avatar : '/upload' + userInfo?.avatar : '/800e23f7-b58c-4192-820d-0c6a2b7544cc.png'; + const index = teacherIdsArray.indexOf(userInfo.userId) + userInfo.realName = newVal.planDto.offteachers[index].teacherName teacherItem.value.push(userInfo) }) }).catch(error => {