From 8624aaf95a57e2be761d99edd5400e3a7e64a458 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 14:42:14 +0800 Subject: [PATCH 01/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 28 +++++++++---------- .../modules/courses/shixunHomework/style.css | 8 ++++++ 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 855f860ef..460799d97 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -100,32 +100,32 @@ class Listofworksstudentone extends Component { key: 'number', align: "center", className: 'font-14', - width: '100px', + width: '90px', render: (text, record) => ( - + {record.number === undefined ? -- : record.number === "" ? -- : record.number === "--" ? -- : {record.number} } @@ -183,31 +183,31 @@ class Listofworksstudentone extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: "center", - className: 'font-14 maxnamewidth145', - width: '145px', + className: 'font-14 maxnamewidth120', + width: '120px', render: (text, record) => ( - {record.stduynumber === undefined ? -- : record.stduynumber === null ? -- : record.stduynumber === "" ? -- : @@ -217,7 +217,7 @@ class Listofworksstudentone extends Component { style={{ color: '#000', textAlign: "center", - width: '145px', + width: '120px', }}>{ record.stduynumber } diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index 657ebded0..3129b640e 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -73,6 +73,14 @@ white-space:nowrap; cursor: default; } + +.maxnamewidth120{ + max-width: 120px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + cursor: default; +} .maxnamewidth145{ max-width: 145px; overflow:hidden; From ab91bf8b4a23c05270f9a1eff08c9da26981a0cd Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Dec 2019 14:46:33 +0800 Subject: [PATCH 02/13] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=9A=84=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/weapps/courses_controller.rb | 4 ++-- app/views/weapps/courses/students.json.jbuilder | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb index cd8300e1e..cb3c195d6 100644 --- a/app/controllers/weapps/courses_controller.rb +++ b/app/controllers/weapps/courses_controller.rb @@ -93,8 +93,8 @@ class Weapps::CoursesController < Weapps::BaseController end if course_group_id.present? - course_group = CourseGroup.find(course_group_id) if course_group_id != 0 - @students = @students.where(course_group_id: course_group&.id.to_i) + @course_group = CourseGroup.find(course_group_id) if course_group_id != 0 + @students = @students.where(course_group_id: @course_group&.id.to_i) end @students_count = @students.size diff --git a/app/views/weapps/courses/students.json.jbuilder b/app/views/weapps/courses/students.json.jbuilder index 5aaaee0aa..15255ef3b 100644 --- a/app/views/weapps/courses/students.json.jbuilder +++ b/app/views/weapps/courses/students.json.jbuilder @@ -1,2 +1,5 @@ json.students student_list @students, @course.excellent -json.students_count @students_count \ No newline at end of file +json.students_count @students_count +json.course_group do + json.(@course_group, :id, :name, :invite_code, :course_members_count) +end \ No newline at end of file From a7a4e56fb0551932de9b6da3a5f47484b46930ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 14:51:59 +0800 Subject: [PATCH 03/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/modules/courses/shixunHomework/Listofworksstudentone.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 17adb5bd3..fa9aa17a5 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -226,9 +226,7 @@ class Listofworksstudentone extends Component { record.stduynumber } - } - ), }, From b8699a96b3c8bf344109fd78b8e58d6b92e2a388 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Dec 2019 15:28:10 +0800 Subject: [PATCH 04/13] =?UTF-8?q?=E5=88=86=E7=8F=AD=E7=9A=84=E5=AD=A6?= =?UTF-8?q?=E7=94=9F=E5=88=97=E8=A1=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/weapps/courses/students.json.jbuilder | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/views/weapps/courses/students.json.jbuilder b/app/views/weapps/courses/students.json.jbuilder index 15255ef3b..40928a1b1 100644 --- a/app/views/weapps/courses/students.json.jbuilder +++ b/app/views/weapps/courses/students.json.jbuilder @@ -1,5 +1,7 @@ json.students student_list @students, @course.excellent json.students_count @students_count -json.course_group do - json.(@course_group, :id, :name, :invite_code, :course_members_count) +if @course_group + json.course_group do + json.(@course_group, :id, :name, :invite_code, :course_members_count) + end end \ No newline at end of file From 7b92c36d0c47a0394de1c752ba18ceddcc966314 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 17:18:12 +0800 Subject: [PATCH 05/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/ShixunHomeworkPage.js | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index ad3eadef4..f98ecf762 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -232,11 +232,9 @@ class ShixunHomeworkPage extends Component { typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status} /> this.gotohome()}>返回 - {teacherdatapage&&teacherdatapage.shixun_status>1?this.props.isAdmin()?实训详情: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?实训详情:"":"":""} + {teacherdatapage&&teacherdatapage.shixun_status>1?实训详情:""} From 0641332a5905e4111027f6322984a620df725490 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 17:30:48 +0800 Subject: [PATCH 06/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 45bbb690a..7c3247351 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -217,7 +217,7 @@ class Listofworksstudentone extends Component { : ( - + {record.classroom === undefined ? - -- : record.classroom === "" ? - -- : record.classroom === null ? - -- : - {record.classroom} } From 3a91fd077c995359cf39059c2e705fa39251cb7d Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Dec 2019 17:38:30 +0800 Subject: [PATCH 07/13] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_works_controller.rb | 1 + app/views/homework_commons/works_list.json.jbuilder | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index a347e062d..e3d4d604a 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -559,6 +559,7 @@ class StudentWorksController < ApplicationController if @work.work_status == 0 @work.work_status = 1 @work.commit_time = Time.now + @work.compelete_status = 1 if @homework.homework_type == "practice" # 分组作业更新分组id @work.group_id = @homework.max_group_id if @homework.homework_type == "group" end diff --git a/app/views/homework_commons/works_list.json.jbuilder b/app/views/homework_commons/works_list.json.jbuilder index e3a5d9b84..fcc3e7a7c 100644 --- a/app/views/homework_commons/works_list.json.jbuilder +++ b/app/views/homework_commons/works_list.json.jbuilder @@ -43,7 +43,7 @@ elsif @user_course_identity == Course::STUDENT json.eff_score work_score_format(@work.eff_score, true, @score_open) json.current_complete_count @work.myshixun.try(:passed_count) if @homework.end_or_late json.complete_count @work.myshixun&.time_passed_count(@homework.homework_group_setting(@work.user_id)&.end_time) - json.view_answer_count @work.myshixun.try(:view_answer_count) + json.view_answer_count @work.myshixun.try(:view_answer_count).to_i json.work_status @work.compelete_status else json.(@work, :id, :work_status, :update_time, :ultimate_score) @@ -100,7 +100,7 @@ if @homework.homework_type == "practice" json.cost_time work.myshixun.try(:total_spend_time) json.current_complete_count work.myshixun.try(:passed_count) if @homework.end_or_late json.complete_count work.myshixun&.time_passed_count(@homework.homework_group_setting(work.user_id)&.end_time) - json.view_answer_count work.myshixun.try(:view_answer_count) + json.view_answer_count work.myshixun.try(:view_answer_count).to_i json.user_login work.user.try(:login) json.user_name work.user.try(:real_name) json.student_id work.user.try(:student_id) From 6a6edf6af3b95b31309590ba9ec45a06fb3aae7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 17:38:33 +0800 Subject: [PATCH 08/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 7c3247351..cb067a055 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -492,8 +492,9 @@ class Listofworksstudentone extends Component { key: 'operating', align: "center", className: 'font-14', + width: '40px', render: (text, record) => ( - + { record.submitstate === "未提交" ? -- : From b2088870cbdabf453f01b40748f9c0e2839c77fa Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Dec 2019 17:49:04 +0800 Subject: [PATCH 09/13] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E4=BD=9C=E4=B8=9A?= =?UTF-8?q?=E4=BD=9C=E5=93=81=E5=88=97=E8=A1=A8=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/student_works_controller.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/app/controllers/student_works_controller.rb b/app/controllers/student_works_controller.rb index e3d4d604a..d71ca8037 100644 --- a/app/controllers/student_works_controller.rb +++ b/app/controllers/student_works_controller.rb @@ -879,6 +879,7 @@ class StudentWorksController < ApplicationController def update_none_commit_work work, homework if work.work_status == 0 work.work_status = 1 + work.compelete_status = 1 work.commit_time = homework.end_time work.update_time = Time.now end From eb1030014dfc98a20c0e0e5d67efdd488ba03717 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Dec 2019 17:58:22 +0800 Subject: [PATCH 10/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index cb067a055..7978e5aa0 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -886,6 +886,8 @@ class Listofworksstudentone extends Component { key: 'operating', align: "center", className: 'font-14', + width: '40px', + render: (text, record) => ( { @@ -1286,6 +1288,8 @@ class Listofworksstudentone extends Component { display: 'block', align: 'center', className: 'font-14', + width: '40px', + render: (text, record) => ( record.submitstate === "未提交" ? ( record.submitstate === "未提交" ? Date: Tue, 17 Dec 2019 17:59:43 +0800 Subject: [PATCH 11/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 7978e5aa0..18b2620a9 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -889,7 +889,7 @@ class Listofworksstudentone extends Component { width: '40px', render: (text, record) => ( - + { record.submitstate === "未提交" ? -- : @@ -1292,7 +1292,7 @@ class Listofworksstudentone extends Component { render: (text, record) => ( record.submitstate === "未提交" ? - this.Viewstudenttraininginformationtysl2(e, record)} onClick={() => this.Viewstudenttraininginformationt(record)}>评阅 : @@ -1654,7 +1654,7 @@ class Listofworksstudentone extends Component { width: '40px', render: (text, record) => ( record.submitstate === "未提交" ? - this.Viewstudenttraininginformationtysl2(e, record)} onClick={() => this.Viewstudenttraininginformationt(record)}>评阅 : From 6791ccaa8adcb5df95d2ec10c7aadc0a7b086c54 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Tue, 17 Dec 2019 18:33:29 +0800 Subject: [PATCH 12/13] =?UTF-8?q?=E9=A2=98=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/helpers/homework_commons_helper.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/helpers/homework_commons_helper.rb b/app/helpers/homework_commons_helper.rb index e82ed41e8..dffc6cf3e 100644 --- a/app/helpers/homework_commons_helper.rb +++ b/app/helpers/homework_commons_helper.rb @@ -225,7 +225,7 @@ module HomeworkCommonsHelper # 作品状态 def practice_homework_status homework, member - [{id: 0, name: "未提交", count: homework.compelete_status_count(member, 0)}, + [{id: 0, name: "未开启", count: homework.compelete_status_count(member, 0)}, {id: 1, name: "未通关", count: homework.compelete_status_count(member, 1)}, {id: 2, name: "按时通关", count: homework.compelete_status_count(member, 2)}, {id: 3, name: "迟交通关", count: homework.compelete_status_count(member, 3)}] From e3afa642f416f605f3b183c6e4e76f964175c3dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Tue, 17 Dec 2019 18:46:02 +0800 Subject: [PATCH 13/13] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../shixunHomework/Listofworksstudentone.js | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 18b2620a9..541176301 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -344,7 +344,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -738,7 +738,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -1091,7 +1091,7 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -1454,7 +1454,7 @@ class Listofworksstudentone extends Component { ) }, { - title: '当前完成关卡', + title: '最新完成关卡', dataIndex: 'curcomlevel', key: 'curcomlevel', align: "center", @@ -3477,22 +3477,22 @@ class Listofworksstudentone extends Component { } if(homewrok===false){ for(var i=0;i