From 5f34758f7512e1fa68d9789727b3ba1734bf82cf Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 18:48:58 +0800 Subject: [PATCH 1/4] account --- public/react/src/App.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/react/src/App.js b/public/react/src/App.js index d4c70e6aa..1a1af02d9 100644 --- a/public/react/src/App.js +++ b/public/react/src/App.js @@ -263,7 +263,7 @@ class App extends Component { {/**/} {/*认证*/} - {/**/} + {/*403*/} From 205574281e4f222e4df61d908562dd68ae11cfdb Mon Sep 17 00:00:00 2001 From: hjm <63528605@qq.com> Date: Fri, 28 Jun 2019 18:57:08 +0800 Subject: [PATCH 2/4] disable --- .../react/src/modules/courses/exercise/new/JudgeEditor.js | 5 +++-- .../src/modules/courses/exercise/new/SingleEditor.js | 8 ++++---- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/public/react/src/modules/courses/exercise/new/JudgeEditor.js b/public/react/src/modules/courses/exercise/new/JudgeEditor.js index 2d6b20398..a5571aab4 100644 --- a/public/react/src/modules/courses/exercise/new/JudgeEditor.js +++ b/public/react/src/modules/courses/exercise/new/JudgeEditor.js @@ -189,8 +189,9 @@ class SingleEditor extends Component{
- 对 - 错 + {/* disabled={exerciseIsPublish} */} + 对 + 错 {/* not work */} {/* this.onOptionClick(0)} disabled={exerciseIsPublish}>对 diff --git a/public/react/src/modules/courses/exercise/new/SingleEditor.js b/public/react/src/modules/courses/exercise/new/SingleEditor.js index 6120e9aea..8cbcdec06 100644 --- a/public/react/src/modules/courses/exercise/new/SingleEditor.js +++ b/public/react/src/modules/courses/exercise/new/SingleEditor.js @@ -165,9 +165,9 @@ class SingleEditor extends Component{ } onOptionClick = (index) => { - if (this.props.exerciseIsPublish) { - return; - } + // if (this.props.exerciseIsPublish) { + // return; + // } let standard_answers = this.state.standard_answers.slice(0) standard_answers[index] = !standard_answers[index] this.setState({ standard_answers }) @@ -247,7 +247,7 @@ class SingleEditor extends Component{ {/* */} this.onOptionClick(index)} style={{flex: '0 0 38px'}}> - +
{tagArray[index]}
 From 94f990a9b95e4303e94817c98457598048ef9e64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 29 Jun 2019 00:05:06 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../exercise/Exercisestatisticalresult.js | 2 +- .../exercise/Studentshavecompletedthelist.js | 2458 ++++++++++++----- .../exercise/Testpapersettinghomepage.js | 6 +- .../courses/shixunHomework/Listofworks.js | 2089 +++++++++----- 4 files changed, 3241 insertions(+), 1314 deletions(-) diff --git a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js index 1e34838d9..5e2a69dbe 100644 --- a/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js +++ b/public/react/src/modules/courses/exercise/Exercisestatisticalresult.js @@ -102,7 +102,7 @@ class Exercisestatisticalresult extends Component { } `} -
+
{data&&data.course_groups.length===0?"":
diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 7d0a0b54e..391edb90a 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -60,7 +60,7 @@ class Studentshavecompletedthelist extends Component { course_groupsdatas: false, noclassroom: undefined, current_status: props.current_status, - course_groupyslstwodata: [{id: 0, tu: "未提交"}, {id: 1, tu: "提交"}], + course_groupyslstwodata: [{id: 0, tu: "未提交"}, {id: 1, tu: "已提交"}], columns: [ { title: '序号', @@ -71,7 +71,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.number} + {record.number === "--" ? + {record.number} + : + {record.number} + + } ) }, @@ -84,7 +89,12 @@ class Studentshavecompletedthelist extends Component { width: "110px", render: (text, record) => ( - {record.name} + {record.name === "--" ? + {record.name} + : + {record.name} + + } ) }, @@ -97,11 +107,26 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + {record.stduynumber === null ? + -- : + record.stduynumber === + "" ? + -- : + {record.stduynumber} + } + ), }, @@ -114,11 +139,26 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom} + {record.classroom === null ? + -- : + record.classroom === + "" ? + -- : + {record.classroom} + } + ) }, @@ -132,11 +172,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -153,36 +193,52 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime === "--" ? + {record.updatetime} + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", width: "124px", render: (text, record) => ( - - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 60 ? { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - } : { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - }}>{record.completion} + { + record.completion === "--" ? + + {record.completion} + + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.completion) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.completion) <= 60 ? { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + } : + { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + }}>{record.completion} + } + ) }, @@ -195,20 +251,29 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} - + {record.levelscore === "--" ? + + {record.levelscore} + + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.levelscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.levelscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } ) }, @@ -221,22 +286,32 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + + {record.efficiencyscore} + + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + }}>{record.efficiencyscore} + } ) } @@ -251,7 +326,14 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - {record.number} + { + record.number === "--" ? + {record.number} + + : + {record.number} + + } ) }, @@ -264,7 +346,13 @@ class Studentshavecompletedthelist extends Component { width: "110px", render: (text, record) => ( - {record.name} + { + record.name === "--" ? + {record.name} + : + {record.name} + + } ) }, @@ -277,11 +365,27 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + {record.stduynumber === null ? + -- + : + record.stduynumber === "" ? + -- + : + {record.stduynumber} + } + ), }, @@ -294,11 +398,24 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom} + {record.classroom === null ? + --: record.classroom === "" ? + --: + {record.classroom} + } + ) }, @@ -312,11 +429,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -333,12 +450,16 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime === "--"? + -- + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', @@ -346,23 +467,34 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.completion) <= 60 ? { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - } : { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - }}>{record.completion} + {record.completion === "--" ? + + -- + + + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.completion) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.completion) <= 60 ? { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + } : { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + }}>{record.completion} + } ) }, @@ -375,20 +507,29 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.levelscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} - + {record.levelscore === "--"? + + -- + + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.levelscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.levelscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } ) }, @@ -401,22 +542,32 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center" - , "width": "124px" - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center" - , "width": "124px" - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center" - , "width": "124px" - }}>{record.efficiencyscore} + { + record.efficiencyscore === "--"? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center" + , "width": "124px" + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center" + , "width": "124px" + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center" + , "width": "124px" + }}>{record.efficiencyscore} + } + ) } @@ -430,7 +581,13 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.number} + { + record.number=== "--"? + -- + : + {record.number} + } + ) }, @@ -442,7 +599,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.name} + { + record.name === "--" ? + -- + : + {record.name} + } ) }, @@ -454,10 +616,23 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } + ), }, @@ -469,10 +644,21 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } + ) }, @@ -485,10 +671,10 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -503,31 +689,47 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.updatetime} + { + record.updatetime === "--" ? + -- + + : + {record.updatetime} + + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.completion) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.completion) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.completion} + { + record.completion === "--"? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.completion) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.completion) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.completion} + } + ) }, @@ -539,16 +741,23 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.levelscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.levelscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + { + record.levelscore === "--" ? + -- : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.levelscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.levelscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : {"color": '#747A7F', "text-align": "center"}}>{record.levelscore} + } ) @@ -561,32 +770,44 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} - + { + record.efficiencyscore === "--" ? + -- : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } + ) }, { - title: '查看', + title: '操作', dataIndex: 'operating', key: 'operating', align: 'center', className: "edu-txt-center", render: (text, record) => ( - {record.operating} + {record.operating==="--"? + {record.operating} + : + {record.operating} + } + ) }, @@ -605,10 +826,14 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {rrecord.number === "--" ? + -- + : + {record.number} + } ) }, @@ -618,10 +843,14 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'149px', + width: '149px', render: (text, record) => ( - {record.name} + {record.name==="--"? + {record.name} + : + {record.name} + } ) }, @@ -631,10 +860,14 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'159px', + width: '159px', render: (text, record) => ( - - {record.stduynumber} + + {record.stduynumber === "--" ? + {record.stduynumber} + : + {record.stduynumber} + } ), }, @@ -646,7 +879,11 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom} + {record.classroom==="--"? + {record.classroom} + : + {record.classroom} + } ) }, @@ -656,16 +893,17 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.submitstate} + {record.submitstate} + ) @@ -675,24 +913,32 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', - width:'194px', + width: '194px', className: "edu-txt-center", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + -- + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.completion} + {record.completion=== "--"? + -- + : + {record.completion} + } ) }, @@ -702,10 +948,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center", - width:'130px', + width: '130px', render: (text, record) => ( - {record.levelscore} + {record.levelscore==="--"? + -- + : + {record.levelscore} + } ) }, @@ -715,22 +965,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -740,11 +995,17 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center", - width:'78px', + width: '78px', render: (text, record) => ( - {record.finalscore} + {record.finalscore==="--"? + -- + : + {record.finalscore} + } + ) }, @@ -756,13 +1017,13 @@ class Studentshavecompletedthelist extends Component { paginationonChange = (pageNumber) => { // console.log('Page: '); - if(this.state.loadingstate=== false){ + if (this.state.loadingstate === false) { this.setState({ page: pageNumber, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ page: pageNumber, }) @@ -773,13 +1034,13 @@ class Studentshavecompletedthelist extends Component { } paginationonChanges = (pageNumber) => { // console.log('Page: '); - if(this.state.loadingstate=== false) { + if (this.state.loadingstate === false) { this.setState({ page: pageNumber, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ page: pageNumber, }) @@ -851,10 +1112,17 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -866,7 +1134,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -878,10 +1151,22 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -894,7 +1179,7 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -924,10 +1213,24 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.efficiencyscore === null ? "--" : record.efficiencyscore === "" ? "--" : record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -944,7 +1247,7 @@ class Studentshavecompletedthelist extends Component { 查看 : - {"--"} } @@ -964,10 +1267,18 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } + ) }, @@ -979,7 +1290,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -991,10 +1307,22 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1006,10 +1334,21 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom === null ? "--" : record.classroom === "" ? "--" : record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } + ) }, @@ -1022,10 +1361,10 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1040,7 +1379,11 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1052,10 +1395,24 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.efficiencyscore === null ? "--" : record.efficiencyscore === "" ? "--" : record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -1072,7 +1429,7 @@ class Studentshavecompletedthelist extends Component { 查看 : - {"--"} } @@ -1087,7 +1444,7 @@ class Studentshavecompletedthelist extends Component { } else { //学生已截止 if (response.data.exercise_types.subjective === 0) { - if(this.state.loadingstate=== false){ + if (this.state.loadingstate === false) { thiss.setState({ columns: [ { @@ -1099,7 +1456,18 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } + ) }, @@ -1112,7 +1480,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1125,8 +1498,23 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber} - + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } + ), }, { @@ -1138,7 +1526,20 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom===""?"--":record.classroom===undefined?"--":record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1152,11 +1553,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1173,7 +1574,11 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1186,7 +1591,24 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -1201,7 +1623,17 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -1214,7 +1646,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1227,7 +1664,22 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1240,7 +1692,20 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1254,11 +1719,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1275,7 +1740,11 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1288,14 +1757,31 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } ], - loadingstate:true, + loadingstate: true, }) - }else{ + } else { thiss.setState({ columns: [ { @@ -1307,7 +1793,17 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -1320,7 +1816,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1333,7 +1834,22 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1346,7 +1862,20 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom===""?"--":record.classroom===undefined?"--":record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1360,11 +1889,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1381,7 +1910,11 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1394,7 +1927,24 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -1409,7 +1959,17 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -1422,7 +1982,12 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1435,7 +2000,22 @@ class Studentshavecompletedthelist extends Component { width: "175px", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1448,7 +2028,20 @@ class Studentshavecompletedthelist extends Component { width: "120px", render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1462,11 +2055,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1483,7 +2076,11 @@ class Studentshavecompletedthelist extends Component { width: "236.4px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1496,7 +2093,24 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -1505,7 +2119,6 @@ class Studentshavecompletedthelist extends Component { } - } thiss.Generatenewdata(response.data.exercise_users, response.data.current_answer_user); } @@ -1515,9 +2128,9 @@ class Studentshavecompletedthelist extends Component { // console.log(response.data.exercise_users) // console.log(response) - if(thiss.state.loadingstate===false){ + if (thiss.state.loadingstate === false) { thiss.setState({ - loadingstate:true, + loadingstate: true, }) } @@ -1531,7 +2144,7 @@ class Studentshavecompletedthelist extends Component { } Generatenewdata(exercise_users, current_answer_user) { - let {page,limit} = this.state; + let {page, limit} = this.state; let datalist = []; let datalisttwo = []; var teacherlist = undefined; @@ -1543,7 +2156,7 @@ class Studentshavecompletedthelist extends Component { datalist.push({ myid: exercise_users[i].login, user_group_id: exercise_users[i].user_group_id, - number:(parseInt(page)-1)*parseInt(limit)+(i+1), + number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), name: exercise_users[i].user_name, stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id, classroom: exercise_users[i].user_group_name, @@ -1558,7 +2171,7 @@ class Studentshavecompletedthelist extends Component { datalist.push({ myid: exercise_users[i].login, user_group_id: exercise_users[i].user_group_id, - number: (parseInt(page)-1)*parseInt(limit)+(i+1), + number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), name: exercise_users[i].user_name, stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id, classroom: exercise_users[i].user_group_name, @@ -1604,13 +2217,13 @@ class Studentshavecompletedthelist extends Component { data: datalisttwo, datas: datalist, teacherlist: teacherlist, - loadingstate:false, + loadingstate: false, }) } Generatenewdatas(exercise_users) { - let{page,limit} = this.state; + let {page, limit} = this.state; let datalist = []; var teacherlist = undefined; var noclassroom = undefined; @@ -1621,7 +2234,7 @@ class Studentshavecompletedthelist extends Component { datalist.push({ myid: exercise_users[i].login, user_group_id: exercise_users[i].user_group_id, - number:(parseInt(page)-1)*parseInt(limit)+(i+1), + number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), name: exercise_users[i].user_name, stduynumber: exercise_users[i].student_id, classroom: exercise_users[i].user_group_name, @@ -1645,7 +2258,7 @@ class Studentshavecompletedthelist extends Component { datas: datalist, teacherlist: teacherlist, noclassroom: noclassroom, - loadingstate:false, + loadingstate: false, }) } @@ -1681,14 +2294,14 @@ class Studentshavecompletedthelist extends Component { if (e === "end_at") { // 时间 // 时间排序是从小到大 - if(this.state.loadingstate===true){ + if (this.state.loadingstate === true) { this.setState({ order: "end_at", }) - }else{ + } else { this.setState({ order: "end_at", - loadingstate:true, + loadingstate: true, }) } @@ -1698,14 +2311,14 @@ class Studentshavecompletedthelist extends Component { if (e === "score") { // 成绩 //成绩排序是从大到小 - if(this.state.loadingstate===true) { + if (this.state.loadingstate === true) { this.setState({ order: "score", }) - }else{ + } else { this.setState({ order: "score", - loadingstate:true, + loadingstate: true, }) } @@ -1715,14 +2328,14 @@ class Studentshavecompletedthelist extends Component { if (e === "student_id") { //学号 //学号排序是从大到小 - if(this.state.loadingstate===true) { + if (this.state.loadingstate === true) { this.setState({ order: "student_id", }) - }else{ + } else { this.setState({ order: "student_id", - loadingstate:true + loadingstate: true }) } @@ -1766,7 +2379,17 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -1779,7 +2402,12 @@ class Studentshavecompletedthelist extends Component { width: "110px", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1792,7 +2420,22 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1805,7 +2448,20 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom===""?"--":record.classroom===undefined?"--":record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1819,11 +2475,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1840,7 +2496,11 @@ class Studentshavecompletedthelist extends Component { width: "236px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1853,7 +2513,24 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -1868,7 +2545,17 @@ class Studentshavecompletedthelist extends Component { width: "84px", render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -1881,7 +2568,12 @@ class Studentshavecompletedthelist extends Component { width: "110px", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -1894,7 +2586,22 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -1907,7 +2614,20 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center tabletd", render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -1921,11 +2641,11 @@ class Studentshavecompletedthelist extends Component { render: (text, record) => ( {record.submitstate} @@ -1942,7 +2662,11 @@ class Studentshavecompletedthelist extends Component { width: "236px", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -1955,19 +2679,36 @@ class Studentshavecompletedthelist extends Component { width: "124px", render: (text, record) => ( - {record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } ], - loadingstate:false, + loadingstate: false, }) } this.Generatenewdata(response.data.exercise_users, response.data.current_answer_user); }).catch((error) => { console.log(error) this.setState({ - loadingstate:false, + loadingstate: false, }) }); } @@ -1975,7 +2716,7 @@ class Studentshavecompletedthelist extends Component { //////老师页面调用的 Generatenewdatasy(exercise_users, response) { - let{page,limit} = this.state; + let {page, limit} = this.state; var thiss = this; let datalist = []; var indexi = 0; @@ -1988,7 +2729,7 @@ class Studentshavecompletedthelist extends Component { datalist.push({ myid: exercise_users[i].login, user_group_id: exercise_users[i].user_group_id, - number: (parseInt(page)-1)*parseInt(limit)+(i+1), + number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), name: exercise_users[i].user_name, stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id, classroom: exercise_users[i].user_group_name, @@ -2003,7 +2744,7 @@ class Studentshavecompletedthelist extends Component { datalist.push({ myid: exercise_users[i].login, user_group_id: exercise_users[i].user_group_id, - number: (parseInt(page)-1)*parseInt(limit)+(i+1), + number: (parseInt(page) - 1) * parseInt(limit) + (i + 1), name: exercise_users[i].user_name, stduynumber: exercise_users[i].student_id === undefined ? "--" : exercise_users[i].student_id === null ? "--" : exercise_users[i].student_id === "" ? "--" : exercise_users[i].student_id, classroom: exercise_users[i].user_group_name, @@ -2032,7 +2773,7 @@ class Studentshavecompletedthelist extends Component { //都没评论 不显示评论 if (response.data.exercise_types.groups_count > 0) { // console.log("77771111111"); - //分班大于0显示分班 + //分班大于0显示分班 //7ge thiss.setState({ data: datalist, @@ -2050,10 +2791,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'110px', + width: '110px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2063,10 +2814,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'183px', + width: '183px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2076,10 +2832,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'193px', + width: '193px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2089,10 +2860,23 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center", - width:'193px', + width: '193px', render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -2102,14 +2886,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'146px', + width: '146px', render: (text, record) => ( {record.submitstate} @@ -2122,10 +2906,14 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'228px', + width: '228px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -2135,22 +2923,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'146px', + width: '146px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -2175,10 +2968,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2187,11 +2990,16 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'name', key: 'name', align: 'center', - width:'149px', + width: '149px', className: "edu-txt-center", render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2200,11 +3008,26 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: 'center', - width:'159px', + width: '159px', className: "edu-txt-center", render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2214,14 +3037,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( {record.submitstate} @@ -2234,10 +3057,14 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'194px', + width: '194px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -2247,22 +3074,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) } @@ -2271,7 +3103,7 @@ class Studentshavecompletedthelist extends Component { } } else { - //已经评论 + //已经评论 // response.data.course_groups.length if (response.data.exercise_types.groups_count > 0) { //显示分班 @@ -2292,10 +3124,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'96px', + width: '96px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2305,10 +3147,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'169px', + width: '169px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2318,10 +3165,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'179px', + width: '179px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2331,10 +3193,23 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'classroom', align: 'center', className: "edu-txt-center", - width:'179px', + width: '179px', render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -2344,14 +3219,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'132px', + width: '132px', render: (text, record) => ( {record.submitstate} @@ -2364,10 +3239,14 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'214px', + width: '214px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -2377,22 +3256,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'132px', + width: '132px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -2402,11 +3286,17 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center", - width:'98px', + width: '98px', render: (text, record) => ( - -- + : + {record.finalscore} + } + ) }, @@ -2431,10 +3321,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'110px', + width: '110px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2444,10 +3344,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'228px', + width: '228px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2457,10 +3362,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'193px', + width: '193px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2470,14 +3390,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'146px', + width: '146px', render: (text, record) => ( {record.submitstate} @@ -2490,10 +3410,14 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'193px', + width: '193px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, @@ -2503,22 +3427,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'183px', + width: '183px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -2528,11 +3457,17 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center", - width:'146px', + width: '146px', render: (text, record) => ( - -- + : + {record.finalscore} + } + ) }, @@ -2546,7 +3481,7 @@ class Studentshavecompletedthelist extends Component { //包括主观题 if (indexi === exercise_users.length) { console.log("2548包含主观题不包含分班"); - if (response.data.exercise_types.groups_count> 0){ + if (response.data.exercise_types.groups_count > 0) { this.setState({ data: datalist, teacherlist: teacherlist, @@ -2562,10 +3497,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2575,10 +3520,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'149px', + width: '149px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2588,10 +3538,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'159px', + width: '159px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2603,7 +3568,20 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -2613,14 +3591,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( {record.submitstate} @@ -2633,23 +3611,31 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'194px', + width: '194px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.completion} + {record.completion=== "--"? + -- + : + {record.completion} + } ) }, @@ -2659,10 +3645,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center", - width:'130px', + width: '130px', render: (text, record) => ( - {record.levelscore} + {record.levelscore==="--"? + -- + : + {record.levelscore} + } ) }, @@ -2672,31 +3662,33 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, ] }) - }else{ + } else { this.setState({ data: datalist, teacherlist: teacherlist, @@ -2712,10 +3704,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2725,10 +3727,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'149px', + width: '149px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2738,10 +3745,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'159px', + width: '159px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2751,14 +3773,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( {record.submitstate} @@ -2771,23 +3793,31 @@ class Studentshavecompletedthelist extends Component { key: 'updatetime', align: 'center', className: "edu-txt-center", - width:'194px', + width: '194px', render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.completion} + {record.completion=== "--"? + -- + : + {record.completion} + } ) }, @@ -2797,10 +3827,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center", - width:'130px', + width: '130px', render: (text, record) => ( - {record.levelscore} + {record.levelscore==="--"? + -- + : + {record.levelscore} + } ) }, @@ -2810,25 +3844,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -2837,7 +3873,7 @@ class Studentshavecompletedthelist extends Component { } } else { console.log("2699包含主观题包含分班"); - if (response.data.exercise_types.groups_count> 0) { + if (response.data.exercise_types.groups_count > 0) { this.setState({ data: datalist, teacherlist: teacherlist, @@ -2854,10 +3890,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -2867,10 +3913,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'149px', + width: '149px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -2880,10 +3931,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'159px', + width: '159px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -2895,7 +3961,20 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center", render: (text, record) => ( - {record.classroom} + {record.classroom === null ? + -- : record.classroom === "" ? + -- : + {record.classroom} + } ) }, @@ -2905,14 +3984,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( {record.submitstate} @@ -2924,24 +4003,32 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', - width:'194px', + width: '194px', className: "edu-txt-center", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.completion} + {record.completion=== "--"? + -- + : + {record.completion} + } ) }, @@ -2951,10 +4038,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center", - width:'130px', + width: '130px', render: (text, record) => ( - {record.levelscore} + {record.levelscore==="--"? + -- + : + {record.levelscore} + } ) }, @@ -2964,22 +4055,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -2989,17 +4085,21 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center", - width:'78px', + width: '78px', render: (text, record) => ( - {record.finalscore} + : + {record.finalscore} + } ) }, ] }) - }else{ + } else { this.setState({ data: datalist, teacherlist: teacherlist, @@ -3016,10 +4116,20 @@ class Studentshavecompletedthelist extends Component { key: 'number', align: 'center', className: "edu-txt-center", - width:'76px', + width: '76px', render: (text, record) => ( - {record.number} + {record.number==="--"? + -- + : + {record.number} + } ) }, @@ -3029,10 +4139,15 @@ class Studentshavecompletedthelist extends Component { key: 'name', align: 'center', className: "edu-txt-center", - width:'149px', + width: '149px', render: (text, record) => ( - {record.name} + {record.name==="--"? + -- + : + {record.name} + + } ) }, @@ -3042,10 +4157,25 @@ class Studentshavecompletedthelist extends Component { key: 'stduynumber', align: 'center', className: "edu-txt-center", - width:'159px', + width: '159px', render: (text, record) => ( - {record.stduynumber} + {record.stduynumber === null ? + -- + : record.stduynumber === "" ? + -- + : + {record.stduynumber} + } ), }, @@ -3055,14 +4185,14 @@ class Studentshavecompletedthelist extends Component { key: 'submitstate', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( {record.submitstate} @@ -3074,24 +4204,32 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', - width:'194px', + width: '194px', className: "edu-txt-center", render: (text, record) => ( - {record.updatetime} + {record.updatetime==="--"? + + : + {record.updatetime} + } ), }, { - title: '客观题分', + title: '客观题得分', dataIndex: 'completion', key: 'completion', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - {record.completion} + {record.completion=== "--"? + -- + : + {record.completion} + } ) }, @@ -3101,10 +4239,14 @@ class Studentshavecompletedthelist extends Component { key: 'levelscore', align: 'center', className: "edu-txt-center", - width:'130px', + width: '130px', render: (text, record) => ( - {record.levelscore} + {record.levelscore==="--"? + -- + : + {record.levelscore} + } ) }, @@ -3114,22 +4256,27 @@ class Studentshavecompletedthelist extends Component { key: 'efficiencyscore', align: 'center', className: "edu-txt-center", - width:'112px', + width: '112px', render: (text, record) => ( - 90 ? { - "color": '#DD1717', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 90 ? { - "color": '#FF6800', - "text-align": "center", - } : parseInt(record.efficiencyscore) <= 60 ? { - "color": '#747A7F', - "text-align": "center", - } : { - "color": '#747A7F', - "text-align": "center", - }}>{record.efficiencyscore} + {record.efficiencyscore === "--" ? + -- + : + 90 ? { + "color": '#DD1717', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 90 ? { + "color": '#FF6800', + "text-align": "center", + } : parseInt(record.efficiencyscore) <= 60 ? { + "color": '#747A7F', + "text-align": "center", + } : { + "color": '#747A7F', + "text-align": "center", + }}>{record.efficiencyscore} + } ) }, @@ -3139,11 +4286,16 @@ class Studentshavecompletedthelist extends Component { key: 'finalscore', align: 'center', className: "edu-txt-center", - width:'78px', + width: '78px', render: (text, record) => ( - {record.finalscore} + : + {record.finalscore} + } + ) }, @@ -3154,7 +4306,7 @@ class Studentshavecompletedthelist extends Component { } } this.setState({ - loadingstate:false + loadingstate: false }) } @@ -3201,13 +4353,13 @@ class Studentshavecompletedthelist extends Component { } notlimited = () => { - if(this.state.loadingstate === false){ + if (this.state.loadingstate === false) { this.setState({ unlimited: 0, course_groupyslsthree: undefined, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ unlimited: 0, course_groupyslsthree: undefined, @@ -3225,13 +4377,13 @@ class Studentshavecompletedthelist extends Component { // this.Searchdatasys(this.state.order, null, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null); // } notlimiteds = () => { - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ unlimiteds: 0, course_groupyslstwo: undefined, loadingstate: true, }) - }else{ + } else { this.setState({ unlimiteds: 0, course_groupyslstwo: undefined, @@ -3244,13 +4396,13 @@ class Studentshavecompletedthelist extends Component { // console.log(checkedValues) if (JSON.stringify(checkedValues) === "[]") { // console.log(checkedValues); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ loadingstate: true, course_groupyslstwo: undefined, unlimiteds: 0, }) - }else{ + } else { this.setState({ course_groupyslstwo: undefined, unlimiteds: 0, @@ -3259,13 +4411,13 @@ class Studentshavecompletedthelist extends Component { this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null); } else if (checkedValues.length === data.length) { - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ loadingstate: true, course_groupyslstwo: undefined, unlimiteds: 0, }) - }else{ + } else { this.setState({ course_groupyslstwo: undefined, unlimiteds: 0, @@ -3276,13 +4428,13 @@ class Studentshavecompletedthelist extends Component { } else { // console.log(checkedValues); this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, null, null); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ loadingstate: true, course_groupyslstwo: checkedValues, unlimiteds: 1 }) - }else{ + } else { this.setState({ course_groupyslstwo: checkedValues, unlimiteds: 1 @@ -3317,13 +4469,13 @@ class Studentshavecompletedthelist extends Component { if (JSON.stringify(checkedValues) === "[]") { // console.log(checkedValues); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ unlimited: 0, course_groupyslsthree: undefined, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ unlimited: 0, course_groupyslsthree: undefined, @@ -3332,13 +4484,13 @@ class Studentshavecompletedthelist extends Component { this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null); } else if (checkedValues.length === data.length) { - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ unlimited: 0, course_groupyslsthree: undefined, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ unlimited: 0, course_groupyslsthree: undefined, @@ -3348,13 +4500,13 @@ class Studentshavecompletedthelist extends Component { this.Searchdatasys(this.state.order, this.state.commit_status, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, null, null); } else { // console.log(checkedValues); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ unlimited: 1, - loadingstate:true, + loadingstate: true, course_groupyslsthree: checkedValues, }) - }else { + } else { this.setState({ unlimited: 1, course_groupyslsthree: checkedValues, @@ -3367,14 +4519,14 @@ class Studentshavecompletedthelist extends Component { } funtaskstatustwos = () => { - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ unlimitedtwo: 0, checkedValuesineinfo: undefined, course_groupysls: undefined, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ unlimitedtwo: 0, checkedValuesineinfo: undefined, @@ -3390,13 +4542,13 @@ class Studentshavecompletedthelist extends Component { // console.log(checkedValues); if (JSON.stringify(checkedValues) === "[]") { // console.log(checkedValues); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ course_groupysls: undefined, unlimitedtwo: 0, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ course_groupysls: undefined, unlimitedtwo: 0, @@ -3405,13 +4557,13 @@ class Studentshavecompletedthelist extends Component { this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null) } else if (checkedValues.length === data.length) { - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ course_groupysls: undefined, unlimitedtwo: 0, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ course_groupysls: undefined, unlimitedtwo: 0, @@ -3421,14 +4573,14 @@ class Studentshavecompletedthelist extends Component { this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, checkedValues, this.state.searchtext, null, null) } else { // console.log(checkedValues); - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ checkedValuesineinfo: checkedValues, course_groupysls: checkedValues, unlimitedtwo: 1, - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ checkedValuesineinfo: checkedValues, course_groupysls: checkedValues, @@ -3451,7 +4603,7 @@ class Studentshavecompletedthelist extends Component { // message.error("请输入姓名或学号搜索"); // return // } - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ loadingstate: true, }) @@ -3481,7 +4633,7 @@ class Studentshavecompletedthelist extends Component { // message.error("请输入姓名或学号搜索"); // return // } - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ loadingstate: true, }) @@ -3499,12 +4651,12 @@ class Studentshavecompletedthelist extends Component { if (e === "end_at") { // 时间 // 时间排序是从小到大 - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ order: "end_at", - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ order: "end_at", }) @@ -3516,12 +4668,12 @@ class Studentshavecompletedthelist extends Component { if (e === "score") { // 成绩 //成绩排序是从大到小 - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ order: "score", - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ order: "score", }) @@ -3534,12 +4686,12 @@ class Studentshavecompletedthelist extends Component { if (e === "student_id") { //学号 //学号排序是从大到小 - if(this.state.loadingstate === false) { + if (this.state.loadingstate === false) { this.setState({ order: "student_id", - loadingstate:true, + loadingstate: true, }) - }else{ + } else { this.setState({ order: "student_id", }) @@ -3563,7 +4715,7 @@ class Studentshavecompletedthelist extends Component { (
@@ -3768,7 +4924,7 @@ class Studentshavecompletedthelist extends Component {
@@ -3781,8 +4937,10 @@ class Studentshavecompletedthelist extends Component { {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交 - { Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"": 剩余提交时间：} - { Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"": + {Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" : + 剩余提交时间：} + {Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" : + {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time} } @@ -3881,8 +5039,11 @@ class Studentshavecompletedthelist extends Component { style={{"color": "#666666"}}>已交 {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.unanswer_users}未交 - { Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"": 剩余提交时间：} - { Teacherliststudentlist&&Teacherliststudentlist.exercise_types.exercise_end_time==="--"?"": {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}} + {Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" : + 剩余提交时间：} + {Teacherliststudentlist && Teacherliststudentlist.exercise_types.exercise_end_time === "--" ? "" : + {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}}
@@ -3945,4 +5112,7 @@ class Studentshavecompletedthelist extends Component { } +// subjective 主要是用于判断答题列表页是否存在 主观题 一栏的 +// 客观题没有判断。当主观题存在时，就会有客观题出现，否则只有总成绩 +// 当subjective 等于1时，就出现3列，客观题，主观题，最终成绩。当subjective等于0时，你就只出现最终成绩一列就行了 export default Studentshavecompletedthelist; \ No newline at end of file diff --git a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js index 818c882e7..aaff6e4a8 100644 --- a/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js +++ b/public/react/src/modules/courses/exercise/Testpapersettinghomepage.js @@ -159,7 +159,7 @@ class Testpapersettinghomepage extends Component{ return(
-
+
{/* 公用的提示弹框 */} {this.state.Modalstype===true?:""} -
+

{this.props.coursedata.name} > @@ -195,7 +195,7 @@ class Testpapersettinghomepage extends Component{ `} -

+

{Commonheadofthetestpaper === undefined?"":Commonheadofthetestpaper.exercise_name}

diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 6995db1ba..8fc4404fa 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -63,7 +63,7 @@ class Listofworks extends Component { page: 1, limit: 20, loadingstate: true, - order: undefined, + order: "updated_at", search: null, task_status: [], course_group_info: [], @@ -100,10 +100,9 @@ class Listofworks extends Component { dataIndex: 'number', key: 'number', align: 'center', - width:'96px', + className:'font-14', render: (text, record) => ( - - {record.number} + {record.number} ) }, @@ -112,11 +111,9 @@ class Listofworks extends Component { dataIndex: 'name', key: 'name', align: 'center', - Width:'147px', + className:'font-14', render: (text, record) => ( - - {record.name} - + {record.name} ) }, { @@ -124,13 +121,12 @@ class Listofworks extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: 'center', - width:'200px', + className:'font-14', render: (text, record) => ( - - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + }}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} ), }, @@ -139,10 +135,10 @@ class Listofworks extends Component { key: 'classroom', dataIndex: 'classroom', align: 'center', + className:'font-14', + width:'288px', render: (text, record) => ( - - {record.classroom} - + {record.classroom} ) }, { @@ -150,15 +146,15 @@ class Listofworks extends Component { dataIndex: 'submitstate', key: 'submitstate', align: 'center', + className:'font-14', render: (text, record) => ( - - {record.submitstate} + }}>{record.submitstate} ) @@ -168,10 +164,9 @@ class Listofworks extends Component { dataIndex: 'updatetime', key: 'updatetime', align: 'center', + className:'font-14', render: (text, record) => ( - - {record.updatetime} - + {record.updatetime} ), }, { @@ -179,13 +174,14 @@ class Listofworks extends Component { dataIndex: 'completion', key: 'completion', align: 'center', + className:'font-14', render: (text, record) => (
已通过{record.completion}关，共{this.state.challenges_count}关
}> - {record.completion+"/"+this.state.challenges_count} + {record.completion+"/"+this.state.challenges_count} @@ -196,9 +192,10 @@ class Listofworks extends Component { dataIndex: 'levelscore', key: 'levelscore', align: 'center', + className:'font-14', render: (text, record) => ( - = 90 ? {"color": '#DD1717', "text-align": "center"} : { "color": '#747A7F', "text-align": "center" - }}>{record.levelscore} + }}>{record.levelscore} ) }, @@ -216,6 +213,7 @@ class Listofworks extends Component { dataIndex: 'efficiencyscore', key: 'efficiencyscore', align: 'center', + className:'font-14', render: (text, record) => ( { @@ -224,18 +222,18 @@ class Listofworks extends Component {
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
}> - + -- - + : record.submitstate==="延时提交"?
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
}> - + -- - + : @@ -243,7 +241,7 @@ class Listofworks extends Component { ) : - = 90 ? { "color": '#DD1717', "text-align": "center" - } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} + } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} } @@ -263,6 +261,7 @@ class Listofworks extends Component { dataIndex: 'finalscore', key: 'finalscore', align: 'center', + className:'font-14', render: (text, record) => ( { @@ -273,13 +272,13 @@ class Listofworks extends Component {
}> { record.finalscore&&record.finalscore==="--"? - {record.finalscore} + }}>{record.finalscore} : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { "color": '#747A7F', "text-align": "center" - }}>{record.finalscore} + }}>{record.finalscore} } : @@ -301,13 +300,13 @@ class Listofworks extends Component {
}> { record.finalscore&&record.finalscore==="--"? - {record.finalscore} + }}>{record.finalscore} : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { "color": '#747A7F', "text-align": "center" - }}>{record.finalscore} + }}>{record.finalscore} } @@ -330,7 +329,7 @@ class Listofworks extends Component { key: 'operating', display: 'block', align: 'center', - width:'93px', + className:'font-14', render: (text, record) => ( record.submitstate === "未提交" ? -- : @@ -338,11 +337,263 @@ class Listofworks extends Component {
直接调整最终成绩的分数
其它评分全部作废
}> - this.Viewstudenttraininginformations(record)}>调分 + this.Viewstudenttraininginformations(record)}>调分 - this.Viewstudenttraininginformation(record)}>{record.operating} + this.Viewstudenttraininginformation(record)}>{record.operating} + + ) + }, + ], + columnss: [ + { + title: '序号', + dataIndex: 'number', + key: 'number', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.number} + + ) + }, + { + title: '姓名', + dataIndex: 'name', + key: 'name', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.name} + ) + }, + { + title: '学号', + dataIndex: 'stduynumber', + key: 'stduynumber', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + + ), + }, + { + title: '分班', + key: 'classroom', + dataIndex: 'classroom', + align: 'center', + className:'font-14', + width:'288px', + render: (text, record) => ( + {record.classroom} + ) + }, + { + title: '提交状态', + dataIndex: 'submitstate', + key: 'submitstate', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.submitstate} + + ) + + }, + { + title: '更新时间', + dataIndex: 'updatetime', + key: 'updatetime', + align: 'center', + className:'font-14', + render: (text, record) => ( + {record.updatetime} + ), + }, + { + title: '完成情况', + dataIndex: 'completion', + key: 'completion', + align: 'center', + className:'font-14', + render: (text, record) => ( + + + +
已通过{record.completion}关，共{this.state.challenges_count}关
+
}> + {record.completion+"/"+this.state.challenges_count} + + + + ) + }, + { + title: '关卡得分', + dataIndex: 'levelscore', + key: 'levelscore', + align: 'center', + className:'font-14', + render: (text, record) => ( + + = 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" + }}>{record.levelscore} + + ) + }, + { + title: '效率分', + dataIndex: 'efficiencyscore', + key: 'efficiencyscore', + align: 'center', + className:'font-14', + render: (text, record) => ( + + { + record.efficiencyscore&& record.efficiencyscore=== "--"?( + record.submitstate==="按时提交"? + +
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
+
}> + + -- + + + : + record.submitstate==="延时提交"? + +
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
+
}> + + -- + + + : + + -- + + ) + : + = 90 ? { + "color": '#DD1717', + "text-align": "center" + } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} + } + + + ) + }, + { + title: '最终成绩', + dataIndex: 'finalscore', + key: 'finalscore', + align: 'center', + className:'font-14', + render: (text, record) => ( + + { + record.ultimate_score=== true? + +
{record.user_name}{record.user_login}
+
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+
}> + { + record.finalscore&&record.finalscore==="--"? + {record.finalscore} + : + = 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" + }}>{record.finalscore} + } + + : + +
{record.user_name}{record.user_login}
+
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+
}> + { + record.finalscore&&record.finalscore==="--"? + {record.finalscore} + : + = 90 ? {"color": '#DD1717', "text-align": "center"} : { + "color": '#747A7F', + "text-align": "center" + }}>{record.finalscore} + } + + + } + + ) + }, + { + title: '操作', + dataIndex: 'operating', + key: 'operating', + display: 'block', + align: 'center', + className:'font-14', + render: (text, record) => ( + record.submitstate === "未提交" ? -- : + + +
直接调整最终成绩的分数
+
其它评分全部作废
+
}> + this.Viewstudenttraininginformations(record)}>调分 + + this.Viewstudenttraininginformation(record)}>{record.operating} ) }, @@ -385,8 +636,8 @@ class Listofworks extends Component { // course_group:分班情况 [232, 231]， []:不限（空数组） var data = { search: "", - order: "desc", - b_order: "asc", + order: this.state.order, + b_order: "desc", work_status: "", course_group: "", page:1, @@ -465,7 +716,6 @@ class Listofworks extends Component { code_review: result.data.code_review, challenges_count:result.data.challenges_count, }) - this.seacthdata(); } @@ -532,625 +782,1132 @@ class Listofworks extends Component { current: this.state.page, } if (this.state.work_efficiency === false) { - if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" :this.state.course_group_info === null){ - columns = [ - { - title: '序号', - dataIndex: 'number', - key: 'number', - align: 'center', - width:'96px', - render: (text, record) => ( - - {record.number} - - ) - }, - { - title: '姓名', - dataIndex: 'name', - key: 'name', - align: 'center', - width:'147px', - render: (text, record) => ( - - {record.name} - - ) - }, - { - title: '学号', - dataIndex: 'stduynumber', - key: 'stduynumber', - align: 'center', - width:'200px', - render: (text, record) => ( - - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} - - ), - }, - { - title: '提交状态', - dataIndex: 'submitstate', - key: 'submitstate', - align: 'center', - render: (text, record) => ( - - {record.submitstate} - - ) - - }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - render: (text, record) => ( - - {record.updatetime} - - ), - }, - { - title: '完成情况', - dataIndex: 'completion', - key: 'completion', - align: 'center', - - render: (text, record) => ( - - - -
已通过{record.completion}关，共{this.state.challenges_count}关
-
}> - {record.completion+"/"+this.state.challenges_count} - - - - ) - }, - { - title: '最终成绩', - dataIndex: 'finalscore', - key: 'finalscore', - align: 'center', - render: (text, record) => ( - - { - record.ultimate_score=== true? - -
{record.user_name}{record.user_login}
-
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
-
}> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - : - -
{record.user_name}{record.user_login}
-
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
-
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
-
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
-
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
-
}> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - - } - - ) - }, - { - title: '操作', - dataIndex: 'operating', - key: 'operating', - display: 'block', - align: 'center', - width:'96px', - render: (text, record) => ( - record.submitstate === "未提交" ? --: - - -
直接调整最终成绩的分数
-
其它评分全部作废
-
}> - this.Viewstudenttraininginformations(record)}>调分 - - this.Viewstudenttraininginformation(record)}>{record.operating} - - ) - }, - ] - + if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined||this.state.course_group_info === null){ + //这里没有分班 没有 关卡得分 没有效率分 + {/* columns = [*/} + {/* {*/} + {/* title: '序号',*/} + {/* dataIndex: 'number',*/} + // key: 'number', + // align: 'center', + // fixed: 'left', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // + // {record.number} + // + // ) + // }, + // { + // title: '姓名', + // dataIndex: 'name', + // key: 'name', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.name} + // + // ) + // }, + // { + // title: '学号', + // dataIndex: 'stduynumber', + // key: 'stduynumber', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + // + // ), + // }, + // { + // title: '提交状态', + // dataIndex: 'submitstate', + // key: 'submitstate', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.submitstate} + // + // ) + // + // }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime} + // + // ), + // }, + // { + // title: '完成情况', + // dataIndex: 'completion', + // key: 'completion', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // + // + //
已通过{record.completion}关，共{this.state.challenges_count}关
+ // }> + // {record.completion+"/"+this.state.challenges_count} + // + // + // + // ) + // }, + // { + // title: '最终成绩', + // dataIndex: 'finalscore', + // key: 'finalscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.ultimate_score=== true? + // + //
{record.user_name}{record.user_login}
+ //
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // : + // + //
{record.user_name}{record.user_login}
+ //
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+ //
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+ //
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+ //
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // + // } + // + // ) + // }, + // { + // title: '操作', + // dataIndex: 'operating', + // key: 'operating', + // display: 'block', + // align: 'center', + // fixed: 'right', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // record.submitstate === "未提交" ? --: + // + // + //
直接调整最终成绩的分数
+ //
其它评分全部作废
+ // }> + // this.Viewstudenttraininginformations(record)}>调分 + // + // this.Viewstudenttraininginformation(record)}>{record.operating} + // + // ) + // }, + // ] + columns.map((item,key)=>{ + if(item.title==="分班"){ + columns.splice(key,1) + } + if(item.title==="关卡得分"){ + columns.splice(key,1) + } + if(item.title==="效率分"){ + columns.splice(key,1) + } + }) }else{ - columns = [ - { - title: '序号', - dataIndex: 'number', - key: 'number', - align: 'center', - width:'96px', - render: (text, record) => ( - - {record.number} - - ) - }, - { - title: '姓名', - dataIndex: 'name', - key: 'name', - align: 'center', - width:'147px', - render: (text, record) => ( - - {record.name} - - ) - }, - { - title: '学号', - dataIndex: 'stduynumber', - key: 'stduynumber', - align: 'center', - width:'200px', - render: (text, record) => ( - - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} - - ), - }, - { - title: '分班', - key: 'classroom', - dataIndex: 'classroom', - align: 'center', - render: (text, record) => ( - - { - record.classroom&&record.classroom==="--"? - - : - - } - - ) - }, - { - title: '提交状态', - dataIndex: 'submitstate', - key: 'submitstate', - align: 'center', - render: (text, record) => ( - - {record.submitstate} - - ) - - }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - render: (text, record) => ( - - {record.updatetime} - - ), - }, - { - title: '完成情况', - dataIndex: 'completion', - key: 'completion', - align: 'center', - - render: (text, record) => ( - - - -
已通过{record.completion}关，共{this.state.challenges_count}关
- }> - {record.completion+"/"+this.state.challenges_count} - - - - ) - }, - { - title: '最终成绩', - dataIndex: 'finalscore', - key: 'finalscore', - align: 'center', - render: (text, record) => ( - - { - record.ultimate_score=== true? - -
{record.user_name}{record.user_login}
-
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
- }> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - : - -
{record.user_name}{record.user_login}
-
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
-
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
-
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
-
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
- }> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - - } - - ) - }, - { - title: '操作', - dataIndex: 'operating', - key: 'operating', - display: 'block', - align: 'center', - width:'96px', - render: (text, record) => ( - record.submitstate === "未提交" ? --: - - -
直接调整最终成绩的分数
-
其它评分全部作废
- }> - this.Viewstudenttraininginformations(record)}>调分 - - this.Viewstudenttraininginformation(record)}>{record.operating} - - ) - }, - ] - + if(this.state.course_group_info.length < 2){ + // columns = [ + // { + // title: '序号', + // dataIndex: 'number', + // key: 'number', + // align: 'center', + // fixed: 'left', + // width:'100px', + // className:'font-14', + {/* render: (text, record) => (*/} + // + {/* {record.number}*/} + {/**/} + {/* )*/} + {/* },*/} + {/* {*/} + {/* title: '姓名',*/} + // dataIndex: 'name', + // key: 'name', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.name} + // + // ) + // }, + // { + // title: '学号', + // dataIndex: 'stduynumber', + // key: 'stduynumber', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + // + // ), + // }, + // { + // title: '提交状态', + // dataIndex: 'submitstate', + // key: 'submitstate', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.submitstate} + // + // ) + // + // }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime} + // + // ), + // }, + // { + // title: '完成情况', + // dataIndex: 'completion', + // key: 'completion', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // + // + //
已通过{record.completion}关，共{this.state.challenges_count}关
+ // }> + // {record.completion+"/"+this.state.challenges_count} + // + // + // + // ) + // }, + // { + // title: '最终成绩', + // dataIndex: 'finalscore', + // key: 'finalscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.ultimate_score=== true? + // + //
{record.user_name}{record.user_login}
+ //
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // : + // + //
{record.user_name}{record.user_login}
+ //
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+ //
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+ //
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+ //
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // + // } + // + // ) + // }, + // { + // title: '操作', + // dataIndex: 'operating', + // key: 'operating', + // display: 'block', + // align: 'center', + // fixed: 'right', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // record.submitstate === "未提交" ? --: + // + // + //
直接调整最终成绩的分数
+ //
其它评分全部作废
+ // }> + // this.Viewstudenttraininginformations(record)}>调分 + // + // this.Viewstudenttraininginformation(record)}>{record.operating} + // + // ) + // }, + // ] + columns.map((item,key)=>{ + if(item.title==="分班"){ + columns.splice(key,1) + } + if(item.title==="关卡得分"){ + columns.splice(key,1) + } + if(item.title==="效率分"){ + columns.splice(key,1) + } + }) + }else { + // columns = [ + // { + // title: '序号', + // dataIndex: 'number', + // key: 'number', + // align: 'center', + // fixed: 'left', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // + // {record.number} + // + // ) + // }, + // { + // title: '姓名', + // dataIndex: 'name', + // key: 'name', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.name} + // + // ) + // }, + // { + // title: '学号', + // dataIndex: 'stduynumber', + // key: 'stduynumber', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}*/} + {/**/} + {/* ),*/} + // }, + // { + // title: '分班', + // key: 'classroom', + {/* dataIndex: 'classroom',*/} + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.classroom&&record.classroom==="--"? + // + // : + // + // } + // + // ) + // }, + // { + // title: '提交状态', + // dataIndex: 'submitstate', + {/* key: 'submitstate',*/} + {/* align: 'center',*/} + {/* className:'font-14',*/} + {/* render: (text, record) => (*/} + {/* */} + {/* {record.submitstate} + // + // ) + // + // }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime} + // + // ), + // }, + // { + // title: '完成情况', + // dataIndex: 'completion', + // key: 'completion', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // + // + //
已通过{record.completion}关，共{this.state.challenges_count}关
+ // }> + // {record.completion+"/"+this.state.challenges_count} + // + // + // + // ) + // }, + // { + // title: '最终成绩', + // dataIndex: 'finalscore', + // key: 'finalscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.ultimate_score=== true? + // + //
{record.user_name}{record.user_login}
+ //
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // : + // + //
{record.user_name}{record.user_login}
+ //
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+ //
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+ //
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+ //
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // + // } + // + // ) + // }, + // { + // title: '操作', + // dataIndex: 'operating', + // key: 'operating', + // display: 'block', + // align: 'center', + // fixed: 'right', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // record.submitstate === "未提交" ? --: + // + // + //
直接调整最终成绩的分数
+ //
其它评分全部作废
+ // }> + // this.Viewstudenttraininginformations(record)}>调分 + // + // this.Viewstudenttraininginformation(record)}>{record.operating} + // + // ) + // }, + // ] + columns.map((item,key)=>{ + if(item.title==="关卡得分"){ + columns.splice(key,1) + } + if(item.title==="效率分"){ + columns.splice(key,1) + } + }) + } } }else { - if(JSON.stringify(this.state.course_group_info) === "[]" ? "" : this.state.course_group_info === undefined ? "" : this.state.course_group_info === null){ - columns=[ - { - title: '序号', - dataIndex: 'number', - key: 'number', - align: 'center', - width:'96px', - render: (text, record) => ( - - {record.number} - - ) - }, - { - title: '姓名', - dataIndex: 'name', - key: 'name', - align: 'center', - Width:'147px', - render: (text, record) => ( - - {record.name} - - ) - }, - { - title: '学号', - dataIndex: 'stduynumber', - key: 'stduynumber', - align: 'center', - width:'200px', - render: (text, record) => ( - - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} - - ), - }, - { - title: '提交状态', - dataIndex: 'submitstate', - key: 'submitstate', - align: 'center', - render: (text, record) => ( - - {record.submitstate} - - ) - - }, - { - title: '更新时间', - dataIndex: 'updatetime', - key: 'updatetime', - align: 'center', - render: (text, record) => ( - - {record.updatetime} - - ), - }, - { - title: '完成情况', - dataIndex: 'completion', - key: 'completion', - align: 'center', - render: (text, record) => ( - - - -
已通过{record.completion}关，共{this.state.challenges_count}关
- }> - {record.completion+"/"+this.state.challenges_count} - - - - ) - }, - { - title: '关卡得分', - dataIndex: 'levelscore', - key: 'levelscore', - align: 'center', - render: (text, record) => ( - - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.levelscore} - - ) - }, - { - title: '效率分', - dataIndex: 'efficiencyscore', - key: 'efficiencyscore', - align: 'center', - render: (text, record) => ( - - { - record.efficiencyscore&& record.efficiencyscore=== "--"?( - record.submitstate==="按时提交"? - -
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
- }> - - -- - - - : - record.submitstate==="延时提交"? - -
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
- }> - - -- - - - : - - -- - - ) - : - = 90 ? { - "color": '#DD1717', - "text-align": "center" - } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} - } - - - - ) - }, - { - title: '最终成绩', - dataIndex: 'finalscore', - key: 'finalscore', - align: 'center', - render: (text, record) => ( - - { - record.ultimate_score=== true? - -
{record.user_name}{record.user_login}
-
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
- }> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - : - -
{record.user_name}{record.user_login}
-
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
-
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
-
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
-
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
- }> - { - record.finalscore&&record.finalscore==="--"? - {record.finalscore} - : - = 90 ? {"color": '#DD1717', "text-align": "center"} : { - "color": '#747A7F', - "text-align": "center" - }}>{record.finalscore} - } - - - } - - ) - }, - { - title: '操作', - dataIndex: 'operating', - key: 'operating', - display: 'block', - align: 'center', - width:'93px', - render: (text, record) => ( - record.submitstate === "未提交" ? -- : - - -
直接调整最终成绩的分数
-
其它评分全部作废
- }> - this.Viewstudenttraininginformations(record)}>调分 - - this.Viewstudenttraininginformation(record)}>{record.operating} - - ) - }, - ] - } + if(JSON.stringify(this.state.course_group_info) === "[]"|| this.state.course_group_info === undefined || this.state.course_group_info === null){ + // columns=[ + // { + // title: '序号', + // dataIndex: 'number', + // key: 'number', + // align: 'center', + // fixed: 'left', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // + // {record.number} + // + // ) + // }, + // { + // title: '姓名', + // dataIndex: 'name', + // key: 'name', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.name} + // + // ) + // }, + // { + // title: '学号', + // dataIndex: 'stduynumber', + // key: 'stduynumber', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + // + // ), + // }, + // { + // title: '提交状态', + // dataIndex: 'submitstate', + // key: 'submitstate', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.submitstate} + // + // ) + // + // }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime} + // + // ), + // }, + // { + // title: '完成情况', + // dataIndex: 'completion', + // key: 'completion', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // + // + //
已通过{record.completion}关，共{this.state.challenges_count}关
+ // }> + // {record.completion+"/"+this.state.challenges_count} + // + // + // + // ) + // }, + // { + // title: '关卡得分', + // dataIndex: 'levelscore', + // key: 'levelscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.levelscore} + // + // ) + // }, + // { + // title: '效率分', + // dataIndex: 'efficiencyscore', + // key: 'efficiencyscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.efficiencyscore&& record.efficiencyscore=== "--"?( + // record.submitstate==="按时提交"? + // + //
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
+ // }> + // + // -- + // + // + // : + // record.submitstate==="延时提交"? + // + //
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
+ // }> + // + // -- + // + // + // : + // + // -- + // + // ) + // : + // = 90 ? { + // "color": '#DD1717', + // "text-align": "center" + // } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} + // } + // + // + // + // ) + // }, + // { + // title: '最终成绩', + // dataIndex: 'finalscore', + // key: 'finalscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.ultimate_score=== true? + // + //
{record.user_name}{record.user_login}
+ //
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // : + // + //
{record.user_name}{record.user_login}
+ //
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+ //
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+ //
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+ //
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // + // } + // + // ) + // }, + // { + // title: '操作', + // dataIndex: 'operating', + // key: 'operating', + // display: 'block', + // align: 'center', + // fixed: 'right', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // record.submitstate === "未提交" ? -- : + // + // + //
直接调整最终成绩的分数
+ //
其它评分全部作废
+ // }> + // this.Viewstudenttraininginformations(record)}>调分 + // + // this.Viewstudenttraininginformation(record)}>{record.operating} + // + // ) + // }, + // ] + columns.map((item,key)=>{ + if(item.title==="分班"){ + columns.splice(key,1) + } + }) + }else { + if(this.state.course_group_info.length < 2) { + // columns=[ + // { + // title: '序号', + // dataIndex: 'number', + // key: 'number', + // align: 'center', + // fixed: 'left', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // + // {record.number} + // + // ) + // }, + // { + // title: '姓名', + // dataIndex: 'name', + // key: 'name', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.name} + // + // ) + // }, + // { + // title: '学号', + // dataIndex: 'stduynumber', + // key: 'stduynumber', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + // + // ), + // }, + // { + // title: '提交状态', + // dataIndex: 'submitstate', + // key: 'submitstate', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.submitstate} + // + // ) + // + // }, + // { + // title: '更新时间', + // dataIndex: 'updatetime', + // key: 'updatetime', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // {record.updatetime} + // + // ), + // }, + // { + // title: '完成情况', + // dataIndex: 'completion', + // key: 'completion', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // + // + //
已通过{record.completion}关，共{this.state.challenges_count}关
+ // }> + // {record.completion+"/"+this.state.challenges_count} + // + // + // + // ) + // }, + // { + // title: '关卡得分', + // dataIndex: 'levelscore', + // key: 'levelscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.levelscore} + // + // ) + // }, + // { + // title: '效率分', + // dataIndex: 'efficiencyscore', + // key: 'efficiencyscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.efficiencyscore&& record.efficiencyscore=== "--"?( + // record.submitstate==="按时提交"? + // + //
作业截止时，系统根据学生在课堂成员中的效率表现自动评分
+ // }> + // + // -- + // + // + // : + // record.submitstate==="延时提交"? + // + //
补交结束时，系统根据学生在课堂成员中的效率表现自动评分
+ // }> + // + // -- + // + // + // : + // + // -- + // + // ) + // : + // = 90 ? { + // "color": '#DD1717', + // "text-align": "center" + // } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore} + // } + // + // + // + // ) + // }, + // { + // title: '最终成绩', + // dataIndex: 'finalscore', + // key: 'finalscore', + // align: 'center', + // className:'font-14', + // render: (text, record) => ( + // + // { + // record.ultimate_score=== true? + // + //
{record.user_name}{record.user_login}
+ //
{record.finalscore === "--"?最终调整成绩：0分 :最终调整成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // : + // + //
{record.user_name}{record.user_login}
+ //
{record.levelscore === "--"?关卡得分：0分 :关卡得分：{record.levelscore}分}
+ //
{record.efficiencyscore === "--"?效率评分：0分 :效率评分：{record.efficiencyscore}分}
+ //
{record.late_penalty === "--"?迟交扣分：0分 :迟交扣分：{record.late_penalty}分}
+ //
{record.finalscore === "--"?最终成绩：0分 :最终成绩：{record.finalscore}分}
+ // }> + // { + // record.finalscore&&record.finalscore==="--"? + // {record.finalscore} + // : + // = 90 ? {"color": '#DD1717', "text-align": "center"} : { + // "color": '#747A7F', + // "text-align": "center" + // }}>{record.finalscore} + // } + // + // + // } + // + // ) + // }, + // { + // title: '操作', + // dataIndex: 'operating', + // key: 'operating', + // display: 'block', + // align: 'center', + // fixed: 'right', + // width:'100px', + // className:'font-14', + // render: (text, record) => ( + // record.submitstate === "未提交" ? -- : + // + // + //
直接调整最终成绩的分数
+ //
其它评分全部作废
+ // }> + // this.Viewstudenttraininginformations(record)}>调分 + // + // this.Viewstudenttraininginformation(record)}>{record.operating} + // + // ) + // }, + // ] + columns.map((item,key)=>{ + if(item.title==="分班"){ + columns.splice(key,1) + } + }) + } + columns=this.state.columnss; + } } } else { @@ -1683,7 +2440,7 @@ class Listofworks extends Component { 作业详情

-
+

{teacherdata === undefined ? "" : teacherdata.homework_name}

@@ -1699,7 +2456,7 @@ class Listofworks extends Component {
-
+
this.notlimitedst()}>不限 - this.funtaskstatustwo(e, course_group_info && course_group_info)} - style={{paddingTop: '4px'}}> + style={{paddingTop: '4px',width:'1017px'}}> {course_group_info === undefined ? "" : course_group_info.map((item, key) => { return ( From 73c80c5d3b218022fe2c82d000fb0a68dddfe731 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Sat, 29 Jun 2019 00:38:07 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/shixunHomework/Listofworks.js | 16 +++++++-------- .../Shixunworkdetails/ShixunWorkModal.js | 20 ++++++++++++++----- 2 files changed, 23 insertions(+), 13 deletions(-) diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js index 8fc4404fa..46eb61859 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworks.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js @@ -337,11 +337,11 @@ class Listofworks extends Component {
直接调整最终成绩的分数
其它评分全部作废
}> - this.Viewstudenttraininginformations(record)}>调分 + this.Viewstudenttraininginformations(record)}>调分 - this.Viewstudenttraininginformation(record)}>{record.operating} + this.Viewstudenttraininginformation(record)}>{record.operating} ) }, @@ -589,11 +589,11 @@ class Listofworks extends Component {
直接调整最终成绩的分数
其它评分全部作废
}> - this.Viewstudenttraininginformations(record)}>调分 + this.Viewstudenttraininginformations(record)}>调分 - this.Viewstudenttraininginformation(record)}>{record.operating} + this.Viewstudenttraininginformation(record)}>{record.operating} ) }, diff --git a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js index eaf1c433e..0885c155e 100644 --- a/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js +++ b/public/react/src/modules/courses/shixunHomework/Shixunworkdetails/ShixunWorkModal.js @@ -14,23 +14,32 @@ class ShixunWorkModal extends Component{ } } componentDidMount() { - + let {group_list}=this.state; let url="/homework_commons/"+this.props.match.params.homeworkid+"/group_list.json"; - axios.get(url,{params:{ limit:10, page:1, } }).then((response) => { + console.log(response); if(response.data.group_list===undefined){ this.setState({ course_groups:response.data, group_list:undefined }) }else{ + let newgroup_list=group_list; + response.data.group_list.map((item,key)=>{ + newgroup_list.push(item) + console.log(item); + }) + response.data.ungroup_list.map((items,keys)=>{ + newgroup_list.push(item) + console.log(item); + }) this.setState({ course_groups:response.data, - group_list:response.data.group_list + group_list:newgroup_list, }) } @@ -44,6 +53,7 @@ class ShixunWorkModal extends Component{ //勾选实训 shixunhomeworkedit=(checkedValues)=>{ let{group_list}=this.state; + if(checkedValues.length===group_list.length){ this.setState({ onChangetype:true, @@ -71,10 +81,10 @@ class ShixunWorkModal extends Component{ page:newpage, } }).then((response) => { - response.data. course_groups.group_list&&response.data.group_list.map((item,key)=>{ + response.data.group_list&&response.data.group_list.map((item,key)=>{ newgroup_list.push(item) }) - response.data. course_groups.ungroup_list&&response.data.ungroup_list.map((items,keys)=>{ + response.data.ungroup_list&&response.data.ungroup_list.map((items,keys)=>{ newgroup_list.push(items) }) this.setState({