From a6428c0b532ba41ca6633fc9dfff11b4ceb03845 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 14:41:11 +0800 Subject: [PATCH 01/14] =?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/poll/PollNew.js | 58 ++++++++++++++----- 1 file changed, 44 insertions(+), 14 deletions(-) diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index 7384c7f6e..8740a9bbf 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -893,7 +893,6 @@ class PollNew extends Component { //保存并继续 //保存并继续，即提交本题的新建并继续创建一个相同的题（该新题处于编辑模式，题目和选项不要清空） Deleteadddomtwo = (indexo, object,bool) => { - debugger var thiss = this; @@ -1038,7 +1037,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); + this.props.showNotification(`可选的最大限制不能小于最小限制`); return; } } @@ -1258,7 +1257,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); + this.props.showNotification(`可选的最大限制不能小于最小限制`); return; } } @@ -1449,9 +1448,7 @@ class PollNew extends Component { // indexo 第几个数组 //object 单个数组数据 Deleteadddomthree = (indexo, object,bool) => { - this.setState({ - newoption: false, - }) + // console.log("deleteadddom 349") var thiss = this; let arr = this.state.adddom; @@ -1477,9 +1474,14 @@ class PollNew extends Component { } if (newarr[indexo].question.question_title === "") { this.props.showNotification('题目不能为空！'); + return + } + if (newarr[indexo].question.question_title.match(/^[ ]*$/)) { + this.props.showNotification('题目不能为空！'); return } + if (max > 0) { if (object.question.question_type === 1) { this.props.showNotification('选项内容不能为空！'); @@ -1579,7 +1581,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); + this.props.showNotification(`可选的最大限制不能小于最小限制`); return; } } @@ -1790,7 +1792,7 @@ class PollNew extends Component { if(object.question.max_choices){ if(object.question.max_choices>0){ if (object.question.max_choices < object.question.min_choices) { - this.props.showNotification(`可选：最小和最大限制须同时为数值或者“--"`); + this.props.showNotification(`可选的最大限制不能小于最小限制`); return; } } @@ -1867,7 +1869,6 @@ class PollNew extends Component { }; question = {"question": questiontwo}; //插入多选题 - if (uuk !== -1) { // console.log("修改") this.edittotheserver(object, 2, arrc, null, object.question.max_choices, object.question.min_choices,object.question.answers.length); @@ -2016,10 +2017,11 @@ class PollNew extends Component { if (result !== undefined) { if (result.data.status === 0) { this.props.showNotification(`已完成`); - thiss.thisinitializationdatanew(); this.setState({ Newdisplay:false, + newoption: false, + }) // console.log("确认创建问题") // console.log(result) @@ -2032,11 +2034,24 @@ class PollNew extends Component { // // } } + }else{ + this.setState({ + Newdisplay:true, + newoption: false, + + }) } // } catch (e) { // // } + }).catch((error) => { + console.log(error) + this.setState({ + Newdisplay:true, + newoption: false, + + }) }) @@ -2096,11 +2111,24 @@ class PollNew extends Component { if (result.data.status === 0) { this.props.showNotification(`编辑题目成功`); thiss.thisinitializationdatanew(); + this.setState({ + Newdisplay:false, + newoption: false, + }) } } catch (e) { // console.log("调用了edittotheserver") - console.log(e) + this.setState({ + Newdisplay:true, + newoption: false, + }) } + }).catch((error) => { + console.log(error) + this.setState({ + Newdisplay:true, + newoption: false, + }) }) } @@ -2685,7 +2713,8 @@ class PollNew extends Component { // console.log("2301"); // console.log(newr); // window.history.pushState('','',newUrl+'?tab='+e); - window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`; + + // window.location.href = `/courses/${coursesId}/polls/${result.data.data.id}/edit`; }) } else { @@ -2773,6 +2802,7 @@ class PollNew extends Component { height: '30px', lineHeight: '30px', }; + const hejiine=this.state.mysingles + this.state.mydoubles + this.state.mymainsint; // console.log(this.state.projects===undefined?"":this.state.projects.poll_questions) var displaymysave = (mysave === true) ? "" : "display:none;"; @@ -2942,7 +2972,7 @@ class PollNew extends Component { { - this.state.mysingles + this.state.mydoubles + this.state.mymainsint === 0 ? "" : + hejiine=== 0 ? "" :
{this.state.mysingles === 0 ? "" : 合计 {this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : this.state.mysingles + this.state.mydoubles + this.state.mymainsint} 题 + className="color-blue">{this.state.mysingles === undefined ? "" : this.state.mydoubles === undefined ? "" : this.state.mymainsint === undefined ? "" : hejiine} 题
} From fbd1d015e1070331b1a6e7fee13dd37be0b47879 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 15:24:33 +0800 Subject: [PATCH 02/14] =?UTF-8?q?=E3=80=90=E4=BC=98=E5=8C=96=E3=80=91?= =?UTF-8?q?=E8=B7=B3=E5=85=B3=E9=BB=98=E8=AE=A4=E6=98=AF=E5=8B=BE=E9=80=89?= =?UTF-8?q?=E7=9A=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- db/migrate/20191216071931_modify_task_pass_for_shixuns.rb | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 db/migrate/20191216071931_modify_task_pass_for_shixuns.rb diff --git a/db/migrate/20191216071931_modify_task_pass_for_shixuns.rb b/db/migrate/20191216071931_modify_task_pass_for_shixuns.rb new file mode 100644 index 000000000..b1e4372ff --- /dev/null +++ b/db/migrate/20191216071931_modify_task_pass_for_shixuns.rb @@ -0,0 +1,5 @@ +class ModifyTaskPassForShixuns < ActiveRecord::Migration[5.2] + def change + change_column :shixuns, :task_pass, :boolean, :default => true + end +end From bc6b8cf113c11c4af22d462d126623b995b33abc Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 16 Dec 2019 15:42:04 +0800 Subject: [PATCH 03/14] =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E5=8F=82=E6=95=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/views/homework_commons/index.json.jbuilder | 1 + 1 file changed, 1 insertion(+) diff --git a/app/views/homework_commons/index.json.jbuilder b/app/views/homework_commons/index.json.jbuilder index 35f321f45..db3603746 100644 --- a/app/views/homework_commons/index.json.jbuilder +++ b/app/views/homework_commons/index.json.jbuilder @@ -38,6 +38,7 @@ json.homeworks @homework_commons.each do |homework| current_myshixun = homework.user_work(@user.id).try(:myshixun) myshixun = current_myshixun ? current_myshixun : shixun.myshixuns.find_by(user_id: @user.id) # json.game_count current_myshixun ? current_myshixun.exec_count : 0 + json.shixun_status shixun.try(:status).to_i json.task_operation task_operation_url(myshixun, shixun) else work = homework.user_work(@user.id) From e70c09527351458b2265ca795ea51ac87e901ace Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 15:47:48 +0800 Subject: [PATCH 04/14] 1 --- app/controllers/shixuns_controller.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index f75dd7147..84ceacd26 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -400,13 +400,14 @@ class ShixunsController < ApplicationController @shixun.shixun_info.update_attributes(shixun_info_params) # 镜像变动 @shixun.shixun_mirror_repositories.where.not(mirror_repository_id: old_mirror_ids).destroy_all - @shixun.shixun_mirror_repositories.create!(new_mirror_id) + @shixun.shixun_mirror_repositories.create!(new_mirror_id) if new_mirror_id.present? # 镜像变动要更换服务配置 @shixun.shixun_service_configs.where.not(mirror_repository_id: old_mirror_ids).destroy_all - @shixun.shixun_service_configs.create!(service_create_params) + @shixun.shixun_service_configs.create!(service_create_params) if service_create_params.present? service_update_params&.map do |service| smr = @shixun.shixun_service_configs.find_by(mirror_repository_id: service[:mirror_repository_id]) - smr.update_attributes(service) + logger.info("########smr: #{smr}") + smr.update_attributes(service) if smr.present? end # 添加第二仓库（管理员权限） if params[:is_secret_repository] From 562a1fd49a63ac1ec8d2738813e0e89332cd0d29 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 15:48:03 +0800 Subject: [PATCH 05/14] add log --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 84ceacd26..23537d480 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -407,7 +407,7 @@ class ShixunsController < ApplicationController service_update_params&.map do |service| smr = @shixun.shixun_service_configs.find_by(mirror_repository_id: service[:mirror_repository_id]) logger.info("########smr: #{smr}") - smr.update_attributes(service) if smr.present? + smr.update_attributes(service) end # 添加第二仓库（管理员权限） if params[:is_secret_repository] From e69b4b7a37b7a4cd8a0090f36cc4cc82e131359a Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 15:57:30 +0800 Subject: [PATCH 06/14] mirrorname --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index bda4bcc6c..165b33989 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -467,7 +467,7 @@ class ApplicationController < ActionController::Base list = [] mirrors = MirrorRepository.select([:id, :type_name, :description]).published_main_mirror mirrors.try(:each) do |mirror| - list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description)} + list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name} end list end @@ -477,7 +477,7 @@ class ApplicationController < ActionController::Base list = [] mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror mirrors.try(:each) do |mirror| - list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description} + list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name} end list end From 617e6f2b62c393096d7df105ac4a20e8b92c8389 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 16:00:05 +0800 Subject: [PATCH 07/14] fix bug --- app/controllers/application_controller.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 165b33989..9630caaec 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -465,7 +465,7 @@ class ApplicationController < ActionController::Base # 实训主类别列表，自带描述 def shixun_main_type list = [] - mirrors = MirrorRepository.select([:id, :type_name, :description]).published_main_mirror + mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_main_mirror mirrors.try(:each) do |mirror| list << {id: mirror.id, type_name: mirror.type_name, description: mirror.try(:description), mirror_name: mirror.name} end @@ -475,7 +475,7 @@ class ApplicationController < ActionController::Base # 小类别列表 def shixun_small_type list = [] - mirrors = MirrorRepository.select([:id, :type_name, :description]).published_small_mirror + mirrors = MirrorRepository.select([:id, :type_name, :description, :name]).published_small_mirror mirrors.try(:each) do |mirror| list << {id: mirror.id, type_name: mirror.type_name, description: mirror.description, mirror_name: mirror.name} end From eccca56a3ac077b9da3e792621b2d3cefa041794 Mon Sep 17 00:00:00 2001 From: daiao <358551898@qq.com> Date: Mon, 16 Dec 2019 16:08:26 +0800 Subject: [PATCH 08/14] =?UTF-8?q?=E4=BF=9D=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/controllers/shixuns_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/shixuns_controller.rb b/app/controllers/shixuns_controller.rb index 23537d480..84ceacd26 100644 --- a/app/controllers/shixuns_controller.rb +++ b/app/controllers/shixuns_controller.rb @@ -407,7 +407,7 @@ class ShixunsController < ApplicationController service_update_params&.map do |service| smr = @shixun.shixun_service_configs.find_by(mirror_repository_id: service[:mirror_repository_id]) logger.info("########smr: #{smr}") - smr.update_attributes(service) + smr.update_attributes(service) if smr.present? end # 添加第二仓库（管理员权限） if params[:is_secret_repository] From de0836a3d5542cec2c8d698946b12c0ca5dafadb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 18:05:59 +0800 Subject: [PATCH 09/14] =?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 | 265 +++++++++++++----- 1 file changed, 196 insertions(+), 69 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index ab75b6c89..435a9ca6e 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -46,6 +46,7 @@ const {Option} = Select; //作品列表(学生) let allow_lates=false; let answer_open_evaluation=false; +// Curcomlevel class Listofworksstudentone extends Component { //unifiedsetting 统一设置 //allowreplenishment 允许补交 @@ -269,7 +270,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -277,15 +278,17 @@ class Listofworksstudentone extends Component { width: '98px', render: (text, record) => ( - {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} + } : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center", width: '98px',} + : record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px',} + : { + color: '#747A7F', + textAlign: "center", + width: '98px', + }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} ), @@ -310,14 +313,14 @@ class Listofworksstudentone extends Component { } }> {record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" : - {record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time} + } + >{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time} } @@ -340,7 +343,26 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '完成情况', + title: '当前完成关卡', + dataIndex: 'curcomlevel', + key: 'curcomlevel', + align: "center", + className: 'font-14', + width: '99px', + render: (text, record) => ( + + {record.Curcomlevel + "/" + this.state.challenges_count} + + ), + }, + { + title: '截止前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -359,7 +381,9 @@ class Listofworksstudentone extends Component { ), }, { - title: '关卡得分', + title:关卡得分 + 截止前学员完成的关卡才有成绩
+ }>, dataIndex: 'levelscore', key: 'levelscore', align: 'center', @@ -638,7 +662,7 @@ class Listofworksstudentone extends Component { ), }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: "center", @@ -646,15 +670,17 @@ class Listofworksstudentone extends Component { width: '98px', render: (text, record) => ( - {record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} + } : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center", width: '98px',} + : record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px',} + : { + color: '#747A7F', + textAlign: "center", + width: '98px', + }}>{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate} ), @@ -709,7 +735,26 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '完成情况', + title: '当前完成关卡', + dataIndex: 'curcomlevel', + key: 'curcomlevel', + align: "center", + className: 'font-14', + width: '99px', + render: (text, record) => ( + + {record.Curcomlevel + "/" + this.state.challenges_count} + + ), + }, + { + title: '截止前完成关卡', dataIndex: 'completion', key: 'completion', align: "center", @@ -728,7 +773,9 @@ class Listofworksstudentone extends Component { ), }, { - title: '关卡得分', + title:关卡得分 + 截止前学员完成的关卡才有成绩
+ }>, dataIndex: 'levelscore', key: 'levelscore', align: 'center', @@ -967,19 +1014,21 @@ class Listofworksstudentone extends Component { ) }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', className: 'font-14', render: (text, record) => ( - {record.submitstate} + } : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"} + : record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px'} + : { + color: '#747A7F', + textAlign: "center" + }}>{record.submitstate} ) @@ -1036,7 +1085,26 @@ class Listofworksstudentone extends Component { // ), // }, { - title: '完成情况', + title: '当前完成关卡', + dataIndex: 'curcomlevel', + key: 'curcomlevel', + align: "center", + className: 'font-14', + width: '99px', + render: (text, record) => ( + + {record.Curcomlevel + "/" + this.state.challenges_count} + + ), + }, + { + title: '截止前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center', @@ -1051,7 +1119,9 @@ class Listofworksstudentone extends Component { ) }, { - title: '关卡得分', + title:关卡得分 + 截止前学员完成的关卡才有成绩
+ }>, dataIndex: 'levelscore', key: 'levelscore', align: 'center', @@ -1094,12 +1164,12 @@ class Listofworksstudentone extends Component { { record.efficiencyscore && record.efficiencyscore === "--" ? ( this.state.allow_late && this.state.allow_late === false ? - + -- : this.state.allow_late && this.state.allow_late === true ? - + -- : @@ -1315,19 +1385,21 @@ class Listofworksstudentone extends Component { ) }, { - title: '提交状态', + title: '作品状态', dataIndex: 'submitstate', key: 'submitstate', align: 'center', className: 'font-14', render: (text, record) => ( - {record.submitstate} + } : record.submitstate === "按时通关" ? {color: '#29BD8B', textAlign: "center"} + : record.submitstate === "未通关" ? {color: '#F69707', textAlign: "center", width: '98px'} + : { + color: '#747A7F', + textAlign: "center" + }}>{record.submitstate} ) @@ -1360,20 +1432,39 @@ class Listofworksstudentone extends Component { } }> {record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" : - {record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time} - + } + >{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time} + } ) }, { - title: '完成情况', + title: '当前完成关卡', + dataIndex: 'curcomlevel', + key: 'curcomlevel', + align: "center", + className: 'font-14', + width: '99px', + render: (text, record) => ( + + {record.Curcomlevel + "/" + this.state.challenges_count} + + ), + }, + { + title: '截止前完成关卡', dataIndex: 'completion', key: 'completion', align: 'center', @@ -1388,7 +1479,9 @@ class Listofworksstudentone extends Component { ) }, { - title: '关卡得分', + title:关卡得分 + 截止前学员完成的关卡才有成绩
+ }>, dataIndex: 'levelscore', key: 'levelscore', align: 'center', @@ -1431,12 +1524,12 @@ class Listofworksstudentone extends Component { { record.efficiencyscore && record.efficiencyscore === "--" ? ( this.state.allow_late && this.state.allow_late === false ? - + -- : this.state.allow_late && this.state.allow_late === true ? - + -- : @@ -1977,7 +2070,7 @@ class Listofworksstudentone extends Component { stduynumber: teacherdata.student_id, classroom: teacherdata.group_name, cost_time: teacherdata.cost_time, - submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交", + submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -1991,6 +2084,7 @@ class Listofworksstudentone extends Component { ultimate_score: teacherdata.ultimate_score, user_name: teacherdata.user_name, user_login: teacherdata.user_login, + Curcomlevel: teacherdata.current_complete_count===undefined||teacherdata.current_complete_count===null||teacherdata.current_complete_count===""?0:teacherdata.current_complete_count, }) // } @@ -2019,7 +2113,7 @@ class Listofworksstudentone extends Component { stduynumber: student_works[i].student_id, classroom: student_works[i].group_name, cost_time: student_works[i].cost_time, - submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" : student_works[i].work_status === 2 ? "延时完成" : "未提交", + submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -2033,6 +2127,7 @@ class Listofworksstudentone extends Component { ultimate_score: student_works[i].ultimate_score, user_name: student_works[i].user_name, user_login: student_works[i].user_login, + Curcomlevel:student_works[i].current_complete_count===null||student_works[i].current_complete_count===null||student_works[i].current_complete_count===""?0:student_works[i].current_complete_count, }) } @@ -2178,7 +2273,7 @@ class Listofworksstudentone extends Component { stduynumber: teacherdata.student_id, classroom: teacherdata.group_name, cost_time: teacherdata.cost_time, - submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "按时完成" : teacherdata.work_status === 2 ? "延时完成" : "未提交", + submitstate: teacherdata.work_status === 0 ? "未提交" : teacherdata.work_status === 1 ? "未通关" : teacherdata.work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -2192,6 +2287,8 @@ class Listofworksstudentone extends Component { ultimate_score: teacherdata.ultimate_score, user_name: teacherdata.user_name, user_login: teacherdata.user_login, + Curcomlevel: teacherdata.current_complete_count===null|| teacherdata.current_complete_count===undefined|| teacherdata.current_complete_count===""?0: teacherdata.current_complete_count, + }) // } @@ -2537,7 +2634,7 @@ class Listofworksstudentone extends Component { stduynumber: student_works[i].student_id, classroom: student_works[i].group_name, cost_time: student_works[i].cost_time, - submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "按时完成" : student_works[i].work_status === 2 ? "延时完成" : "未提交", + submitstate: student_works[i].work_status === 0 ? "未提交" : student_works[i].work_status === 1 ? "未通关" : student_works[i].work_status === 2 ? "按时通关" : "迟交通关", // updatetime:this.state.teacherdata.student_works[i].update_time, // updatetime:"", updatetime: timedata === "Invalid date" ? "--" : timedata, @@ -2551,6 +2648,7 @@ class Listofworksstudentone extends Component { ultimate_score: student_works[i].ultimate_score, user_name: student_works[i].user_name, user_login: student_works[i].user_login, + Curcomlevel: student_works[i].current_complete_count===undefined||student_works[i].current_complete_count===null||student_works[i].current_complete_count===""?0:student_works[i].current_complete_count, }) } @@ -3356,13 +3454,42 @@ class Listofworksstudentone extends Component { } render() { - let {columns, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state; + let {columns,columnss, course_groupysls, datajs, isAdmin, homework_status, course_groupyslstwo, unlimited, unlimitedtwo, course_group_info, orders, task_status, checkedValuesine, searchtext, teacherlist, visible, visibles, game_list, columnsstu, columnsstu2, limit, experience, boolgalist, viewtrainingdata, teacherdata, page, data, jobsettingsdata, styletable, datas, order, loadingstate, computeTimetype} = this.state; const antIcon = ; let course_is_end = this.props.current_user && this.props.current_user.course_is_end; // console.log("Listofworksstudentone.js"); // console.log(orders); - + let homewrok=false; + if(homework_status && homework_status.length > 0){ + for(var i=0;i tr > th, .ant-table-tbody > tr > td { - padding: 9px; + padding: 0px; } `}
@@ -3846,10 +3973,10 @@ class Listofworksstudentone extends Component { {teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" : {teacherdata.left_time.status} } - {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : - {teacherdata.left_time.time} - } + {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : + {teacherdata.left_time.time} + } @@ -3901,7 +4028,7 @@ class Listofworksstudentone extends Component { height: 58px; } .ysltableow .ant-table-thead > tr > th, .ant-table-tbody > tr > td { - padding: 9px; + padding: 0px; } `}
@@ -4005,7 +4132,7 @@ class Listofworksstudentone extends Component { height: 58px; } .ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td { - padding: 9px; + padding: 0px; } ` } @@ -4043,9 +4170,9 @@ class Listofworksstudentone extends Component { {teacherdata === undefined ? "" : teacherdata.left_time === undefined ? "" : teacherdata.left_time === null ? "" : {teacherdata.left_time.status}} - {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : - {teacherdata.left_time.time}} + {teacherdata === undefined ? "0" : teacherdata.left_time === undefined ? "0" : teacherdata.left_time === null ? "0" : + {teacherdata.left_time.time}}
From 62fab14f3c014935122918cd9af6b768f6096735 Mon Sep 17 00:00:00 2001 From: cxt <853663049@qq.com> Date: Mon, 16 Dec 2019 18:24:15 +0800 Subject: [PATCH 10/14] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E5=88=86?= =?UTF-8?q?=E7=8F=AD=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 | 9 +++++++++ app/views/weapps/courses/course_groups.json.jbuilder | 6 ++++++ 2 files changed, 15 insertions(+) create mode 100644 app/views/weapps/courses/course_groups.json.jbuilder diff --git a/app/controllers/weapps/courses_controller.rb b/app/controllers/weapps/courses_controller.rb index a30fdfa4c..cd8300e1e 100644 --- a/app/controllers/weapps/courses_controller.rb +++ b/app/controllers/weapps/courses_controller.rb @@ -167,6 +167,15 @@ class Weapps::CoursesController < Weapps::BaseController normal_status(0, "修改成功") end + # 分班列表 + def course_groups + @course_groups = @course.course_groups + @course_groups = @course_groups.where("name like ?", "%#{params[:search]}%") unless params[:search].blank? + @all_group_count = @course_groups.size + @teachers = @course.teachers.includes(:user, :teacher_course_groups) if @user_course_identity < Course::NORMAL + @current_group_id = @course.students.where(user_id: current_user.id).take&.course_group_id if @user_course_identity == Course::STUDENT + end + private def course_params diff --git a/app/views/weapps/courses/course_groups.json.jbuilder b/app/views/weapps/courses/course_groups.json.jbuilder new file mode 100644 index 000000000..746935f60 --- /dev/null +++ b/app/views/weapps/courses/course_groups.json.jbuilder @@ -0,0 +1,6 @@ +json.course_groups @course_groups.each do |group| + json.(group, :id, :course_members_count, :name) +end + +json.none_group_member_count @course.none_group_count +json.group_count @all_group_count \ No newline at end of file From 001a40a1438fd2d4be793f2c8374dfa0dd5dd593 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Mon, 16 Dec 2019 18:44:06 +0800 Subject: [PATCH 11/14] =?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/AppConfig.js | 2 +- .../modules/courses/shixunHomework/ShixunHomeworkPage.js | 8 +++++--- .../modules/courses/shixunHomework/ShixunhomeWorkItem.js | 3 ++- .../src/modules/courses/shixunHomework/shixunHomework.js | 2 +- 4 files changed, 9 insertions(+), 6 deletions(-) diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js index acd18e6c3..0356f25f1 100644 --- a/public/react/src/AppConfig.js +++ b/public/react/src/AppConfig.js @@ -35,7 +35,7 @@ if (isDev) { // 老师 //ebugType="teacher"; // 学生 -// debugType="student"; +//debugType="student"; window._debugType = debugType; export function initAxiosInterceptors(props) { diff --git a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js index 05a3eb5cd..ad3eadef4 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunHomeworkPage.js @@ -232,9 +232,11 @@ class ShixunHomeworkPage extends Component { typelist={teacherdatapage === undefined ? [""] : teacherdatapage.homework_status} /> this.gotohome()}>返回 - {teacherdatapage&&teacherdatapage.shixun_status>1?1?this.props.isAdmin()?实训详情:""} + target={"_blank"}>实训详情: this.props.isStudent()?teacherdatapage&&teacherdatapage.time_status<5?实训详情:"":"":""}
@@ -336,7 +338,7 @@ class ShixunHomeworkPage extends Component { {teacherdatapage.commit_des} } - {teacherdatapage === undefined ? "" :teacherdatapage&&teacherdatapage.shixun_status>1?1&&teacherdatapage&&teacherdatapage.time_status<5?:""} diff --git a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js index fc39effdd..a9bea3118 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunhomeWorkItem.js @@ -371,6 +371,7 @@ class ShixunhomeWorkItem extends Component{ {this.props.isStudent===true?this.props.course_identity===5?discussMessage&&discussMessage.shixun_status>1? + discussMessage.time_status<5? {startbtn===false? (discussMessage.task_operation[0] == '继续挑战' || discussMessage.task_operation[0] == '查看实战' ? @@ -381,7 +382,7 @@ class ShixunhomeWorkItem extends Component{ this.taskoperationId(discussMessage.task_operation[1])}> {discussMessage.task_operation[0]} ):开启中} - :"":"":"" + :"":"":"":"" } diff --git a/public/react/src/modules/courses/shixunHomework/shixunHomework.js b/public/react/src/modules/courses/shixunHomework/shixunHomework.js index d16562892..4705e7a8f 100644 --- a/public/react/src/modules/courses/shixunHomework/shixunHomework.js +++ b/public/react/src/modules/courses/shixunHomework/shixunHomework.js @@ -1208,7 +1208,7 @@ class ShixunHomework extends Component{ {this.props.isAdmin()?未发布:""} 提交中 补交中 - 评阅中 + 已截止
From 2ed7d095b094acd835c3e968854846f4c3a752be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 18:59:23 +0800 Subject: [PATCH 12/14] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworksstudentone.js | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 435a9ca6e..6a80d6d48 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -382,7 +382,8 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 截止前学员完成的关卡才有成绩
+ 计算规则: + 截止前学员完成的关卡才有成绩
}>, dataIndex: 'levelscore', key: 'levelscore', @@ -774,7 +775,8 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 截止前学员完成的关卡才有成绩
+ 计算规则: + 截止前学员完成的关卡才有成绩
}>, dataIndex: 'levelscore', key: 'levelscore', @@ -1120,7 +1122,8 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 截止前学员完成的关卡才有成绩
+ 计算规则: + 截止前学员完成的关卡才有成绩
}>, dataIndex: 'levelscore', key: 'levelscore', @@ -1480,7 +1483,8 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 截止前学员完成的关卡才有成绩
+ 计算规则: + 截止前学员完成的关卡才有成绩
}>, dataIndex: 'levelscore', key: 'levelscore', From 9cb5ecb25718963d950ac78c595f14143ec5324a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 19:18:23 +0800 Subject: [PATCH 13/14] =?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 | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 6a80d6d48..5afd7adf0 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -382,11 +382,11 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 计算规则: + 计算规则:
截止前学员完成的关卡才有成绩
}>, - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'final_score', + key: 'final_score', align: 'center', className: 'font-14', width: '99px', @@ -775,11 +775,11 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 计算规则: + 计算规则:
截止前学员完成的关卡才有成绩
}>, - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'final_score', + key: 'final_score', align: 'center', className: 'font-14', width: '99px', @@ -1122,11 +1122,11 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 计算规则: + 计算规则:
截止前学员完成的关卡才有成绩
}>, - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'final_score', + key: 'final_score', align: 'center', className: 'font-14', render: (text, record) => ( @@ -1483,7 +1483,7 @@ class Listofworksstudentone extends Component { }, { title:关卡得分 - 计算规则: + 计算规则:
截止前学员完成的关卡才有成绩
}>, dataIndex: 'levelscore', From 19cd24ad9bbf21cabd6e42cc94c3469969112b25 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Mon, 16 Dec 2019 19:37:47 +0800 Subject: [PATCH 14/14] =?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 | 159 +++++++++--------- 1 file changed, 83 insertions(+), 76 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 5afd7adf0..b7945ee60 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -61,6 +61,9 @@ class Listofworksstudentone extends Component { //要提交的分班状态checkedValuesineinfo //searchtext 输入的姓名和学号 //order 排序时间 + //当前成绩work_score + //关卡得分final_score + this.state = { jobsettingsdata: undefined, endTime: "2018/11/10 17:10:00", @@ -394,19 +397,19 @@ class Listofworksstudentone extends Component { - = 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : { + } : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : { color: '#747A7F', textAlign: "center", width: '99px', - }}>{record.levelscore} + }}>{record.final_score} ) }, @@ -460,26 +463,26 @@ class Listofworksstudentone extends Component { }, { title: '当前成绩', - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'work_score', + key: 'work_score', align: "center", className: 'font-14', width: '99px', render: (text, record) => ( { - record.levelscore && record.levelscore === "--" ? - {record.levelscore} + record.work_score && record.work_score === "--" ? + {record.work_score} : - = 90 ? { + = 90 ? { color: '#DD1717', textAlign: "center", width: '99px', - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.work_score) <= 60 ? { color: '#FF6800', textAlign: "center", width: '99px', - } : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore} + } : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score} } @@ -787,19 +790,19 @@ class Listofworksstudentone extends Component { - = 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : { + } : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center", width: '99px',} : { color: '#747A7F', textAlign: "center", width: '99px', - }}>{record.levelscore} + }}>{record.final_score} ) }, @@ -853,26 +856,26 @@ class Listofworksstudentone extends Component { }, { title: '当前成绩', - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'work_score', + key: 'work_score', align: "center", className: 'font-14', width: '99px', render: (text, record) => ( { - record.levelscore && record.levelscore === "--" ? - {record.levelscore} + record.work_score && record.work_score === "--" ? + {record.work_score} : - = 90 ? { + = 90 ? { color: '#DD1717', textAlign: "center", width: '99px', - } : parseInt(record.levelscore) <= 60 ? { + } : parseInt(record.work_score) <= 60 ? { color: '#FF6800', textAlign: "center", width: '99px', - } : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.levelscore} + } : {color: '#747A7F', textAlign: "center", width: '99px',}}>{record.work_score} } @@ -1131,16 +1134,16 @@ class Listofworksstudentone extends Component { className: 'font-14', render: (text, record) => ( - = 90 ? {color: '#DD1717', "text-align": "center"} : { + } : parseInt(record.final_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : { color: '#747A7F', "text-align": "center" - }}>{record.levelscore} + }}>{record.final_score} ) }, @@ -1198,8 +1201,8 @@ class Listofworksstudentone extends Component { }, { title: '当前成绩', - dataIndex: 'finalscore', - key: 'finalscore', + dataIndex: 'work_score', + key: 'work_score', align: 'center', className: 'font-14', sorter: true, @@ -1211,35 +1214,35 @@ class Listofworksstudentone extends Component { record.ultimate_score === true ? {/*
{record.user_name}{record.user_login}
*/} -
{record.finalscore === "--" ? 最终调整成绩：0分 : - 最终调整成绩：{record.finalscore}分}
+
{record.work_score === "--" ? 最终调整成绩：0分 : + 最终调整成绩：{record.work_score}分}
}> { - record.finalscore && record.finalscore === "--" ? + record.work_score && record.work_score === "--" ? {record.finalscore} + }}>{record.work_score} : - = 90 ? {color: '#DD1717', "text-align": "center"} : { + } : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : { color: '#747A7F', "text-align": "center" - }}>{record.finalscore} + }}>{record.work_score} } : {/*
{record.user_name}{record.user_login}
*/} -
{record.levelscore === "--" ? 关卡得分：0分 : - 关卡得分：{record.levelscore}分}
+
{record.final_score === "--" ? 关卡得分：0分 : + 关卡得分：{record.final_score}分}
{record.efficiencyscore === "--" ? 效率评分：0分 : 效率评分：{record.efficiencyscore}分}
@@ -1249,27 +1252,27 @@ class Listofworksstudentone extends Component { {answer_open_evaluation===true?"":
查看参考答案：{record.view_answer_count}关
} -
{record.finalscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.finalscore}分}
+
{record.work_score === "--" ? 最终成绩：0分 : + 最终成绩：{record.work_score}分}
}> { - record.finalscore && record.finalscore === "--" ? + record.work_score && record.work_score === "--" ? {record.finalscore} + }}>{record.work_score} : - = 90 ? {color: '#DD1717', "text-align": "center"} : { + } : parseInt(record.work_score) >= 90 ? {color: '#DD1717', "text-align": "center"} : { color: '#747A7F', "text-align": "center" - }}>{record.finalscore} + }}>{record.work_score} } @@ -1486,22 +1489,22 @@ class Listofworksstudentone extends Component { 计算规则:
截止前学员完成的关卡才有成绩
}>, - dataIndex: 'levelscore', - key: 'levelscore', + dataIndex: 'final_score', + key: 'final_score', align: 'center', className: 'font-14', render: (text, record) => ( - = 90 ? {color: '#DD1717', textAlign: "center"} : { + } : parseInt(record.final_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : { color: '#747A7F', textAlign: "center" - }}>{record.levelscore} + }}>{record.final_score} ) }, @@ -1559,8 +1562,8 @@ class Listofworksstudentone extends Component { }, { title: '当前成绩', - dataIndex: 'finalscore', - key: 'finalscore', + dataIndex: 'work_score', + key: 'work_score', align: 'center', className: 'font-14', sorter: true, @@ -1572,35 +1575,35 @@ class Listofworksstudentone extends Component { record.ultimate_score === true ? {/*
{record.user_name}{record.user_login}
*/} -
{record.finalscore === "--" ? 最终调整成绩：0分 : - 最终调整成绩：{record.finalscore}分}
+
{record.work_score === "--" ? 最终调整成绩：0分 : + 最终调整成绩：{record.work_score}分}
}> { - record.finalscore && record.finalscore === "--" ? + record.work_score && record.work_score === "--" ? {record.finalscore} + }}>{record.work_score} : - = 90 ? {color: '#DD1717', textAlign: "center"} : { + } : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : { color: '#747A7F', textAlign: "center" - }}>{record.finalscore} + }}>{record.work_score} } : {/*
{record.user_name}{record.user_login}
*/} -
{record.levelscore === "--" ? 关卡得分：0分 : - 关卡得分：{record.levelscore}分}
+
{record.final_score === "--" ? 关卡得分：0分 : + 关卡得分：{record.final_score}分}
{record.efficiencyscore === "--" ? 效率评分：0分 : 效率评分：{record.efficiencyscore}分}
@@ -1610,27 +1613,27 @@ class Listofworksstudentone extends Component { {answer_open_evaluation===true?"":
查看参考答案：{record.view_answer_count}关
} -
{record.finalscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.finalscore}分}
+
{record.work_score === "--" ? 最终成绩：0分 : + 最终成绩：{record.work_score}分}
}> { - record.finalscore && record.finalscore === "--" ? + record.work_score && record.work_score === "--" ? {record.finalscore} + }}>{record.work_score} : - = 90 ? {color: '#DD1717', textAlign: "center"} : { + } : parseInt(record.work_score) >= 90 ? {color: '#DD1717', textAlign: "center"} : { color: '#747A7F', textAlign: "center" - }}>{record.finalscore} + }}>{record.work_score} } @@ -2082,7 +2085,8 @@ class Listofworksstudentone extends Component { levelscore: teacherdata.final_score, view_answer_count: teacherdata.view_answer_count, efficiencyscore: teacherdata.eff_score, - finalscore: teacherdata.work_score, + final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score, + work_score: teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score, operating: "查看", late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty, ultimate_score: teacherdata.ultimate_score, @@ -2123,8 +2127,9 @@ class Listofworksstudentone extends Component { updatetime: timedata === "Invalid date" ? "--" : timedata, completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count, levelscore: student_works[i].final_score, + final_score: student_works[i].final_score=== null ||student_works[i].final_score=== undefined||student_works[i].final_score=== ""?"--":student_works[i].final_score, + work_score: student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score, efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score, - finalscore: student_works[i].work_score, view_answer_count: student_works[i].view_answer_count, operating: "查看", late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty, @@ -2285,7 +2290,8 @@ class Listofworksstudentone extends Component { levelscore: teacherdata.final_score, efficiencyscore: teacherdata.eff_score, view_answer_count: teacherdata.view_answer_count, - finalscore: teacherdata.work_score, + final_score: teacherdata.final_score===null||teacherdata.final_score===undefined||teacherdata.final_score===""?"--":teacherdata.final_score, + work_score:teacherdata.work_score===null||teacherdata.work_score===undefined||teacherdata.work_score===""?"--":teacherdata.work_score, operating: "查看", late_penalty: teacherdata.late_penalty === null ? "0" : teacherdata.late_penalty === undefined ? "0" : teacherdata.late_penalty, ultimate_score: teacherdata.ultimate_score, @@ -2645,7 +2651,8 @@ class Listofworksstudentone extends Component { completion: student_works[i].complete_count === null ? "0" : student_works[i].complete_count === undefined ? "0" : student_works[i].complete_count, levelscore: student_works[i].final_score, efficiencyscore: student_works[i].eff_score === "0.0" ? "--" : student_works[i].eff_score === "0" ? "--" : student_works[i].eff_score, - finalscore: student_works[i].work_score, + final_score: student_works[i].final_score===null||student_works[i].final_score===undefined||student_works[i].final_score===""?"--":student_works[i].final_score, + work_score:student_works[i].work_score===null||student_works[i].work_score===undefined||student_works[i].work_score===""?"--":student_works[i].work_score, view_answer_count: student_works[i].view_answer_count, operating: "查看", late_penalty: student_works[i].late_penalty === null ? "0" : student_works[i].late_penalty === undefined ? "0" : student_works[i].late_penalty,