diff --git a/public/react/src/App.css b/public/react/src/App.css index 2b3d8d08c..42e40f8c8 100644 --- a/public/react/src/App.css +++ b/public/react/src/App.css @@ -55,6 +55,9 @@ html, body { .markdown-body p { white-space: pre-wrap; } +.markdown-body > p { + line-height: 25px; +} /* https://www.educoder.net/courses/2346/group_homeworks/34405/question */ .renderAsHtml.markdown-body p { white-space: inherit; diff --git a/public/react/src/modules/courses/exercise/question/fillEmpty.js b/public/react/src/modules/courses/exercise/question/fillEmpty.js index 24ff7b641..737fef682 100644 --- a/public/react/src/modules/courses/exercise/question/fillEmpty.js +++ b/public/react/src/modules/courses/exercise/question/fillEmpty.js @@ -129,7 +129,7 @@ class fillEmpty extends Component{ } { // 答案公开,且试卷已经截止 - isAdmin && + questionType.standard_answer &&

参考答案:

{ questionType.standard_answer && questionType.standard_answer.map((item,k)=>{ diff --git a/public/react/src/modules/courses/exercise/question/simpleAnswer.js b/public/react/src/modules/courses/exercise/question/simpleAnswer.js index 527044968..1dfcbdb2a 100644 --- a/public/react/src/modules/courses/exercise/question/simpleAnswer.js +++ b/public/react/src/modules/courses/exercise/question/simpleAnswer.js @@ -85,9 +85,9 @@ class simpleAnswer extends Component{
} { - isStudent && exercise.answer_open==true && exercise.exercise_status == 3 ? + isStudent && questionType.standard_answer ?
-

参考答案:

+

参考答案:

{/*
  • */} { if(response === undefined){ - this.setState({ donwloading: false }) return } if(response.data.status&&response.data.status===-1){ - this.setState({ donwloading: false }) }else if(response.data.status&&response.data.status===-2){ - this.setState({ donwloading: false }) - if(response.data.message === "100"){ // 已超出文件导出的上限数量(100 ),建议: @@ -158,25 +152,19 @@ class studentsList extends Component{ } }else { this.props.showNotification(`正在下载中`); - // window.open("/api"+url, '_blank'); - this.setState({ donwloading: true }) - downloadFile({ - url: url, - successCallback: (url) => { - console.log('successCallback') - this.setState({ donwloading: false }) - - }, - failCallback: (responseHtml, url) => { - console.log('failCallback') - this.setState({ donwloading: false }) - - } - }) + window.open("/api"+url, '_blank'); + // downloadFile({ + // url: url, + // successCallback: (url) => { + // console.log('successCallback') + // }, + // failCallback: (responseHtml, url) => { + // console.log('failCallback') + // } + // }) } }).catch((error) => { console.log(error) - this.setState({ donwloading: false }) }); } @@ -615,23 +603,20 @@ class studentsList extends Component{ `} { isAdmin && -
  • - 导出 + 导出 -
  • - } {/*this.confirmysl(exportUrl)} >导出成绩*/} {/* */} diff --git a/public/react/src/modules/courses/poll/PollDetailTabThird.js b/public/react/src/modules/courses/poll/PollDetailTabThird.js index 47fcaf52f..e51563a46 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabThird.js +++ b/public/react/src/modules/courses/poll/PollDetailTabThird.js @@ -66,12 +66,14 @@ class PollDetailTabThird extends Component{ { pollDetail && pollDetail.questions.map((item,key)=>{ + console.log("ddd"); + console.log(item.question.min_choices); return(

    {item.question.question_number}、{map[item.question.question_type]} { item.question.is_necessary==1 ? 必答:选答 } - { item.question.question_type == 2 && item.question.min_choices && item.question.max_choices ? + { item.question.question_type == 2 && item.question.min_choices != undefined && item.question.min_choices != null && item.question.max_choices != undefined && item.question.max_choices != null ? { item.question.min_choices == item.question.max_choices ? "可选"+item.question.max_choices+"项" : diff --git a/public/react/src/modules/courses/poll/PollListItem.js b/public/react/src/modules/courses/poll/PollListItem.js index eda994a9a..eb5766362 100644 --- a/public/react/src/modules/courses/poll/PollListItem.js +++ b/public/react/src/modules/courses/poll/PollListItem.js @@ -54,7 +54,7 @@ class PollListItem extends Component{ }

    - { item.author && {item.author} } + { item.author && {item.author} } { item.polls_status !=1 && diff --git a/public/react/src/modules/courses/poll/PollNew.js b/public/react/src/modules/courses/poll/PollNew.js index ea84586d8..33a85bf0e 100644 --- a/public/react/src/modules/courses/poll/PollNew.js +++ b/public/react/src/modules/courses/poll/PollNew.js @@ -2123,7 +2123,7 @@ class PollNew extends Component { //最小值 HandleGradationGroupChangee = (value, index, max, length) => { - + // debugger var minbool = false; var maxbool = false; let arr = this.state.adddom;