diff --git a/src/assets/images/gratefulteacher/e2.png b/src/assets/images/gratefulteacher/e2.png new file mode 100644 index 00000000..9ceaf751 Binary files /dev/null and b/src/assets/images/gratefulteacher/e2.png differ diff --git a/src/assets/images/gratefulteacher/e3.png b/src/assets/images/gratefulteacher/e3.png new file mode 100644 index 00000000..12a9e36b Binary files /dev/null and b/src/assets/images/gratefulteacher/e3.png differ diff --git a/src/assets/images/gratefulteacher/s1.png b/src/assets/images/gratefulteacher/s1.png index 3487153c..c7c4d276 100644 Binary files a/src/assets/images/gratefulteacher/s1.png and b/src/assets/images/gratefulteacher/s1.png differ diff --git a/src/assets/images/gratefulteacher/success.png b/src/assets/images/gratefulteacher/success.png new file mode 100644 index 00000000..7fcf7df1 Binary files /dev/null and b/src/assets/images/gratefulteacher/success.png differ diff --git a/src/views/gratefulteacher/InstructorCertification.vue b/src/views/gratefulteacher/InstructorCertification.vue index ad09faed..1b29bcc4 100644 --- a/src/views/gratefulteacher/InstructorCertification.vue +++ b/src/views/gratefulteacher/InstructorCertification.vue @@ -98,10 +98,12 @@ const createParam = ref({ name: '', description: '', cover: '', + index:'' }) -const imgClick = (url) => { +const imgClick = (item) => { console.log(url,'url') - createParam.value.cover = url + createParam.value.cover = item.url + createParam.value.index = item.id } //创建认证确定 const handleOk = async () => { @@ -478,7 +480,7 @@ function handleOper(record, type, status = "") { --> -
+
diff --git a/src/views/gratefulteacher/LecturerManagement.vue b/src/views/gratefulteacher/LecturerManagement.vue index 46a54d39..f2c03d01 100644 --- a/src/views/gratefulteacher/LecturerManagement.vue +++ b/src/views/gratefulteacher/LecturerManagement.vue @@ -302,20 +302,26 @@ const getReviewList = async () => { //查看评审 const ViewReList = ref() +const arrayLists = ref([]) const remould = () => { console.log(2222); console.log(ViewReList.value) - let newData = ViewReList.value["认证结果"].map((res, index) => ({ - "认证结果": res, - "姓名": ViewReList.value["姓名"][index], - // "评委-黄盛发10867418": ViewReList.value["评委-黄盛发10867418"][index], - "工号": ViewReList.value["工号"][index], - "平均分": ViewReList.value["平均分"][index] - })); - console.log(99999999); - ViewReviewdata.value = newData - console.log(newData, '基础上九四'); + let keys = Object.keys(ViewReList.value); + arrayLists.value = keys.filter(key => Array.isArray(ViewReList.value[key])); + arrayLists.value.forEach(arrayKey => { + if (!ViewReviewcolumns.some(column => column.key === arrayKey)) { + ViewReviewcolumns.push({ + title: arrayKey, + key: arrayKey, + dataIndex: arrayKey, + }); + } + }); + ViewReviewdata.value = arrayLists.value.map((key, index) => { + return Object.fromEntries([key, ViewReList.value[key][index]]); + }); + console.log(ViewReviewdata.value, '基础上九四'); } const getreviewdetail = async (object) => { ViewReviewShow.value = true @@ -692,6 +698,8 @@ const showViewInstructor =ref(false) const techerDetail = ref(null) const processData = ref() const attestation = ref([]) +const scoreTwo = ref() +const scoreOne = ref() const show= async (record)=>{ showViewInstructor.value=true await getDataById({teacherId:record.teacherId}).then(res=>{ @@ -699,44 +707,48 @@ const show= async (record)=>{ if(res.code == 200){ console.log(res.data,'data') techerDetail.value = res.data + if(techerDetail.value.firstList){ + const totalScore = techerDetail.value.firstList.reduce((acc, item) => acc + item.score, 0); + // 计算平均分 + const averageScore = totalScore / techerDetail.value.firstList.length; + scoreOne.value = averageScore.toFixed(2) + } + if(techerDetail.value.secondList){ + const totalScore = techerDetail.value.secondList.reduce((acc, item) => acc + item.score, 0); + // 计算平均分 + const averageScore = totalScore / techerDetail.value.secondList.length; + scoreTwo.value = averageScore.toFixed(2) + } } }) await getCertificationProcess({teacherId:record.teacherId}).then(res=>{ - console.log(res,'getCertificationProcess') processData.value = res.data //认证流程 attestation.value =[ //0: 已上传 1: 未上传 2:已退回 - {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{ - 0:'su3.png', - 1:'su3.png', - 2:'' - }}, - {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{ - 0:'su4.png', - 1:'s1.png', - 2:'' - }}, - {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoring,images:{ - 0:'su5.png', - 1:'s2.png', - 2:'' - }}, - {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{ - 0:'su1.png', - 1:'s3.png', - 2:'' - }}, - {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{ - 0:'su2.png', - 1:'s4.png', - 2:'e1.png', - 3:'e1.png', - }}, - // {name:'线下辅导已完成',success:'su5.png',error:'',initial:'s2.png'}, - // {name:'终稿已上传',success:'su1.png',error:'',initial:'s3.png'}, - // {name:'认证',success:'su2.png',error:'e1.png',initial:'s4.png'}, + {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'}}, + {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}}, + {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:''}}, + {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'}}, + {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}}, ] + if(processData.value.secondResult == '0'){ + processData.value.draftStatus = 0 + processData.value.onlineLearning = 0 + processData.value.offlineTutoringOne = 0 + processData.value.endStatusOne = 0 + processData.value.reviewResultOne = 1 + attestation.value = [ + {name:{0:'初稿已上传',1:'初稿未上传',2:'初稿已退回'},status:processData?.value.draftStatus,images:{0:'su1.png',1:'s1.png',2:'e2.png'}}, + {name:{0:'线上学习已完成',1:'线上学习未完成',2:'线上学习已退回'},status:processData?.value.onlineLearning,images:{0:'su2.png',1:'s2.png',2:''}}, + {name:{0:'线下辅导已完成',1:'线上辅导未完成',2:'线上辅导已退回'},status:processData?.value.offlineTutoringOne,images:{0:'su3.png',1:'s3.png',2:''}}, + {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatusOne,images:{0:'su4.png',1:'s4.png',2:'e3.png'}}, + {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResultOne,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}}, + {name:{0:'线下辅导已完成',1:'线下辅导未通过',2:'线下辅导已退回'},status:processData?.value.offlineTutoring,images:{0:'su3.png',1:'s3.png',2:''}}, + {name:{0:'终稿已上传',1:'终稿未上传',2:'终稿已退回'},status:processData?.value.endStatus,images:{0:'su4.png',1:'s4.png',2:'e3.png'}}, + {name:{0:'认证已通过',1:'认证未通过',2:'认证进行中',3:'认证已报名'},status:processData?.value.reviewResult,images:{0:'su5.png',2:'su5.png',1:'e1.png',3:'success.png',}}, + ] + } console.log(attestation.value,'value') }) } @@ -979,13 +991,13 @@ const vwtext = ref(null) @@ -1253,9 +1265,9 @@ const vwtext = ref(null)
课程终稿
- + 学习能力提升课件.pptx - 下载 + 下载
上传时间
{{techerDetail?.uploadTime}}
@@ -1270,59 +1282,33 @@ const vwtext = ref(null)
- +
{{item.name[item.status]}}
- -
评委打分信息表：
- - + +
二次认证
评委打分信息表：
- - + +
@@ -1532,4 +1518,17 @@ const vwtext = ref(null) justify-content: center; align-items: center; } +::v-deep .ant-table-footer{ + background-color: #ffffff, +} +.footer_table{ + display: flex; + justify-content: space-between; + .footer_left{ + margin-left: 84px; + } + .footer_right{ + margin-right: 85px; + } +}