Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

courseware
杨树明 5 years ago
commit 60e6ae5986

@ -494,4 +494,12 @@
} }
.ml32{ .ml32{
margin-left: 32px; margin-left: 32px;
}
.textalignlefts{
text-align: left;
}
.textalignrights{
text-align: right;
} }

@ -34,12 +34,12 @@ class Studentstatistics extends Component {
className: 'font-14 maxnamewidth150s', className: 'font-14 maxnamewidth150s',
width: '150px', width: '150px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s"> <div style={{width: '150px'}} className="maxnamewidth150s textalignlefts">
<a className="maxnamewidth150s" style={{ <a className="maxnamewidth150s textalignlefts" style={{
color:"#333333" color:"#333333"
}} title={record.title}>{record.title}</a> }} title={record.title}>{record.title}</a>
</span> </div>
), ),
}, },
{ {
@ -65,12 +65,12 @@ class Studentstatistics extends Component {
sorter: true, sorter: true,
sortDirections: sortDirections, sortDirections: sortDirections,
render: (text, record) => ( render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s"> <div style={{width: '100px'}} className="maxnamewidth100s textalignrights">
<a className="maxnamewidth100s" style={{ <a className="maxnamewidth100s textalignrights" style={{
color:"#333333" color:"#333333"
}} title={record.total_duration}>{record.total_duration}</a> }} title={record.total_duration}>{record.total_duration}</a>
</span> </div>
), ),
}, },
{ {
@ -98,7 +98,7 @@ class Studentstatistics extends Component {
width: '90px', width: '90px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '90px'}}>{record.is_finished === true ? <span style={{width: '90px'}}>{record.is_finished === true ?
<span style={{color: "#5091FF"}}></span> : <span style={{color: "#E02020"}}></span>}</span> <span style={{color: "#333333"}}></span> : <span style={{color: "#E02020"}}></span>}</span>
), ),
}, },
], ],

@ -56,7 +56,7 @@ class Videostatisticscomtwo extends Component {
width: '90px', width: '90px',
render: (text, record) => ( render: (text, record) => (
<div style={{width: '90px'}} className="maxnamewidth90s">{record.is_finished === true ? <div style={{width: '90px'}} className="maxnamewidth90s">{record.is_finished === true ?
<span style={{color: "#5091FF"}}></span> : <span style={{color: "#E02020"}}></span>}</div> <span style={{color: "#333333"}}></span> : <span style={{color: "#E02020"}}></span>}</div>
), ),
}, },
{ {

@ -31,15 +31,15 @@ class Videostatisticslist extends Component {
dataIndex: 'title', dataIndex: 'title',
key: 'title', key: 'title',
align: "center", align: "center",
className: 'font-14 maxnamewidth150s', className: 'font-14 maxnamewidth150s ',
width: '150px', width: '150px',
render: (text, record) => ( render: (text, record) => (
<span style={{width: '150px'}} className="maxnamewidth150s"> <div style={{width: '150px'}} className="maxnamewidth150s textalignlefts">
<a className="maxnamewidth150s" style={{ <a className="maxnamewidth150s textalignlefts" style={{
color:"#333333" color:"#333333"
}} title={record.title}>{record.title}</a> }} title={record.title}>{record.title}</a>
</span> </div>
), ),
}, },
{ {
@ -56,21 +56,21 @@ class Videostatisticslist extends Component {
), ),
}, },
{ {
title: '累计观看时长', title: '观看时长',
dataIndex: 'total_time', dataIndex: 'total_time',
key: 'total_time', key: 'total_time',
align: "center", align: "center",
className: 'font-14 maxnamewidth100s', className: 'font-14 maxnamewidth100s ',
width: '100px', width: '100px',
sorter: true, sorter: true,
sortDirections: sortDirections, sortDirections: sortDirections,
render: (text, record) => ( render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s"> <div style={{width: '100px'}} className="maxnamewidth100s textalignrights">
<a className="maxnamewidth100s" style={{ <a className="maxnamewidth100s textalignrights" style={{
color:"#333333" color:"#333333"
}} title={record.total_time}>{record.total_time}</a> }} title={record.total_time}>{record.total_time}</a>
</span> </div>
), ),
}, },
{ {

Loading…
Cancel
Save