diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index b8880c6f2..5d3579238 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -23,12 +23,17 @@ import './yslexercisetable.css'; import {getImageUrl, toPath, sortDirections} from 'educoder'; import NoneData from '../../../modules/courses/coursesPublic/NoneData'; import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise"; + const Search = Input.Search; const RadioGroup = Radio.Group; const CheckboxGroup = Checkbox.Group; const {Option} = Select; //学生老师页面 -let columnsystwo=[]; +let columnsystwo = []; +let myssubjective = 0; //是否显示主观题 +let mysubjective_score = 0;//主观题得分 +let myobjective_score = 0;//客观题得分 + class Studentshavecompletedthelist extends Component { // http://localhost:3007/courses/1309/exercises/722/exercises/student_exercise_list?debug=s constructor(props) { @@ -47,7 +52,7 @@ class Studentshavecompletedthelist extends Component { teacherlist: undefined, searchtext: "", Teacherliststudentlist: undefined, - mylistansum:0, + mylistansum: 0, review: null, course_groupysls: undefined, nocomment: false, @@ -72,13 +77,13 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center font-14", - width:'100px', + width: '100px', render: (text, record) => ( {record.number === "--" ? - {record.number} + {record.number} : - {record.number} + {record.number} } @@ -90,15 +95,16 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center font-14 maxnamewidth110", - width:'100px', + width: '100px', render: (text, record) => ( {record.name === "--" ? - {record.name} + {record.name} : - {record.name} + {record.name} } @@ -110,30 +116,30 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center font-14 maxnamewidth175", - width:'175px', + width: '175px', sorter: true, sortDirections: sortDirections, render: (text, record) => ( {record.stduynumber === null ? -- : record.stduynumber === "" ? -- : {record.stduynumber} } @@ -146,26 +152,26 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center font-14 maxnamewidth255", - width:'255px', + width: '255px', render: (text, record) => ( - + {record.classroom === null ? -- : record.classroom === "" ? -- : {record.classroom} } @@ -178,19 +184,19 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center font-14", - width:'98px', + width: '98px', render: (text, record) => ( {record.submitstate} ) @@ -202,18 +208,18 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center font-14", - width:'175px', + width: '175px', sorter: true, defaultSortOrder: 'descend', sortDirections: sortDirections, render: (text, record) => ( {record.updatetime === "--" ? - {record.updatetime} + {record.updatetime} : - {record.updatetime} + {record.updatetime} } ), @@ -224,14 +230,14 @@ class Studentshavecompletedthelist extends Component { key: 'completion', align: 'center', className: "edu-txt-center font-14", - width:'98px', + width: '98px', render: (text, record) => ( { record.completion === "--" ? {record.completion} @@ -239,20 +245,20 @@ class Studentshavecompletedthelist extends Component { 90 ? { color: '#DD1717', textAlign: "center", - width:'98px', - } : parseInt(record.completion) <= 90 ? { + width: '98px', + } : parseInt(record.completion) <= 90 &&parseInt(record.completion)>60? { color: '#FF6800', textAlign: "center", - width:'98px', + width: '98px', } : parseInt(record.completion) <= 60 ? { color: '#747A7F', textAlign: "center", - width:'98px', + width: '98px', } : { color: '#747A7F', textAlign: "center", - width:'98px', + width: '98px', }}>{record.completion} } @@ -265,14 +271,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center font-14", - width:'99px', + width: '99px', render: (text, record) => ( {record.levelscore === "--" ? {record.levelscore} @@ -280,22 +286,36 @@ class Studentshavecompletedthelist extends Component { 90 ? { color: '#DD1717', textAlign: "center", - width:'99px', - } : parseInt(record.levelscore) <= 90 ? { + width: '99px', + } : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore) >60? { color: '#FF6800', textAlign: "center", - width:'99px', + width: '99px', } : parseInt(record.levelscore) <= 60 ? { color: '#747A7F', textAlign: "center", - width:'99px', - } : {color: '#747A7F', textAlign: "center",width:'99px'}}>{record.levelscore} + width: '99px', + } : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore} + { + //主观题老师没有评分是 + parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + + (待批阅) + : + "" + + } + } ) }, { - title:最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
}>, @@ -305,11 +325,11 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", sorter: true, sortDirections: sortDirections, - width:'199px', + width: '199px', render: (text, record) => ( - + {record.efficiencyscore === "--" ? - +
未评分
}> : - record.commit_method===5? -
最终调整成绩：{record.efficiencyscore}分
}> 90 ? { color: '#DD1717', textAlign: "center" - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center" } : parseInt(record.efficiencyscore) <= 60 ? { @@ -342,24 +362,32 @@ class Studentshavecompletedthelist extends Component { : -
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : +
{record.objective_score === undefined ? "" : record.objective_score === "--" ? + 客观题得分：0分 : 客观题得分：{record.objective_score}分}
-
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : +
{record.subjective_score === undefined ? "" : record.subjective_score === "--" ? + 主观题得分：0分 : 主观题得分：{record.subjective_score}分}
- -
{record.efficiencyscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.efficiencyscore}分} -
+ { + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? +
+ 待批阅 +
+ : +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+ }
}> 90 ? { color: '#DD1717', textAlign: "center" - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center" } : parseInt(record.efficiencyscore) <= 60 ? { @@ -369,6 +397,17 @@ class Studentshavecompletedthelist extends Component { color: '#747A7F', textAlign: "center" }}>{record.efficiencyscore} + {//只有一个主观题的时候 + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + + (待批阅) + : + "" + } } @@ -380,9 +419,9 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center font-14", - width:'98px', + width: '98px', render: (text, record) => ( - + -- ) @@ -395,11 +434,11 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center tabletd font-14", - width:'100px', + width: '100px', render: (text, record) => ( { - 我 + 我 } ) @@ -410,14 +449,16 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center tabletd font-14 maxnamewidth110", - width:'100px', + width: '100px', render: (text, record) => ( { record.name === "--" ? - {record.name} + {record.name} : - {record.name} + {record.name} } @@ -429,29 +470,29 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center tabletd font-14 maxnamewidth175", - width:'175px', + width: '175px', render: (text, record) => ( {record.stduynumber === null ? -- : record.stduynumber === "" ? -- : {record.stduynumber} } @@ -464,26 +505,26 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center tabletd font-14 maxnamewidth255", - width:'255px', + width: '255px', render: (text, record) => ( {record.classroom === null ? --: record.classroom === "" ? + width: '255px', + }}>-- : record.classroom === "" ? --: + width: '255px', + }}>-- : {record.classroom} } @@ -496,17 +537,17 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center tabletd font-14", - width:'98px', + width: '98px', render: (text, record) => ( - + {record.submitstate} ) @@ -518,15 +559,15 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center tabletd font-14", - width:'175px', + width: '175px', render: (text, record) => ( - {record.updatetime === "--"? - -- + {record.updatetime === "--" ? + -- : - {record.updatetime} + {record.updatetime} } ), @@ -537,14 +578,14 @@ class Studentshavecompletedthelist extends Component { key: 'completion', align: 'center', className: "edu-txt-center tabletd font-14", - width:'98px', + width: '98px', render: (text, record) => ( {record.completion === "--" ? -- @@ -553,19 +594,19 @@ class Studentshavecompletedthelist extends Component { 90 ? { color: '#DD1717', textAlign: "center", - width:'98px', - } : parseInt(record.completion) <= 90 ? { + width: '98px', + } : parseInt(record.completion) <= 90 && parseInt(record.completion)>60? { color: '#FF6800', textAlign: "center", - width:'98px', + width: '98px', } : parseInt(record.completion) <= 60 ? { color: '#747A7F', textAlign: "center", - width:'98px', + width: '98px', } : { color: '#747A7F', textAlign: "center", - width:'98px', + width: '98px', }}>{record.completion} } @@ -577,14 +618,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center tabletd font-14", - width:'99px', + width: '99px', render: (text, record) => ( - {record.levelscore === "--"? + {record.levelscore === "--" ? -- @@ -592,22 +633,36 @@ class Studentshavecompletedthelist extends Component { 90 ? { color: '#DD1717', textAlign: "center", - width:'99px' - } : parseInt(record.levelscore) <= 90 ? { + width: '99px' + } : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) >60? { color: '#FF6800', textAlign: "center", - width:'99px' + width: '99px' } : parseInt(record.levelscore) <= 60 ? { color: '#747A7F', textAlign: "center", - width:'99px' - } : {color: '#747A7F', textAlign: "center", width:'99px'}}>{record.levelscore} + width: '99px' + } : {color: '#747A7F', textAlign: "center", width: '99px'}}>{record.levelscore} + { + //主观题老师没有评分是 + parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + + (待批阅) + : + "" + + } + } ) }, { - title:最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
}>, @@ -615,78 +670,97 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center tabletd font-14 columnstwoachievement", - width:"199px", + width: "199px", render: (text, record) => ( - + { - record.efficiencyscore === "--"? - + record.efficiencyscore === "--" ? +
未评分
}> -- : - record.commit_method===5? -
最终调整成绩：{record.efficiencyscore}分
}> 90 ? { color: '#DD1717', textAlign: "center", - width:"199px" - } : parseInt(record.efficiencyscore) <= 90 ? { + width: "199px" + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", - width:"199px" + width: "199px" } : parseInt(record.efficiencyscore) <= 60 ? { color: '#747A7F', textAlign: "center", - width:"199px" + width: "199px" } : { color: '#747A7F', textAlign: "center", - width:"199px" + width: "199px" }}>{record.efficiencyscore} : -
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : +
{record.objective_score === undefined ? "" : record.objective_score === "--" ? + 客观题得分：0分 : 客观题得分：{record.objective_score}分}
-
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : +
{record.subjective_score === undefined ? "" : record.subjective_score === "--" ? + 主观题得分：0分 : 主观题得分：{record.subjective_score}分}
- -
{record.efficiencyscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.efficiencyscore}分} -
+ { + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? +
+ 待批阅 +
+ : +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+ }
}> 90 ? { color: '#DD1717', textAlign: "center", - width:"199px" - } : parseInt(record.efficiencyscore) <= 90 ? { + width: "199px" + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", - width:"199px" + width: "199px" } : parseInt(record.efficiencyscore) <= 60 ? { color: '#747A7F', textAlign: "center", - width:"199px" + width: "199px" } : { color: '#747A7F', textAlign: "center", - width:"199px" + width: "199px" }}>{record.efficiencyscore} + {//只有一个主观题的时候 + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + + (待批阅) + : + "" + } } @@ -699,21 +773,21 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center tabletd font-14", - width:"98px", + width: "98px", render: (text, record) => ( - + { - record.submitstate === "未提交"||record.commit_method===5? - -aa- - :record.submitstate === "已提交"? - record.score_open===null||record.score_open===undefined?"": - record.score_open===true? - -aa- + : record.submitstate === "已提交" ? + record.score_open === null || record.score_open === undefined ? "" : + record.score_open === true ? + 查看 - :"" + : "" : - -- + -- } ) @@ -729,7 +803,7 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( { - record.number=== "--"? + record.number === "--" ? -- : {record.number} @@ -789,14 +863,14 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center font-14 maxnamewidth260", - width:"260px", + width: "260px", render: (text, record) => ( {record.classroom === null ? -- : record.classroom === "" ? + }} className="maxnamewidth260">-- : record.classroom === "" ? ( { - record.completion === "--"? + record.completion === "--" ? 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.completion) <= 90 ? { + } : parseInt(record.completion) <= 90&& parseInt(record.completion) >60 ? { color: '#FF6800', textAlign: "center", } : parseInt(record.completion) <= 60 ? { @@ -898,20 +972,34 @@ class Studentshavecompletedthelist extends Component { 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.levelscore) <= 90 ? { + } : parseInt(record.levelscore) <= 90 &&parseInt(record.levelscore)>60? { color: '#FF6800', textAlign: "center", } : parseInt(record.levelscore) <= 60 ? { color: '#747A7F', textAlign: "center", - } : {color: '#747A7F', textAlign: "center"}}>{record.levelscore} + } : {color: '#747A7F', textAlign: "center"}}>{record.levelscore} + { + //主观题老师没有评分是 + parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + + (待批阅) + : + "" + + } + } ) }, { - title: 最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
}>, @@ -923,7 +1011,7 @@ class Studentshavecompletedthelist extends Component { { record.efficiencyscore === "--" ? - +
未评分
}> -- : - record.commit_method===5? - -
最终调整成绩：{record.efficiencyscore}分
- }> +
最终调整成绩：{record.efficiencyscore}分
+ }> 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", } : parseInt(record.efficiencyscore) <= 60 ? { @@ -954,24 +1042,32 @@ class Studentshavecompletedthelist extends Component { : -
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : +
{record.objective_score === undefined ? "" : record.objective_score === "--" ? + 客观题得分：0分 : 客观题得分：{record.objective_score}分}
-
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : +
{record.subjective_score === undefined ? "" : record.subjective_score === "--" ? + 主观题得分：0分 : 主观题得分：{record.subjective_score}分}
- -
{record.efficiencyscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.efficiencyscore}分} -
+ { + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? +
+ 待批阅 +
+ : +
{record.efficiencyscore === "--" ? 最终成绩：0分 : + 最终成绩：{record.efficiencyscore}分} +
+ }
}> 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", } : parseInt(record.efficiencyscore) <= 60 ? { @@ -981,6 +1077,17 @@ class Studentshavecompletedthelist extends Component { color: '#747A7F', textAlign: "center", }}>{record.efficiencyscore} + {//只有一个主观题的时候 + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + + (待批阅) + : + "" + } } @@ -994,10 +1101,10 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", render: (text, record) => ( - {record.operating==="--"? - {record.operating} - :record.submitstate === "未提交"? - -- + {record.operating === "--" ? + {record.operating} + : record.submitstate === "未提交" ? + -- : ( - {record.name==="--"? + {record.name === "--" ? {record.name} : {record.name} @@ -1072,13 +1179,15 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center font-14 maxnamewidth260", - width:'260px', + width: '260px', render: (text, record) => ( - {record.classroom==="--"? - {record.classroom} + {record.classroom === "--" ? + {record.classroom} : - {record.classroom} + {record.classroom} } ) @@ -1114,7 +1223,7 @@ class Studentshavecompletedthelist extends Component { sortDirections: sortDirections, render: (text, record) => ( - {record.updatetime==="--"? + {record.updatetime === "--" ? -- : {record.updatetime} @@ -1130,12 +1239,28 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", render: (text, record) => ( - {record.completion=== "--"? - -- + { + record.completion === "--" ? + -- : - {record.completion} - } - + 90 ? { + color: '#DD1717', + textAlign: "center", + } : parseInt(record.completion) <= 90 && parseInt(record.completion) > 60 ? { + color: '#FF6800', + textAlign: "center", + } : parseInt(record.completion) <= 60 ? { + color: '#747A7F', + textAlign: "center", + } : { + color: '#747A7F', + textAlign: "center", + }}>{record.completion} + } + ) }, { @@ -1146,16 +1271,44 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", render: (text, record) => ( - {record.levelscore==="--"? - -- - : - {record.levelscore} - } + { + record.levelscore === "--" ? + -- : + 90 ? { + color: '#DD1717', + textAlign: "center", + } : parseInt(record.levelscore) <= 90 && parseInt(record.levelscore) > 60 ? { + color: '#FF6800', + textAlign: "center", + } : parseInt(record.levelscore) <= 60 ? { + color: '#747A7F', + textAlign: "center", + } : {color: '#747A7F', textAlign: "center"}}>{record.levelscore} + { + //主观题老师没有评分是 + parseInt(record.levelscore) === 0 && myssubjective === 1 && mysubjective_score > 0 ? + + (待批阅) + : + "" + + } + + + } + ) }, { - title: 最终成绩 + title: 最终成绩 鼠标停留具体分值上可查
看得分明细
}>, @@ -1168,22 +1321,24 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.efficiencyscore === "--" ? - +
未评分
}> - -- + -- : - record.commit_method===5? -
最终调整成绩：{record.efficiencyscore}分
}> 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", } : parseInt(record.efficiencyscore) <= 60 ? { @@ -1197,24 +1352,37 @@ class Studentshavecompletedthelist extends Component { : -
{record.objective_score===undefined?"":record.objective_score === "--" ? 客观题得分：0分 : +
{record.objective_score === undefined ? "" : record.objective_score === "--" ? + 客观题得分：0分 : 客观题得分：{record.objective_score}分}
-
{record.subjective_score===undefined?"":record.subjective_score === "--" ? 主观题得分：0分 : +
{record.subjective_score === undefined ? "" : record.subjective_score === "--" ? + 主观题得分：0分 : 主观题得分：{record.subjective_score}分}
+ { + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? +
+ 待批阅 +
+ : +
+ {record.efficiencyscore === "--" ? + 最终成绩：0分 + : + 最终成绩：{record.efficiencyscore}分 + } +
+ } -
{record.efficiencyscore === "--" ? 最终成绩：0分 : - 最终成绩：{record.efficiencyscore}分} -
-
+
}> 90 ? { color: '#DD1717', textAlign: "center", - } : parseInt(record.efficiencyscore) <= 90 ? { + } : parseInt(record.efficiencyscore) <= 90 && parseInt(record.efficiencyscore) > 60 ? { color: '#FF6800', textAlign: "center", } : parseInt(record.efficiencyscore) <= 60 ? { @@ -1223,7 +1391,19 @@ class Studentshavecompletedthelist extends Component { } : { color: '#747A7F', textAlign: "center", - }}>{record.efficiencyscore} + }}>{parseInt(record.efficiencyscore) === 0 ? 0 : record.efficiencyscore} + {//只有一个主观题的时候 + parseInt(record.efficiencyscore) === 0 && myssubjective === 0 && mysubjective_score > 0 && myobjective_score === 0 ? + + (待批阅) + : + "" + } + } @@ -1238,37 +1418,40 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( { - record.submitstate === "未提交"||record.commit_method===5? + record.submitstate === "未提交" || record.commit_method === 5 ? (//是否助教 - this.props.isAssistant()&&this.props.isAssistant()===true? + this.props.isAssistant() && this.props.isAssistant() === true ? (//助教是否有权限 - this.props.assistant_auth&&this.props.assistant_auth===true? + this.props.assistant_auth && this.props.assistant_auth === true ? this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} + target="_blank" + onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"} : (//是否截止 - this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3? + this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ? this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} + target="_blank" + onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"} : -- ) ) : this.Adjustment(record.user_id)}>{record.has_comment===true?"已评阅":"评阅"} + target="_blank" + onClick={() => this.Adjustment(record.user_id)}>{record.has_comment === true ? "已评阅" : "评阅"} ) - :record.submitstate === "已提交"? + : record.submitstate === "已提交" ? (//是否助教 - this.props.isAssistant()&&this.props.isAssistant()===true? + this.props.isAssistant() && this.props.isAssistant() === true ? (//助教是否有权限 - this.props.assistant_auth&&this.props.assistant_auth===true? + this.props.assistant_auth && this.props.assistant_auth === true ? {record.finalscore} : (//是否截止 - this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status===3? + this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 3 ? {record.finalscore} @@ -1288,8 +1471,8 @@ class Studentshavecompletedthelist extends Component { ) }, ], - // 也会被columnsys当作参数接收 - exercise_status:0, + // 也会被columnsys当作参数接收 + exercise_status: 0, order_type: "desc", exeuserid: 0, subjective: 0, @@ -1302,8 +1485,10 @@ class Studentshavecompletedthelist extends Component { } {/* onClick={() => this.Adjustment(record.user_id)}>评阅*/ } - {/*--*/} + {/*--*/ + } // //console.log("Studentshavecompletedthelist"); // //console.log(props.current_status); // columnsys 老师列表 @@ -1353,16 +1538,16 @@ class Studentshavecompletedthelist extends Component { // console.log("componentDidMount"); // console.log(columnsystwo); try { - columnsystwo=this.state.columnsys; - }catch (e) { + columnsystwo = this.state.columnsys; + } catch (e) { } - // console.log(columnsystwo); + // console.log(columnsystwo); this.Teacherliststudentlist(); try { this.props.triggerRef(this); - }catch (e) { + } catch (e) { } @@ -1391,6 +1576,17 @@ class Studentshavecompletedthelist extends Component { limit: null, } }).then((response) => { + if (response === undefined) { + return + } + try { + myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有 + mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0; + myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0; + } catch (e) { + + } + //学生 if (response.data.exercise_types.user_permission === 1) { this.setState({ @@ -1400,7 +1596,7 @@ class Studentshavecompletedthelist extends Component { exercise_users: response.data.exercise_users, current_answer_user: response.data.current_answer_user, course_groups: response.data.course_groups, - mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users + mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users }) if (response.data.current_answer_user === undefined || response.data.current_answer_user === null) { // 学生未截止 @@ -1410,19 +1606,15 @@ class Studentshavecompletedthelist extends Component { if (this.state.noclassroom === undefined || this.state.noclassroom === "" || this.state.noclassroom === null) { console.log("4"); - var arr =[]; - for(var i=0;i { // //console.log(JSON.stringify(response)); + if (response === undefined) { + return + } this.setState({ Teacherliststudentlist: response.data, review: response.data.review, commit_status: response.data.commit_status, exercise_users: response.data.exercise_users, current_answer_user: response.data.current_answer_user, - mylistansum:response.data.exercise_types.answer_users+response.data.exercise_types.unanswer_users, + mylistansum: response.data.exercise_types.answer_users + response.data.exercise_types.unanswer_users, }) + try { + myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有 + mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0; + myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0; + } catch (e) { + + } if (response.data.exercise_types.subjective === 0) { - var arr =[]; - for(var i=0;i { //console.log(error) this.setState({ @@ -1819,11 +2000,11 @@ class Studentshavecompletedthelist extends Component { levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, - subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore:exercise_users[i].has_comment===true?"已评阅":"评阅", + subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, + finalscore: exercise_users[i].has_comment === true ? "已评阅" : "评阅", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method, - has_comment:exercise_users[i].has_comment + commit_method: exercise_users[i].commit_method, + has_comment: exercise_users[i].has_comment }) } else { datalist.push({ @@ -1839,11 +2020,11 @@ class Studentshavecompletedthelist extends Component { levelscore: exercise_users[i].subjective_score === undefined ? "--" : exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, efficiencyscore: exercise_users[i].score === undefined ? "--" : exercise_users[i].score === null ? "--" : exercise_users[i].score === "" ? "--" : exercise_users[i].score, objective_score: exercise_users[i].objective_score === null ? "--" : exercise_users[i].objective_score === "" ? "--" : exercise_users[i].objective_score, - subjective_score:exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, - finalscore:exercise_users[i].has_comment===true?"已评阅":"--", + subjective_score: exercise_users[i].subjective_score === null ? "--" : exercise_users[i].subjective_score === "" ? "--" : exercise_users[i].subjective_score, + finalscore: exercise_users[i].has_comment === true ? "已评阅" : "--", user_id: exercise_users[i].user_id, - commit_method:exercise_users[i].commit_method, - has_comment:exercise_users[i].has_comment + commit_method: exercise_users[i].commit_method, + has_comment: exercise_users[i].has_comment }) indexi++; } @@ -1867,17 +2048,14 @@ class Studentshavecompletedthelist extends Component { // this.state.columnsys.map((item,key)=>{ // // }) - var arr =[]; - for(var i=0;i 0) { - var arr =[]; - for(var i=0;i { // //console.log("528"); // //console.log(JSON.stringify(response)); - if(response===undefined){ + if (response === undefined) { return } + + this.setState({ loadingstate: false, }) + try { + myssubjective = response.data.exercise_types.subjective?response.data.exercise_types.subjective:0;//记录是否有主观题 1是有 + mysubjective_score = response.data.exercise_types.subjective_score?response.data.exercise_types.subjective_score:0; + myobjective_score = response.data.exercise_types.objective_score?response.data.exercise_types.objective_score:0; + } catch (e) { + + } // //console.log(response); // //console.log(1997); this.Generatenewdatasy(response.data.exercise_users, response); @@ -2181,13 +2354,13 @@ class Studentshavecompletedthelist extends Component { unlimited: 0, course_groupyslsthree: undefined, loadingstate: true, - page:1 + page: 1 }) } else { this.setState({ unlimited: 0, course_groupyslsthree: undefined, - page:1, + page: 1, }) } this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type); @@ -2207,13 +2380,13 @@ class Studentshavecompletedthelist extends Component { unlimiteds: 0, course_groupyslstwo: undefined, loadingstate: true, - page:1, + page: 1, }) } else { this.setState({ unlimiteds: 0, course_groupyslstwo: undefined, - page:1, + page: 1, }) } @@ -2228,13 +2401,13 @@ class Studentshavecompletedthelist extends Component { loadingstate: true, course_groupyslstwo: undefined, unlimiteds: 0, - page:1 + page: 1 }) } else { this.setState({ course_groupyslstwo: undefined, unlimiteds: 0, - page:1, + page: 1, }) } @@ -2268,13 +2441,13 @@ class Studentshavecompletedthelist extends Component { loadingstate: true, course_groupyslstwo: checkedValues, unlimiteds: 1, - page:1, + page: 1, }) } else { this.setState({ course_groupyslstwo: checkedValues, unlimiteds: 1, - page:1, + page: 1, }) } @@ -2311,13 +2484,13 @@ class Studentshavecompletedthelist extends Component { unlimited: 0, course_groupyslsthree: undefined, loadingstate: true, - page:1 + page: 1 }) } else { this.setState({ unlimited: 0, course_groupyslsthree: undefined, - page:1 + page: 1 }) } @@ -2348,13 +2521,13 @@ class Studentshavecompletedthelist extends Component { unlimited: 1, loadingstate: true, course_groupyslsthree: checkedValues, - page:1 + page: 1 }) } else { this.setState({ unlimited: 1, course_groupyslsthree: checkedValues, - page:1 + page: 1 }) } @@ -2370,14 +2543,14 @@ class Studentshavecompletedthelist extends Component { checkedValuesineinfo: undefined, course_groupysls: undefined, loadingstate: true, - page:1, + page: 1, }) } else { this.setState({ unlimitedtwo: 0, checkedValuesineinfo: undefined, course_groupysls: undefined, - page:1, + page: 1, }) } @@ -2393,13 +2566,13 @@ class Studentshavecompletedthelist extends Component { course_groupysls: undefined, unlimitedtwo: 0, loadingstate: true, - page:1, + page: 1, }) } else { this.setState({ course_groupysls: undefined, unlimitedtwo: 0, - page:1, + page: 1, }) } @@ -2431,14 +2604,14 @@ class Studentshavecompletedthelist extends Component { course_groupysls: checkedValues, unlimitedtwo: 1, loadingstate: true, - page:1 + page: 1 }) } else { this.setState({ checkedValuesineinfo: checkedValues, course_groupysls: checkedValues, unlimitedtwo: 1, - page:1 + page: 1 }) } @@ -2460,7 +2633,7 @@ class Studentshavecompletedthelist extends Component { if (this.state.loadingstate === false) { this.setState({ loadingstate: true, - page:1 + page: 1 }) } @@ -2477,7 +2650,7 @@ class Studentshavecompletedthelist extends Component { if (this.state.loadingstate === false) { this.setState({ loadingstate: true, - page:1, + page: 1, }) } @@ -2487,14 +2660,15 @@ class Studentshavecompletedthelist extends Component { }; + _getRequestParams() { - const { order, checkedValuesineinfo,course_groupyslstwo ,searchtext, page ,limit,course_groupyslsthree} = this.state + const {order, checkedValuesineinfo, course_groupyslstwo, searchtext, page, limit, course_groupyslsthree} = this.state return { page, - review:course_groupyslsthree, - commit_status:course_groupyslstwo, - search:searchtext, - exercise_group_id:checkedValuesineinfo, + review: course_groupyslsthree, + commit_status: course_groupyslstwo, + search: searchtext, + exercise_group_id: checkedValuesineinfo, limit: limit, order, } @@ -2694,14 +2868,13 @@ class Studentshavecompletedthelist extends Component { Adjustment = (e) => { // console.log("Adjustment"); // console.log(e); - if(this.state.objective_score===0&&this.state.subjective_score===0){ + if (this.state.objective_score === 0 && this.state.subjective_score === 0) { this.props.showNotification('试卷题型分被限制为0分，不能调分，请点击编辑试卷修改题型分数'); return } - this.setState({ testpapergradingboll: true, exeuserid: e, @@ -2743,7 +2916,6 @@ class Studentshavecompletedthelist extends Component { } - render() { const isAdmin = this.props.isAdmin(); @@ -2767,7 +2939,7 @@ class Studentshavecompletedthelist extends Component { }}> {/*老师*/} { - this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status===1 ? + this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
@@ -2787,7 +2959,7 @@ class Studentshavecompletedthelist extends Component { Saves={(value, num) => this.Testpapergrading(value, num)} /> : "" } -
+
    {/*你的评阅：*/} @@ -2988,7 +3160,7 @@ class Studentshavecompletedthelist extends Component {
    { - this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ? + this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?
    @@ -3075,7 +3247,7 @@ class Studentshavecompletedthelist extends Component { minWidth: " 1200px" }}> { - this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper&&this.props.Commonheadofthetestpaper.exercise_status === 1 ? + this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 0 || this.props.Commonheadofthetestpaper && this.props.Commonheadofthetestpaper.exercise_status === 1 ?