From 3cc654f86c96d3e0831f1713f507155365d1b540 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, 8 Jul 2019 15:11:08 +0800 Subject: [PATCH 1/3] =?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/Trainingjobsetting.js | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js index 807b38c8e..998940aa5 100644 --- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js +++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js @@ -867,14 +867,15 @@ class Trainingjobsetting extends Component { challenge_settingsdata[i].challenge_score =0; } } - debugger var expzsy=0; var bool= true; if(ionsp - expzs>0){ - expzsy=ionsp - expzs; + expzsy=parseFloat(ionsp.toFixed(1)) - parseFloat(expzs.toFixed(1)); + expzsy=Math.abs(expzsy); bool=true; }else{ - expzsy=ionsp - expzs; + expzsy= parseFloat(ionsp.toFixed(1)) - parseFloat(expzs.toFixed(1)); + expzsy= Math.abs(expzsy); bool=false; } @@ -884,9 +885,16 @@ class Trainingjobsetting extends Component { macts= macts+1; if(mact===macts){ if(bool===true){ - challenge_settingsdata[i].challenge_score = challenge_settingsdata[i].challenge_score+expzsy; + challenge_settingsdata[i].challenge_score = (parseFloat(challenge_settingsdata[i].challenge_score)+parseFloat(expzsy.toFixed(1))).toFixed(1); + console.log(parseFloat(challenge_settingsdata[i].challenge_score)+parseFloat(expzsy.toFixed(1))); + console.log(parseFloat(expzsy.toFixed(1))); + }else { - challenge_settingsdata[i].challenge_score = challenge_settingsdata[i].challenge_score-parseInt(expzsy); + + challenge_settingsdata[i].challenge_score = (parseFloat(challenge_settingsdata[i].challenge_score)-parseFloat(expzsy.toFixed(1))).toFixed(1); + console.log(parseFloat(challenge_settingsdata[i].challenge_score)-parseFloat(expzsy.toFixed(1))); + console.log(parseFloat(expzsy.toFixed(1))); + } } }else{ From ff2d8729007b246bf067a308e4d9ff833e3e4cbc 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, 8 Jul 2019 15:22:47 +0800 Subject: [PATCH 2/3] =?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, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index cb1e8b642..c95febc9b 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1138,7 +1138,7 @@ class Listofworksstudentone extends Component {
计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": + {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": {computeTimetype===true?
计算成绩
:
From 06c05107547ef3b6db98f9caf1d731f12b7ab20f 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, 8 Jul 2019 15:31:23 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=20=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/ShixunWorkDetails.js | 2 +- .../Shixunworkdetails/ShixunCustomsPass.js | 10 ++++++++-- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js index 4cfdccab0..5db2df83a 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunWorkDetails.js @@ -95,7 +95,7 @@ class ShixunWorkDetails extends Component {
非编程类型任务，不参与查重 diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js index 81e5ec178..8d3fcabb6 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunCustomsPass.js @@ -50,14 +50,20 @@ class ShixunCustomsPass extends Component { .backgroud4CACFF{ background: #4CACFF; } + .fontpass{ + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; + width: 346px; + } `} - + 第{record.customs.position}关 - {record.customs.subject} + {record.customs.subject} ),