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

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

Browse Source
dev_cs_new
daiao 6 years ago
parent b52b29b379 530179a6b1
commit 2f8f90df59
4 changed files with 219 additions and 76 deletions
Show Stats Download Patch File Download Diff File

0
public/react/src/modules/courses/exercise/yslexercisetable.css
Unescape View File

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

@ -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) => (
<span>
<span className="maxnamewidth100">
{record.name === undefined ?
<span style={{
"color": '#9A9A9A',
@ -152,10 +152,10 @@ class Listofworksstudentone extends Component {
"text-align": "center"
}}>--</span>
:
<span style={{
<a className="maxnamewidth100" title={record.name} style={{
"color": '#07111B',
"text-align": "center"
}}>{record.name}</span>
}}>{record.name}</a>
}
</span>
@ -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) => (
<span>
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}</span>
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === null ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
:
<a
title={record.stduynumber}
className="maxnamewidth110"
style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{
record.stduynumber
}
</a>
}
</span>
),
},
@ -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) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
<a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
)
},
{
title: '学号',
dataIndex: 'stduynumber',
key: 'stduynumber',
align: 'center',
className:'font-14',
align: "center",
className:'font-14 maxnamewidth110',
width:'110px',
render: (text, record) => (
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === null ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
:
<a
title={record.stduynumber}
className="maxnamewidth110"
style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{
record.stduynumber
}
</a>
}
</span>
),
},
@ -420,7 +479,9 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
<span>
{record.classroom === undefined ?<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>--</span> : <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>}
</span>
)
},
{
@ -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) => (
<span style={{"color": '#07111B', "text-align": "center"}}>{record.name}</span>
<a className="maxnamewidth100" title={record.name} style={{"color": '#07111B', "text-align": "center"}}>{record.name}</a>
)
},
{
title: '学号',
dataIndex: 'stduynumber',
key: 'stduynumber',
align: 'center',
className:'font-14',
align: "center",
className:'font-14 maxnamewidth110',
width:'110px',
render: (text, record) => (
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{record.stduynumber === undefined ? "--" : record.stduynumber === null ? "--" : record.stduynumber === "" ? "--" : record.stduynumber}
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === null ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
: record.stduynumber === "" ?
<span style={{
"color": '#9A9A9A',
"text-align": "center"
}}>--
</span>
:
<a
title={record.stduynumber}
className="maxnamewidth110"
style={{
"color": '#9A9A9A',
"text-align": "center"
}}>{
record.stduynumber
}
</a>
}
</span>
),
},
@ -682,7 +773,9 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>
<span>
{record.classroom === undefined ?<span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}> --</span> : record.classroom === "" ? <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>--</span>: record.classroom === null ? <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>--</span> : <span className="ysltable" style={{"color": '#07111B', "text-align": "center"}}>{record.classroom}</span>}
</span>
)
},
{
@ -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;
}
`}</style>
<div className="edu-table edu-back-white ant-tables">
<div className="edu-table edu-back-white ant-tables ysltableo">
{datajs === undefined ? "" : <Table
dataSource={datajs}
columns={columns}
@ -2729,9 +2828,18 @@ class Listofworksstudentone extends Component {
.ant-spin-nested-loading > 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;
}
`}</style>
<div className="edu-table edu-back-white ">
{data === undefined ? "222222" : <Table
<div className="edu-table edu-back-white ysltableow">
{data === undefined ? "" : <Table
dataSource={data}
columns={columnsstu}
pagination={false}
@ -2802,8 +2910,22 @@ class Listofworksstudentone extends Component {
</span>
</li>:""}
<div className="edu-table edu-back-white ">
<style>
{
`
.ysltableows .ant-table-thead > tr > th{
height: 85px;
}
.ysltableows .ant-table-tbody > tr > td{
height: 85px;
}
.ysltableows .ant-table-thead > tr > th, .ant-table-tbody > tr > td {
padding: 9px;
}
`
}
</style>
<div className="edu-table edu-back-white ysltableows">
{data === undefined ? "" : <Table
style={styletable}
dataSource={data}
@ -2918,8 +3040,17 @@ class Listofworksstudentone extends Component {
.ant-spin-nested-loading > 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;
}
`}</style>
<div className="edu-table edu-back-white ">
<div className="edu-table edu-back-white ysltableowss">
{datas === undefined ? "" : <Table
dataSource={datas}
columns={columnsstu}

2
public/react/src/modules/courses/shixunHomework/TraineetraininginformationModal.js
Unescape View File

@ -98,7 +98,7 @@ class TraineetraininginformationModal extends Component {
title: '完成时间',
dataIndex: 'name',
key: 'name',
width: 178,
width: 130,
align: "center",
render: (text, record) => (
<span>

90
public/react/src/modules/courses/shixunHomework/style.css
Unescape View File

@ -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
}
Write Preview
Loading…
Cancel
Save