调整

public/react/src/modules/courses/boards/BoardsNew.js

@@ -30,7 +30,8 @@ class BoardsNew extends Component{
       boards: [],
       title_num: 0,
 			email_notify:false,
-			isemail_notify:false
+			isemail_notify:false,
+			isemail_notifys:false
     }
   }
   addSuccess = () => {
@@ -99,7 +100,7 @@ class BoardsNew extends Component{
                 }
               })
           
-              this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length) ,isemail_notify:response.data.data.email_notify})
+              this.setState({ fileList: _fileList, board_name: data.board_name, title_num: parseInt(data.subject.length) ,isemail_notifys:response.data.data.email_notify})
             }
           }
         })
@@ -341,8 +342,8 @@ class BoardsNew extends Component{
             {/* notRequired */}
             <Form {...formItemLayout} onSubmit={this.handleSubmit}>
               <div className="formBlock" style={{paddingBottom: '0px', position: 'relative'}}>
-								{this.state.boardsdata&&this.state.boardsdata.email_notify===true?this.props.isAdminOrTeacher()===true?<Tooltip placement="bottom" title={this.state.isemail_notify?"邮件只能发送一次":""}><span className={"setemail fr mr70 setemailposition"}>
+								{this.state.boardsdata&&this.state.boardsdata.email_notify===true?this.props.isAdminOrTeacher()===true?<Tooltip placement="bottom" title={this.state.isemail_notifys===true?"邮件只能发送一次":""}><span className={"setemail fr mr70 setemailposition"}>
-										<Checkbox onChange={this.setemailchange} checked={this.state.isemail_notify} disabled={this.state.isemail_notify}>发送邮件提醒</Checkbox>
+										<Checkbox onChange={this.setemailchange} checked={this.state.isemail_notifys===true?this.state.isemail_notifys:this.state.isemail_notify} disabled={this.state.isemail_notifys}>发送邮件提醒</Checkbox>
 								</span></Tooltip>:"":""}
 
                 {  isAdmin && 

public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js

@@ -288,7 +288,11 @@ class Listofworksstudentone extends Component {
 					),
 				},
 				{
-					title: '实战耗时',
+					title:<span>实训总耗时<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -383,7 +387,11 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '效率分',
+					title: <span>效率分<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -645,7 +653,11 @@ class Listofworksstudentone extends Component {
 					),
 				},
 				{
-					title: '实战耗时',
+					title:<span>实训总耗时<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -736,7 +748,11 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '效率分',
+					title: <span>效率分<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -953,7 +969,11 @@ class Listofworksstudentone extends Component {
 
 				},
 				{
-					title: '实战耗时',
+					title:<span>实训总耗时<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -1007,18 +1027,11 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						<span>
-
-										<Tooltip placement="bottom" title={<div>
-											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
-											<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
-										</div>}>
 											<span style={{
 												color: '#07111B',
 												"text-align": "center"
 											}}>{record.completion + "/" + this.state.challenges_count} </span>
-										</Tooltip>
+       			 </span>
-
-        </span>
 					)
 				},
 				{
@@ -1043,7 +1056,11 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '效率分',
+					title: <span>效率分<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1053,22 +1070,14 @@ class Listofworksstudentone extends Component {
             {
 							record.efficiencyscore && record.efficiencyscore === "--" ? (
 									this.state.allow_late && this.state.allow_late === false ?
-										<Tooltip placement="bottom" title={<div>
-											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
-										</div>}>
 											<span style={{color: "#9A9A9A"}}>
 												--
 											</span>
-										</Tooltip>
 										:
 										this.state.allow_late && this.state.allow_late === true ?
-											<Tooltip placement="bottom" title={<div>
-												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
-											</div>}>
 												<span style={{color: "#9A9A9A"}}>
 													--
 												</span>
-											</Tooltip>
 											:
 											<span style={{color: "#9A9A9A"}}>
 												--
@@ -1304,7 +1313,11 @@ class Listofworksstudentone extends Component {
 				// 	),
 				// },
 				{
-					title: '实战耗时',
+					title:<span>实训总耗时<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'cost_time',
 					key: 'cost_time',
 					align: 'center',
@@ -1341,18 +1354,11 @@ class Listofworksstudentone extends Component {
 					className: 'font-14',
 					render: (text, record) => (
 						<span>
-
+									<span style={{
-										<Tooltip placement="bottom" title={<div>
+										color: '#07111B',
-											<div>已通过{record.completion}关，共{this.state.challenges_count}关</div>
+										textAlign: "center"
-											<div>完成任务评测之前查看了参考答案：{record.view_answer_count}关</div>
+									}}>{record.completion + "/" + this.state.challenges_count} </span>
-										</div>}>
+        		</span>
-											<span style={{
-												color: '#07111B',
-												textAlign: "center"
-											}}>{record.completion + "/" + this.state.challenges_count} </span>
-										</Tooltip>
-
-        </span>
 					)
 				},
 				{
@@ -1377,7 +1383,11 @@ class Listofworksstudentone extends Component {
 					)
 				},
 				{
-					title: '效率分',
+					title: <span>效率分<Tooltip placement="top" title={<pre>
+						计算规则:<br/>
+						学员离开实训学习界面停止计时；<br/>
+						评测首次通过之后，停止计时<br/>
+					</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
@@ -1387,22 +1397,14 @@ class Listofworksstudentone extends Component {
             {
 							record.efficiencyscore && record.efficiencyscore === "--" ? (
 									this.state.allow_late && this.state.allow_late === false ?
-										<Tooltip placement="bottom" title={<div>
-											<div>作业截止时，系统根据学生在课堂成员中的效率表现自动评分</div>
-										</div>}>
 											<span style={{color: "#9A9A9A"}}>
 												--
 											</span>
-										</Tooltip>
 										:
 										this.state.allow_late && this.state.allow_late === true ?
-											<Tooltip placement="bottom" title={<div>
-												<div>补交结束时，系统根据学生在课堂成员中的效率表现自动评分</div>
-											</div>}>
 												<span style={{color: "#9A9A9A"}}>
 													--
 												</span>
-											</Tooltip>
 											:
 											<span style={{color: "#9A9A9A"}}>
 												--