From fc0f346d77f19a01f98e1e09c4233e6cea930881 Mon Sep 17 00:00:00 2001 From: caishi <1149225589@qq.com> Date: Fri, 28 Jun 2019 14:55:08 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E8=AF=95=E5=8D=B7=E7=AD=94=E9=A2=98issue?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/exercise/ExerciseReviewAndAnswer.js | 2 +- .../src/modules/courses/exercise/question/multiple.js | 4 ++-- .../modules/courses/exercise/question/simpleAnswer.js | 10 +++++----- .../src/modules/courses/exercise/question/single.js | 4 ++-- public/react/src/modules/courses/poll/pollStyle.css | 1 - 5 files changed, 10 insertions(+), 11 deletions(-) diff --git a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js index ce9c00a21..b9da3f2eb 100644 --- a/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js +++ b/public/react/src/modules/courses/exercise/ExerciseReviewAndAnswer.js @@ -690,7 +690,7 @@ class ExerciseReviewAndAnswer extends Component{ } { //(老师身份且除实训题外) || (学生身份且试卷已经截止)就显示用户当前题目所得分数 - ( isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 ? + ( isAdmin || (isStudent && exercise.exercise_status == 3)) && item.question_type != 5 && item.user_score ? {item.user_score} 分 diff --git a/public/react/src/modules/courses/exercise/question/multiple.js b/public/react/src/modules/courses/exercise/question/multiple.js index 939122a48..bfb90ca9b 100644 --- a/public/react/src/modules/courses/exercise/question/multiple.js +++ b/public/react/src/modules/courses/exercise/question/multiple.js @@ -46,9 +46,9 @@ class Multiple extends Component{ { questionType.question_choices && questionType.question_choices.map((item,key)=>{ return( -

+

- {tagArray[key]}. + {tagArray[key]}.

) }) diff --git a/public/react/src/modules/courses/exercise/question/simpleAnswer.js b/public/react/src/modules/courses/exercise/question/simpleAnswer.js index 773c93708..240f775c2 100644 --- a/public/react/src/modules/courses/exercise/question/simpleAnswer.js +++ b/public/react/src/modules/courses/exercise/question/simpleAnswer.js @@ -54,7 +54,7 @@ class simpleAnswer extends Component{
  • { user_exercise_status == 1 ? -
    0 ? questionType.user_answer[0]:"")}}>
    +
    0 ? questionType.user_answer[0]:"")}}>
    :
    0 ? questionType.user_answer[0]:''} mdID={'simpleEditor'+questionType.question_id} placeholder="请输入你的答案" @@ -69,9 +69,9 @@ class simpleAnswer extends Component{ { exercise.answer_status == 1 || questionType.a_flag ?
    -

    参考答案：

    -
  • -

    this.showAndHide(false)}>隐藏参考答案

    +

    参考答案：

    +
  • +

    this.showAndHide(false)}>隐藏参考答案

    : this.showAndHide(true)}>显示参考答案 @@ -82,7 +82,7 @@ class simpleAnswer extends Component{ isStudent && exercise.answer_open==true && exercise.exercise_status == 3 ?

    参考答案：

    -
  • +
  • :"" } diff --git a/public/react/src/modules/courses/exercise/question/single.js b/public/react/src/modules/courses/exercise/question/single.js index d5e9bbb7a..85344729d 100644 --- a/public/react/src/modules/courses/exercise/question/single.js +++ b/public/react/src/modules/courses/exercise/question/single.js @@ -41,9 +41,9 @@ class single extends Component{ { questionType.question_choices && questionType.question_choices.map((item,key)=>{ return( -

    +

    - {tagArray[key]}. + {tagArray[key]}.

    ) }) diff --git a/public/react/src/modules/courses/poll/pollStyle.css b/public/react/src/modules/courses/poll/pollStyle.css index c66e45520..ffe13eb10 100644 --- a/public/react/src/modules/courses/poll/pollStyle.css +++ b/public/react/src/modules/courses/poll/pollStyle.css @@ -323,7 +323,6 @@ textarea:read-only{ } .standardAnswer p{ line-height: 20px!important; - font-size: 16px; } /* 倒计时 */ .remainingTime li{ From 1f49c1b45dc763756c3efe990816fad06397c37d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com> Date: Fri, 28 Jun 2019 15:21:42 +0800 Subject: [PATCH 2/2] b --- public/react/config/webpack.config.dev.js | 30 +++++++++++------------ 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/public/react/config/webpack.config.dev.js b/public/react/config/webpack.config.dev.js index ceddbd81b..dfd54f38b 100644 --- a/public/react/config/webpack.config.dev.js +++ b/public/react/config/webpack.config.dev.js @@ -114,21 +114,21 @@ module.exports = { // First, run the linter. // It's important to do this before Babel processes the JS. // 上线然后要注释回来 - // { - // test: /\.(js|jsx|mjs)$/, - // enforce: 'pre', - // use: [ - // { - // options: { - // formatter: eslintFormatter, - // eslintPath: require.resolve('eslint'), - // - // }, - // loader: require.resolve('eslint-loader'), - // }, - // ], - // include: paths.appSrc, - // }, + { + test: /\.(js|jsx|mjs)$/, + enforce: 'pre', + use: [ + { + options: { + formatter: eslintFormatter, + eslintPath: require.resolve('eslint'), + + }, + loader: require.resolve('eslint-loader'), + }, + ], + include: paths.appSrc, + }, { // "oneOf" will traverse all following loaders until one will // match the requirements. When no loader matches it will fall