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?
计算成绩
:
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{