diff --git a/public/react/src/modules/courses/exercise/yslexercisetable.css b/public/react/src/modules/courses/exercise/yslexercisetable.css new file mode 100644 index 000000000..e69de29bb diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 3605c1326..60e56af51 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -124,10 +124,10 @@ class Listofworksstudentone extends Component { dataIndex: 'name', key: 'name', align: "center", - className:'font-14', + className:'font-14 maxnamewidth100', width:'100px', render: (text, record) => ( - + {record.name === undefined ? -- : - {record.name} + }}>{record.name} } @@ -166,13 +166,42 @@ class Listofworksstudentone extends Component { dataIndex: 'stduynumber', key: 'stduynumber', align: "center", - className:'font-14', + className:'font-14 maxnamewidth110', + width:'110px', render: (text, record) => ( - - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + + {record.stduynumber === undefined ? + -- + + : record.stduynumber === null ? + -- + + : record.stduynumber === "" ? + -- + + : + { + record.stduynumber + } + + + } + ), }, @@ -393,23 +422,53 @@ class Listofworksstudentone extends Component { dataIndex: 'name', key: 'name', align: 'center', - className:'font-14', - width:'120px', + className:'font-14 maxnamewidth100', + width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { title: '学号', dataIndex: 'stduynumber', key: 'stduynumber', - align: 'center', - className:'font-14', + align: "center", + className:'font-14 maxnamewidth110', + width:'110px', render: (text, record) => ( - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + + {record.stduynumber === undefined ? + -- + + : record.stduynumber === null ? + -- + + : record.stduynumber === "" ? + -- + + : + { + record.stduynumber + } + + + } + ), }, @@ -420,7 +479,9 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.classroom} + + {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}} + ) }, { @@ -655,23 +716,53 @@ class Listofworksstudentone extends Component { dataIndex: 'name', key: 'name', align: 'center', - className:'font-14', - width:'120px', + className:'font-14 maxnamewidth100', + width:'100px', render: (text, record) => ( - {record.name} + {record.name} ) }, { title: '学号', dataIndex: 'stduynumber', key: 'stduynumber', - align: 'center', - className:'font-14', + align: "center", + className:'font-14 maxnamewidth110', + width:'110px', render: (text, record) => ( - {record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber} + + {record.stduynumber === undefined ? + -- + + : record.stduynumber === null ? + -- + + : record.stduynumber === "" ? + -- + + : + { + record.stduynumber + } + + + } + ), }, @@ -682,7 +773,9 @@ class Listofworksstudentone extends Component { align: 'center', className:'font-14', render: (text, record) => ( - {record.classroom} + + {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}} + ) }, { @@ -2547,8 +2640,14 @@ class Listofworksstudentone extends Component { .ant-tables .ant-table-tbody > tr > td { height: 85px; } + .ysltableo .ant-table-thead > tr > th{ + height: 85px; + } + .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td { + padding: 9px; + } `} -
+
{datajs === undefined ? "" : div > .ant-spin .ant-spin-dot { top: 72%;} } + .ysltableow .ant-table-thead > tr > th{ + height: 85px; + } + .ysltableow .ant-table-tbody > tr > td{ + height: 85px; + } + .ysltableow .ant-table-thead > tr > th, .ant-table-tbody > tr > td { + padding: 9px; + } `} -
- {data === undefined ? "222222" :
+ {data === undefined ? "" :
:""} - -
+ +
{data === undefined ? "" :
div > .ant-spin .ant-spin-dot { top: 72%;} } + .ysltableowss .ant-table-thead > tr > th{ + height: 85px; + } + .ysltableowss .ant-table-tbody > tr > td{ + height: 85px; + } + .ysltableowss .ant-table-thead > tr > th, .ant-table-tbody > tr > td { + padding: 9px; + } `} -
+
{datas === undefined ? "" :
( diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css index ce937e597..8c2fbda98 100644 --- a/public/react/src/modules/courses/shixunHomework/style.css +++ b/public/react/src/modules/courses/shixunHomework/style.css @@ -1,39 +1,51 @@ -.ant-checkbox-group > div .boardsList{ - /* border-top: 1px solid #ebebeb; */ - padding:10px 0px 20px!important; -} -.ant-checkbox-group > div:first-child .boardsList{ - border-top: none; -} -.boardsList .contentSection { - flex: 1; - margin-left: 15px; -} - - -.ant-select-selection--single,.ant-select-selection__rendered{ - height: 40px; - line-height: 40px; -} - -.ant-input:focus + .ant-input-group-addon{ - background-color: #fff!important; -} -.ant-input-group-addon{ - color: #666!important; - font-size: 12px; - border: 1px solid #d9d9d9!important; - border-left: none!important; -} - -.courseForm .ant-form-item-label{ - margin-left: unset; -} - -/* 毕设选题列表 */ -.TopicDetailTable .topHead{background-color: #F5F5F5;height: 56px;color: #666666;padding:0px 30px} -.TopicDetailTable .topHead span,.TopicDetailTable .bottomBody li span{display: block;float: left;justify-content: center;align-items: center;display: -webkit-flex;height: 56px;} -.TopicDetailTable .bottomBody{padding:0px 30px} -.TopicDetailTable .bottomBody li{border-bottom: 1px solid #eee;clear: both;} -.TopicDetailTable .bottomBody li:last-child{border-bottom: none;} - +.ant-checkbox-group > div .boardsList{ + /* border-top: 1px solid #ebebeb; */ + padding:10px 0px 20px!important; +} +.ant-checkbox-group > div:first-child .boardsList{ + border-top: none; +} +.boardsList .contentSection { + flex: 1; + margin-left: 15px; +} + + +.ant-select-selection--single,.ant-select-selection__rendered{ + height: 40px; + line-height: 40px; +} + +.ant-input:focus + .ant-input-group-addon{ + background-color: #fff!important; +} +.ant-input-group-addon{ + color: #666!important; + font-size: 12px; + border: 1px solid #d9d9d9!important; + border-left: none!important; +} + +.courseForm .ant-form-item-label{ + margin-left: unset; +} + +/* 毕设选题列表 */ +.TopicDetailTable .topHead{background-color: #F5F5F5;height: 56px;color: #666666;padding:0px 30px} +.TopicDetailTable .topHead span,.TopicDetailTable .bottomBody li span{display: block;float: left;justify-content: center;align-items: center;display: -webkit-flex;height: 56px;} +.TopicDetailTable .bottomBody{padding:0px 30px} +.TopicDetailTable .bottomBody li{border-bottom: 1px solid #eee;clear: both;} +.TopicDetailTable .bottomBody li:last-child{border-bottom: none;} + +.maxnamewidth100{ + max-width: 100px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap +} +.maxnamewidth110{ + max-width: 110px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap +} \ No newline at end of file