From cf7acf3d01ee1d0515bf49a83fe0f7f8f415aa3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 1 Nov 2019 10:37:58 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=BB=9F=E8=AE=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/coursesDetail/CoursesLeftNav.js | 12 +-- .../modules/courses/statistics/Statistics.js | 90 ++++++++++++++++--- 2 files changed, 84 insertions(+), 18 deletions(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index ab22c454e..a3597bde5 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -1017,7 +1017,6 @@ class Coursesleftnav extends Component{ return(
- {item.type != "statistics" ?
  • this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={this.props.mainurl===item.category_url&&this.props.location.pathname===item.category_url?"liactive":"clearfix active"} onMouseLeave={(e)=>this.hidesandian(e,key)} onMouseEnter={(e)=>this.showsandian(e,key)}> this.showsandians(e,key,item.category_url,1,item.id,item.type)} className={ item.second_category===undefined?"fl ml20 pd0":item.second_category.length===0?"fl ml20 pd0":this.state.sandiantypes===key?"fl ml20 pd0 ebebeb":"fl ml20 pd0"}> { @@ -1051,7 +1050,7 @@ class Coursesleftnav extends Component{ :""} -
    • : ""} + {/*下拉列表*/} @@ -1154,8 +1153,8 @@ class Coursesleftnav extends Component{ return(
    {/**/} - - {item.type != "statistics" ? + +
  • this.setnavid(e,key,item.id,item.type,item.category_url)} onMouseEnter={(e)=>this.showsandian(e,key)} title={item.name.length<7?"":item.name} @@ -1172,14 +1171,15 @@ class Coursesleftnav extends Component{ item.type==="poll"?: item.type==="attachment"?: item.type==="board"?: - item.type==="course_group"?:"" + item.type==="course_group"?: + item.type==="statistics"? } this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name} {item.task_count===0?"":item.task_count} -
    • : ""} +
      diff --git a/public/react/src/modules/courses/statistics/Statistics.js b/public/react/src/modules/courses/statistics/Statistics.js index 5564215ec..0166000cf 100644 --- a/public/react/src/modules/courses/statistics/Statistics.js +++ b/public/react/src/modules/courses/statistics/Statistics.js @@ -281,14 +281,39 @@ class Statistics extends Component{ }, ]; + + let shixun_homeworktype=false; + let common_homeworktype=false; + let group_homeworktype=false; + let graduationtype=false; + let exercisetype=false; let course_grouptype=false; if(this.props&&this.props.course_modules!=undefined){ {this.props&&this.props.course_modules.map((item,key)=>{ if(item.type==="course_group"){ course_grouptype=true } + + if(item.type==="shixun_homework"){ + shixun_homeworktype=true + } + if(item.type==="common_homework"){ + common_homeworktype=true + } + if(item.type==="group_homework"){ + group_homeworktype=true + } if(item.type==="graduation"){ + graduationtype=true + } + + if(item.type==="exercise"){ + exercisetype=true + } + })} } + + if(course_grouptype===false){ columns.some((item,key)=> { if (item.title === "分班") { @@ -298,25 +323,66 @@ class Statistics extends Component{ } ) } + + if(shixun_homeworktype===false){ + columns.some((item,key)=> { + if (item.title === "实训作业") { + columns.splice(key, 1) + return true + } + } + ) + } + + if(common_homeworktype===false){ + columns.some((item,key)=> { + if (item.title === "普通作业") { + columns.splice(key, 1) + return true + } + } + ) + } + + if(group_homeworktype===false){ + columns.some((item,key)=> { + if (item.title === "分组作业") { + columns.splice(key, 1) + return true + } + } + ) + } + + if(graduationtype===false){ + columns.some((item,key)=> { + if (item.title === "毕设任务") { + columns.splice(key, 1) + return true + } + } + ) + } + + if(exercisetype===false){ + columns.some((item,key)=> { + if (item.title === "试卷") { + columns.splice(key, 1) + return true + } + } + ) + } + // console.log(this.props.isAdmin) - // "user_login": "p94602358", - // "user_name": "卿前程", - // "course_group": "电气工程1805", // 分班 - // "common_score": 0.0, // 普通作业 - // "group_score": 0.0, // 分组作业 - // "practice_score": 747.1000061035156, // 实训作业 - // "exercise_score": 0.0, // 试卷成绩 - // "graduation_score": 0.0, // 毕设成绩 - // "total_score": 747.1000061035156, // 总成绩 - // "rank": 1 // 排名，学生身份才传 const operations = - this.getwork_scoredata(1,group_idss,'desc')} - /> + />} this.derivefun(`/courses/${this.props.match.params.coursesId}/export_member_scores_excel.xlsx`)}>导出 ; return( From f0e2f17b17934534a2b4d6d37fbf5f6ce36d041f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 1 Nov 2019 10:39:09 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../react/src/modules/courses/coursesDetail/CoursesLeftNav.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js index a3597bde5..55f995d72 100644 --- a/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js +++ b/public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js @@ -1172,7 +1172,7 @@ class Coursesleftnav extends Component{ item.type==="attachment"?: item.type==="board"?: item.type==="course_group"?: - item.type==="statistics"? + item.type==="statistics"?:"" } this.selectnavid(e,key,item.id,item.type,item.category_url)}>{item.name} From ffb297d2bb9d1c479c254d1193241c70d53dfad1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Fri, 1 Nov 2019 10:40:50 +0800 Subject: [PATCH 3/5] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Trainingjobsetting.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index f0ed674c0..e6c84d4ce 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -704,6 +704,7 @@ class Trainingjobsetting extends Component { shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0, challenge_settings: array, score_open: this.state.publicwork, + total_score:this.state.CalculateMax } } else { // //非统一配置 @@ -734,6 +735,8 @@ class Trainingjobsetting extends Component { shixun_evaluation: this.state.proportion === "均分比例" ? 0 : this.state.proportion === "经验值比例" ? 1 : this.state.proportion === "自定义分值" ? 2 : 0, challenge_settings: array, score_open: this.state.publicwork, + total_score:this.state.CalculateMax + } } From 85bb7e2371d0dc253994157bc243bcba9f47e2c2 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Fri, 1 Nov 2019 10:42:32 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E7=BB=9F=E8=AE=A1url?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/courses_helper.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/helpers/courses_helper.rb b/app/helpers/courses_helper.rb index 4de15b20f..a28668c6b 100644 --- a/app/helpers/courses_helper.rb +++ b/app/helpers/courses_helper.rb @@ -63,6 +63,8 @@ module CoursesHelper "/courses/#{course.id}/boards/#{course_board.id}" when "course_group" "/courses/#{course.id}/course_groups" + when "statistics" + "/courses/#{course.id}/statistics" end end From d067a5a67fe55757097132a3cad9e3e39089cb8d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 1 Nov 2019 10:44:45 +0800 Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/react/src/modules/courses/new/CoursesNew.js | 1 + public/react/src/modules/courses/new/Goldsubject.js | 1 + 2 files changed, 2 insertions(+) diff --git a/public/react/src/modules/courses/new/CoursesNew.js b/public/react/src/modules/courses/new/CoursesNew.js index 76e5d28f8..8cf60baf3 100644 --- a/public/react/src/modules/courses/new/CoursesNew.js +++ b/public/react/src/modules/courses/new/CoursesNew.js @@ -881,6 +881,7 @@ class CoursesNew extends Component { 资源 讨论 分班 + 统计 )} diff --git a/public/react/src/modules/courses/new/Goldsubject.js b/public/react/src/modules/courses/new/Goldsubject.js index 35a83ed94..1cc17a63d 100644 --- a/public/react/src/modules/courses/new/Goldsubject.js +++ b/public/react/src/modules/courses/new/Goldsubject.js @@ -1002,6 +1002,7 @@ class Goldsubject extends Component { 资源 讨论 分班 + 统计 )}