Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js

@@ -332,7 +332,7 @@ class ExerciseReviewAndAnswer extends Component{
     )
   }
 //确认调分
-  setAction=(key,q_id,maxScore)=>{
+  setAction=(key,q_id,maxScore,oldScore)=>{
     let {ajustSore}=this.state;
     let list = ajustSore.filter(obj => obj.id == q_id);
     let index = ajustSore.map(function (item) { return item.id; }).indexOf(q_id);
@@ -396,6 +396,11 @@ class ExerciseReviewAndAnswer extends Component{
               ajustSore : update(prevState.ajustSore, {[index]: { desc: {$set: undefined},inputSore:{ $set:undefined }}})
             })
           )
+          let {exerciseTotalScore} = this.state;
+          let newScore = parseFloat(parseFloat(exerciseTotalScore)+parseFloat(score)-parseFloat(oldScore)).toFixed(1);
+          this.setState({
+            exerciseTotalScore:newScore
+          })
           this.showSetScore(key,true);
         }
       }).catch((error)=>{
@@ -781,7 +786,6 @@ class ExerciseReviewAndAnswer extends Component{
             <div>
               {
                 exercise_questions && exercise_questions.map((item,key)=>{
-                  debugger;
                   let list = ajustSore && ajustSore.filter(obj => obj.id === item.question_id);
                   return(
                     <div className="bor-top-greyE pt30 pb30" id={"Anchor_"+parseInt(key+1)}>
@@ -933,7 +937,7 @@ class ExerciseReviewAndAnswer extends Component{
                                 {
                                   parseInt(item.answer_status) == 0 && item.question_type == 4 ? <span className="color-red ml10 font-16">未评分</span> : ''
                                 }
-                                <ActionBtn style="blue" className="middle ml20" onClick={()=>this.setAction(key,item.question_id,item.question_score)}>确认</ActionBtn>
+                                <ActionBtn style="blue" className="middle ml20" onClick={()=>this.setAction(key,item.question_id,item.question_score,item.user_score)}>确认</ActionBtn>
                               </p>
                               {
                                 list && list.length > 0 && list[0].setTip !="" ? <p className="color-red edu-txt-left">{ list[0].setTip }</p> :""