From 5e55d9b1a07401ce2a13eab6a851b46513ea46f2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 18 Jul 2019 16:37:41 +0800 Subject: [PATCH 1/4] =?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/Listofworksstudentone.js | 37 +++++++++++-------- 1 file changed, 22 insertions(+), 15 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 72fdb3544..3da20b537 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2328,13 +2328,14 @@ class Listofworksstudentone extends Component {
  • 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} - {teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true?
    + {teacherdata&&teacherdata.publish_immediately===false&&computeTimetype===true? + (this.props.isNotMember()===false?
    计算成绩 -
    : +
    :""): teacherdata&&teacherdata.homework_status[0]=== "未发布"? "": -
    + (this.props.isNotMember()===false?
    计算成绩 -
    +
    :"") }     @@ -2614,14 +2615,19 @@ class Listofworksstudentone extends Component { 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": - {computeTimetype===true?
    + {computeTimetype===true? + (this.props.isNotMember()===false? +
    计算成绩 -
    : - teacherdata&&teacherdata.homework_status[0]=== "未发布"? "": -
    - 计算成绩 -
    - +
    + :"") + : + (teacherdata&&teacherdata.homework_status[0]=== "未发布"? "": + this.props.isNotMember()===false? +
    + 计算成绩 +
    + :"") }     } @@ -2777,13 +2783,14 @@ class Listofworksstudentone extends Component { 计算成绩时间：{teacherdata&&teacherdata.calculation_time==null?"--": moment(teacherdata&&teacherdata.calculation_time).format('YYYY-MM-DD HH:mm')} {teacherdata&&teacherdata.task_operation&&teacherdata.task_operation[0]==="开启挑战"?"": - {computeTimetype===true?
    + {computeTimetype===true? + (this.props.isNotMember()===false?
    计算成绩 -
    : +
    :""): teacherdata&&teacherdata.homework_status[0]=== "未发布"? "": -
    + (this.props.isNotMember()===false?
    计算成绩 -
    +
    :"") }     } From 6477a40c258ad4b1da22c41e53f73d692a8451b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 18 Jul 2019 16:40:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../modules/courses/shixunHomework/Listofworksstudentone.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 3da20b537..b8933f7d5 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2486,7 +2486,7 @@ class Listofworksstudentone extends Component { { teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
    +
    @@ -2835,7 +2835,7 @@ class Listofworksstudentone extends Component {
    { teacherdata && teacherdata.work_count && teacherdata.work_count > limit ? -
    +
    From 14cc1f85255bfe0d991eadbe5823397b68ddd2e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 18 Jul 2019 17:08:26 +0800 Subject: [PATCH 3/4] =?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/exercise/Exercisestatisticalresult.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index fb03835f6..6fa082f59 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -11,6 +11,7 @@ import '../css/busyWork.css'; import '../poll/pollStyle.css'; const CheckboxGroup = Checkbox.Group; +const $ = window.$ function createMarkup(value) { return {__html:value} }; class Exercisestatisticalresult extends Component { From e646abbe4d712c3c33870d04f668cf74c9623c6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Thu, 18 Jul 2019 17:23:01 +0800 Subject: [PATCH 4/4] =?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/exercise/Testpapersettinghomepage.js | 1 + 1 file changed, 1 insertion(+) diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index 02d3888ef..f5b8750d4 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -19,6 +19,7 @@ import Ecerciseallbackagain from './Ecerciseallbackagain'; const polls_status={1:"未发布",2:"提交中",3:"已截止",4:"已结束"} const start_Value={0:"继续答题",1:"查看答题",2:"开始答题"} + //试卷主要设置页面 class Testpapersettinghomepage extends Component{ constructor(props) {