|
|
@@ -202,9 +202,9 @@ function getMakerSpaceWord(wordData){
|
|
|
plannedEnd_at:wordData['plannedEnd_at'],//计划完成时间
|
|
|
pro_leader:wordData['pro_leader'],//项目负责人
|
|
|
lead_leader:wordData['lead_leader'],//学院牵头领导
|
|
|
- people:(wordData['teacher'].length+wordData['student'].length),//项目组人数
|
|
|
- teacherNum:wordData['teacher'].length,//参与教师人数
|
|
|
- studentNum:wordData['student'].length,//参与学生人数
|
|
|
+ people:(wordData['teacher'].filter(i=>i.name!='').length+wordData['student'].filter(i=>i.name!='').length),//项目组人数
|
|
|
+ teacherNum:wordData['teacher'].filter(i=>i.name!='').length,//参与教师人数
|
|
|
+ studentNum:wordData['student'].filter(i=>i.name!='').length,//参与学生人数
|
|
|
teacher:wordData['teacher'], //教师组//name：姓名 speciality：专业 title：职称 education：学历 section：所在教研室 work：项目组角色分工
|
|
|
student:wordData['student'], //学生组//name：姓名 class：班级 age：年龄 work：项目组任务分工
|
|
|
brief:wordData['brief'],//项目简介
|
|
|
@@ -565,9 +565,9 @@ function getWord2(val){
|
|
|
tel:val.tel,
|
|
|
begin_at:val.btime,
|
|
|
plannedEnd_at:val.etime,
|
|
|
- allnum:val.studentS.length+val.teacherS.length,
|
|
|
- snum:val.studentS.length,
|
|
|
- tnum:val.teacherS.length,
|
|
|
+ allnum:val.studentS.filter(i=>i.name!='').length+val.teacherS.filter(i=>i.name!='').length,
|
|
|
+ snum:val.studentS.filter(i=>i.name!='').length,
|
|
|
+ tnum:val.teacherS.filter(i=>i.name!='').length,
|
|
|
student:val.studentS,
|
|
|
teacher:val.teacherS,
|
|
|
brief:val.brief,
|
SanHQin