m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
issues25489
cxt 5 years ago
parent 0fb1e97a85 bfdfc38a6d
commit a21cb8e165
2 changed files with 43 additions and 45 deletions
Show Stats Download Patch File Download Diff File

56
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -190,21 +190,21 @@ class Listofworksstudentone extends Component {
}}>
{record.stduynumber === undefined ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
</span>
: record.stduynumber === null ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
@ -214,7 +214,7 @@ class Listofworksstudentone extends Component {
title={record.stduynumber}
className="maxnamewidth145"
style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>{
@ -294,7 +294,7 @@ class Listofworksstudentone extends Component {
计算规则:<br/>
学员离开实训学习界面停止计时；<br/>
评测首次通过之后，停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -309,9 +309,6 @@ class Listofworksstudentone extends Component {
}
}>
{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" :
<Tooltip placement="bottom" title={<div>
学员在EduCoder做实训花费的时间
</div>}>
<span style={
{
color: '#747A7F',
@ -321,7 +318,6 @@ class Listofworksstudentone extends Component {
}
>{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time}
</span>
</Tooltip>
}
</span>
)
@ -401,7 +397,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -563,21 +559,21 @@ class Listofworksstudentone extends Component {
}}>
{record.stduynumber === undefined ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
</span>
: record.stduynumber === null ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>--
@ -587,7 +583,7 @@ class Listofworksstudentone extends Component {
title={record.stduynumber}
className="maxnamewidth145"
style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center",
width: '145px',
}}>{
@ -667,7 +663,7 @@ class Listofworksstudentone extends Component {
计算规则:<br/>
学员离开实训学习界面停止计时；<br/>
评测首次通过之后，停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -770,7 +766,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -915,19 +911,19 @@ class Listofworksstudentone extends Component {
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center"
}}>--
</span>
: record.stduynumber === null ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center"
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center"
}}>--
</span>
@ -936,7 +932,7 @@ class Listofworksstudentone extends Component {
title={record.stduynumber}
className="maxnamewidth110"
style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center"
}}>{
record.stduynumber
@ -992,7 +988,7 @@ class Listofworksstudentone extends Component {
计算规则:<br/>
学员离开实训学习界面停止计时；<br/>
评测首次通过之后，停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -1087,7 +1083,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@ -1263,19 +1259,19 @@ class Listofworksstudentone extends Component {
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
<span style={{
color: '#9A9A9A',
color: '#000',
"text-align": "center"
}}>--
</span>
: record.stduynumber === null ?
<span style={{
color: '#9A9A9A',
color: '#000',
"text-align": "center"
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
color: '#9A9A9A',
color: '#000',
"text-align": "center"
}}>--
</span>
@ -1284,7 +1280,7 @@ class Listofworksstudentone extends Component {
title={record.stduynumber}
className="maxnamewidth110"
style={{
color: '#9A9A9A',
color: '#000',
textAlign: "center"
}}>{
record.stduynumber
@ -1350,7 +1346,7 @@ class Listofworksstudentone extends Component {
计算规则:<br/>
学员离开实训学习界面停止计时；<br/>
评测首次通过之后，停止计时<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@ -1363,9 +1359,6 @@ class Listofworksstudentone extends Component {
}
}>
{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time === "--" ? "--" :
<Tooltip placement="bottom" title={<div>
学员在EduCoder做实训花费的时间
</div>}>
<a style={
{
color: '#747A7F',
@ -1374,7 +1367,6 @@ class Listofworksstudentone extends Component {
}
>{record.cost_time === null ? "--" : record.cost_time === undefined ? "--" : record.cost_time}
</a>
</Tooltip>
}
</span>
)
@ -1428,7 +1420,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)<br/>
学生效率分 = 学生工作效率 / 课堂学生最高<br/>
工作效率 * 分值<br/>
</pre>}><img src={getImageUrl("images/educoder/problem.png")}/></Tooltip></span>,
</pre>}><img src={getImageUrl("images/educoder/problem.png")} className={"ml2"}/></Tooltip></span>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',

30
public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
Unescape View File

@ -87,7 +87,7 @@ function startechart(data){
{
name:'',
type:'scatter',
data:data.echart_data===undefined?"":data.echart_data.efficiency_list,
data: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.efficiency_list,
itemStyle:{
normal:{color:'#2e65ad'}
},
@ -113,9 +113,9 @@ function startechart(data){
data : [
{
name: data===undefined?"":data.username,
xAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[0],
yAxis:data.echart_data===undefined?"":data.echart_data.myself_eff[1],
value:data.echart_data===undefined?"":data.echart_data.myself_eff[1],
xAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[0],
yAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[1],
value: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_eff[1],
}
],
itemStyle: {
@ -148,7 +148,7 @@ function startechart(data){
var ablChart = echarts.init(document.getElementById('shixun_overall_ablility_chart'));
var dataBJ = data.echart_data===undefined?"":data.echart_data.consume_list;
var dataBJ = data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.consume_list;
var itemStyle = {
@ -196,7 +196,7 @@ function startechart(data){
formatter: function (obj) {
var value = obj.value;
if(obj.name ===data.username){
return "姓名："+data.username + "<br/>"+'学号： '+data.user_id + "<br/>"+'得分：'+ data.echart_data===undefined?"":data.echart_data.myself_object[1];
return "姓名：" + data.username + "<br/>" + '学号： ' + data.user_id + "<br/>" + '得分：' + data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1];
}
}
@ -249,9 +249,9 @@ function startechart(data){
data : [
{
name: data===undefined?"":data.username,
xAxis: data.echart_data===undefined?"":data.echart_data.myself_object[0],
yAxis:data.echart_data===undefined?"":data.echart_data.myself_object[1],
value:data.echart_data===undefined?"":data.echart_data.myself_object[1]
xAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[0],
yAxis: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1],
value: data.echart_data === undefined || data.echart_data === null ? "" : data.echart_data.myself_object[1]
}
],
itemStyle: {
@ -375,8 +375,12 @@ class Shixunechart extends Component {
<div className="fl with65" style={{paddingLeft: "5%"}}>
<li className="mt5 mb5">{data&&data.username}</li>
<li className="mt5 mb5">{data===undefined?"--":data.student_id===undefined?"--":data.student_id===null?"--":data.student_id}</li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[1]}</span></li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_eff[0]}</span></li>
<li className="mt5 mb5 color-orange03"><span
className="color-orange03">{data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_eff[1]}</span>
</li>
<li className="mt5 mb5 color-orange03"><span
className="color-orange03">{data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_eff[0]}</span>
</li>
</div>
</div>
<div className="pr mt20 with100">
@ -401,7 +405,9 @@ class Shixunechart extends Component {
<div className="fl with65" style={{paddingLeft: "5%"}}>
<li className="mt5 mb5">{data&&data.username}</li>
<li className="mt5 mb5">{data===undefined?"--":data.student_id===undefined?"--":data.student_id===null?"--":data.student_id}</li>
<li className="mt5 mb5 color-orange03"><span className="color-orange03">{data&&data.echart_data===undefined?"":data&&data.echart_data.myself_object[1]}</span></li>
<li className="mt5 mb5 color-orange03"><span
className="color-orange03">{data && data.echart_data === undefined || data.echart_data === null ? "" : data && data.echart_data.myself_object[1]}</span>
</li>
</div>
</div>
<div className="popup_tip_box fontGrey2 with100 disc mt20"

Write Preview
Loading…
Cancel
Save