diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 2f3f787b5..9d3d1cb17 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -190,21 +190,21 @@ class Listofworksstudentone extends Component {
}}>
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
@@ -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 {
计算规则:
学员离开实训学习界面停止计时;
评测首次通过之后,停止计时
- }>,
+ }>,
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 === "--" ? "--" :
-
学生效率分 = 学生工作效率 / 课堂学生最高
工作效率 * 分值
- }>,
+ }>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -563,21 +559,21 @@ class Listofworksstudentone extends Component {
}}>
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
@@ -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 {
计算规则:
学员离开实训学习界面停止计时;
评测首次通过之后,停止计时
- }>,
+ }>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@@ -770,7 +766,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)
学生效率分 = 学生工作效率 / 课堂学生最高
工作效率 * 分值
- }>,
+ }>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -915,19 +911,19 @@ class Listofworksstudentone extends Component {
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
@@ -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 {
计算规则:
学员离开实训学习界面停止计时;
评测首次通过之后,停止计时
- }>,
+ }>,
dataIndex: 'cost_time',
key: 'cost_time',
align: 'center',
@@ -1087,7 +1083,7 @@ class Listofworksstudentone extends Component {
学生工作效率= log(实训总得分/实训总耗时)
学生效率分 = 学生工作效率 / 课堂学生最高
工作效率 * 分值
- }>,
+ }>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
@@ -1263,19 +1259,19 @@ class Listofworksstudentone extends Component {
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
@@ -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 {
计算规则:
学员离开实训学习界面停止计时;
评测首次通过之后,停止计时
- }>,
+ }>,
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 === "--" ? "--" :
-
学生效率分 = 学生工作效率 / 课堂学生最高
工作效率 * 分值
- }>,
+ }>,
dataIndex: 'efficiencyscore',
key: 'efficiencyscore',
align: 'center',
diff --git a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
index 603a67474..d560a6f1d 100644
--- a/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
+++ b/public/react/src/modules/courses/shixunHomework/shixunreport/Shixunechart.js
@@ -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 + "
"+'学号: '+data.user_id + "
"+'得分:'+ data.echart_data===undefined?"":data.echart_data.myself_object[1];
+ return "姓名:" + data.username + "
" + '学号: ' + data.user_id + "
" + '得分:' + 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 {