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/2] =?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/2] =?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 {
 											<div className="fr">
 
 												<span className="fl  mr10 color-grey-6 ">计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--":	moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')}</span>
-												{teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
+												{teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"":<span>
 													{computeTimetype===true?<div className={"computeTime font-13"} onClick={this.setComputeTime}>
 														计算成绩
 													</div>:<div className={"computeTimes font-13"} onClick={this.setComputeTime}>