diff --git a/public/react/src/modules/courses/elearning/YslDetailCards.js b/public/react/src/modules/courses/elearning/YslDetailCards.js index 3c6b5daff..e6f362561 100644 --- a/public/react/src/modules/courses/elearning/YslDetailCards.js +++ b/public/react/src/modules/courses/elearning/YslDetailCards.js @@ -48,7 +48,9 @@ class YslDetailCards extends Component{ }; hideparagraph=()=>{ this.setState({ - showparagraph:false + showparagraph:false, + showparagraphkey:null, + showparagraphindex:null }) }; startgameid=(id)=>{ @@ -509,6 +511,13 @@ class YslDetailCards extends Component{ } +
  • + { + showparagraphkey === key && showparagraphindex === index ? "" : + 实验任务 {line.challenges_count} + } +
  • ) }) } diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js index 0f2dbfcfe..20c40f025 100644 --- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js +++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js @@ -132,11 +132,7 @@ class ExerciseReviewAndAnswer extends Component{ // } // },1000) } - autosetimes=(time)=>{ - this.setState({ - time:parseInt(time) - }) - } + //自动交卷 autoCommitExercise=()=>{ let eId=this.props.match.params.Id; @@ -152,14 +148,18 @@ class ExerciseReviewAndAnswer extends Component{ modalsBottomval:"不能再修改答题", ModalCancel:undefined, ModalSave:this.sureCommit, - Loadtype:true + Loadtype:true, + time:null, }) this.props.showNotification(`${result.data.message}`); } if(result.data.status===-2){ // this.remainTime(parseInt(result.data.message)) - this.autosetimes(result.data.message) + this.setState({ + time:parseInt(result.data.mess) + }) + this.deadline(parseInt(result.data.message)) } } }).catch((error)=>{ @@ -258,6 +258,7 @@ class ExerciseReviewAndAnswer extends Component{ }) if(result.data.exercise.left_time != null){ // this.remainTime(result.data.exercise.left_time); + this.deadline(result.data.exercise.left_time) } } }).catch((error)=>{ @@ -586,9 +587,14 @@ class ExerciseReviewAndAnswer extends Component{ deadline=(time)=>{ if(time===null){ - + this.setState({ + Datetime:0 + }) }else{ - return Date.now() + time * 1000 ; + this.setState({ + Datetime:Date.now() + time * 1000 + }) + // return Date.now() + time * 1000 ; } } @@ -695,7 +701,7 @@ class ExerciseReviewAndAnswer extends Component{ : time && time != 0 ?
    - +
    :"" } diff --git a/public/react/src/modules/paths/ShixunPaths.css b/public/react/src/modules/paths/ShixunPaths.css index b73f68163..802795556 100644 --- a/public/react/src/modules/paths/ShixunPaths.css +++ b/public/react/src/modules/paths/ShixunPaths.css @@ -267,4 +267,8 @@ .color181818{ color: #181818; +} + +.colorD5D8D6{ + color:#D5D8D6; } \ No newline at end of file