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

Merge branches 'courseware' and 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into courseware

Browse Source
courseware
杨树林 5 years ago
parent 20e4e2e414 31ab41198f
commit a13d0b4f04
5 changed files with 44 additions and 33 deletions
Show Stats Download Patch File Download Diff File

8
public/react/src/modules/courses/signin/css/signincdi.css
Unescape View File

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

14
public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
Unescape View File

@ -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>
), ),
}, },
], ],

2
public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
Unescape View File

@ -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>
), ),
}, },
{ {

18
public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
Unescape View File

@ -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>
), ),
}, },
{ {

33
public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
Unescape View File

@ -91,32 +91,26 @@ function VideoInReviewItem (props) {
<div> <div>
{
props&&props.mykt!=undefined?
<Tooltip title="统计" placement="bottom">
<i className="icon-tongji1 iconfont font-15" onClick={() => Setmyktid(props.newcourse_video_id,props.newtitle)}
style={{ marginTop: '1px', display: 'inline-block'}}
></i>
</Tooltip>:""
}
{ {
isReview !== true && moveVideo && isReview !== true && moveVideo &&
<Tooltip title="移动" placement="bottom"> <Tooltip title="移动" placement="bottom">
<i className="icon-yidong iconfont font-15" onClick={() => moveVideo(props)} <i className="icon-yidong iconfont font-15" onClick={() => moveVideo(props)}
style={{ marginTop: '1px', display: 'inline-block'}} style={{ marginTop: '1px', display: 'inline-block'}}
></i> ></i>
</Tooltip> </Tooltip>
} }
{ {
deleteVideo && props&&props.mykt!=undefined?
<Tooltip title="删除" placement="bottom"> <Tooltip title="统计" placement="bottom">
<i className="icon-shanchu iconfont" onClick={() => deleteVideo(props)} <i className="icon-tongji1 iconfont font-15" onClick={() => Setmyktid(props.newcourse_video_id,props.newtitle)}
style={{ marginTop: '1px', display: 'inline-block'}} style={{ marginTop: '1px', display: 'inline-block'}}
></i> ></i>
</Tooltip> </Tooltip>:""
} }
{ {
isReview !== true && operation && isReview !== true && operation &&
<Tooltip title="编辑" placement="bottom"> <Tooltip title="编辑" placement="bottom">
@ -125,6 +119,7 @@ function VideoInReviewItem (props) {
></i> ></i>
</Tooltip> </Tooltip>
} }
{ {
isReview !== true && !link ? isReview !== true && !link ?
<Tooltip title="复制" placement="bottom"> <Tooltip title="复制" placement="bottom">
@ -132,6 +127,14 @@ function VideoInReviewItem (props) {
</Tooltip>:"" </Tooltip>:""
} }
{
deleteVideo &&
<Tooltip title="删除" placement="bottom">
<i className="icon-shanchu iconfont" onClick={() => deleteVideo(props)}
style={{ marginTop: '1px', display: 'inline-block'}}
></i>
</Tooltip>
}
</div> </div>
</div> </div>
</div> </div>

Write Preview
Loading…
Cancel
Save