From 0f162b7e88e03bd8ceed31e3a060967f54fa3d3a 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, 5 Sep 2019 18:40:24 +0800 Subject: [PATCH] =?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 | 140 +++++++++--------- 1 file changed, 73 insertions(+), 67 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 64e2e6a99..cf04431df 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -2598,29 +2598,31 @@ class Listofworksstudentone extends Component { color:rgba(255,104,0,1); } - .computeTime{ - width: 73px; - height: 24px; - display: inline-block; - padding: 5px; - text-align: center; - line-height: 13px; - color: #4CACFF; - border: 1px solid #4CACFF; - cursor: pointer; - } + .computeTime { + width: 122px; + height: 31px; + display: inline-block; + padding: 5px; + text-align: center; + line-height: 20px; + color: #FE6B21; + border: 1px solid #FE6B21; + cursor: pointer; + border-radius: 4px; + } - .computeTimes{ - width: 73px; - height: 24px; - display: inline-block; - padding: 5px; - text-align: center; - line-height: 13px; - color: #C5C5C5; - border: 1px solid #EDEDED; - background:#EDEDED; - cursor: pointer; + .computeTimes{ + width: 122px; + height: 31px; + display: inline-block; + padding: 5px; + text-align: center; + line-height: 20px; + color: #C5C5C5; + border: 1px solid #EDEDED; + background:#EDEDED; + cursor: pointer; + border-radius: 4px; } .shixunSpin{ color:#FF6801; @@ -2641,12 +2643,12 @@ 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? - (this.props.isNotMember()===false?
- 计算成绩 + (this.props.isNotMember()===false?
+ 查看最新成绩
:""): teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": - (this.props.isNotMember()===false?
- 计算成绩 + (this.props.isNotMember()===false?
+ 查看最新成绩
:"") } @@ -2840,30 +2842,32 @@ class Listofworksstudentone extends Component { font-weight:400; color:rgba(255,104,0,1); } - .computeTime{ - width: 73px; - height: 24px; - display: inline-block; - padding: 5px; - text-align: center; - line-height: 13px; - color: #4CACFF; - border: 1px solid #4CACFF; - cursor: pointer; - } + .computeTime { + width: 122px; + height: 31px; + display: inline-block; + padding: 5px; + text-align: center; + line-height: 20px; + color: #FE6B21; + border: 1px solid #FE6B21; + cursor: pointer; + border-radius: 4px; + } - .computeTimes{ - width: 73px; - height: 24px; - display: inline-block; - padding: 5px; - text-align: center; - line-height: 13px; - color: #C5C5C5; - border: 1px solid #EDEDED; - background:#EDEDED; - cursor: pointer; - } + .computeTimes{ + width: 122px; + height: 31px; + display: inline-block; + padding: 5px; + text-align: center; + line-height: 20px; + color: #C5C5C5; + border: 1px solid #EDEDED; + background:#EDEDED; + cursor: pointer; + border-radius: 4px; + } `} {visibles === true ? @@ -2947,15 +2951,15 @@ class Listofworksstudentone extends Component { {teacherdata&&teacherdata.task_operation[0]==="开启挑战"?"": {computeTimetype===true? (this.props.isNotMember()===false? -
- 计算成绩 +
+ 查看最新成绩
:"") : (teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": this.props.isNotMember()===false? -
- 计算成绩 +
+ 查看最新成绩
:"") } @@ -3125,29 +3129,31 @@ class Listofworksstudentone extends Component { font-weight:400; color:rgba(255,104,0,1); } - .computeTime{ - width: 73px; - height: 24px; + .computeTime { + width: 122px; + height: 31px; display: inline-block; padding: 5px; text-align: center; - line-height: 13px; - color: #4CACFF; - border: 1px solid #4CACFF; + line-height: 20px; + color: #FE6B21; + border: 1px solid #FE6B21; cursor: pointer; - } + border-radius: 4px; + } .computeTimes{ - width: 73px; - height: 24px; + width: 122px; + height: 31px; display: inline-block; padding: 5px; text-align: center; - line-height: 13px; + line-height: 20px; color: #C5C5C5; border: 1px solid #EDEDED; background:#EDEDED; cursor: pointer; + border-radius: 4px; } `} @@ -3156,12 +3162,12 @@ 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? - (this.props.isNotMember()===false?
- 计算成绩 + (this.props.isNotMember()===false?
+ 查看最新成绩
:""): teacherdata&&teacherdata.homework_status!==undefined&&teacherdata.homework_status[0]=== "未发布"? "": - (this.props.isNotMember()===false?
- 计算成绩 + (this.props.isNotMember()===false?
+ 查看最新成绩
:"") } }