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

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

Browse Source
courseware
dinglink 5 years ago
parent 31057a0c8e 9409cd90cf
commit eec738421b
5 changed files with 190 additions and 16 deletions
Show Stats Download Patch File Download Diff File

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

@ -423,6 +423,14 @@
color:rgba(255,255,255,1);
line-height: 33px;
}
.maxnamewidth200s{
width: 200px;
max-width: 200px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth150s{
width: 150px;
max-width: 150px;

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

@ -31,11 +31,25 @@ class Studentstatistics extends Component {
dataIndex: 'title',
key: 'title',
align: "center",
className: 'font-14 maxnamewidth150s',
width: '150px',
className: 'font-14 maxnamewidth200s',
width: '200px',
render: (text, record) => (
<div style={{width: '150px'}} className="maxnamewidth150s textalignlefts">
<a className="maxnamewidth150s textalignlefts" style={{
<div style={{width: '200px'}} className="maxnamewidth200s textalignlefts">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth200s textalignlefts" style={{
color:"#333333"
}} title={record.title}>{record.title}</a>
@ -66,6 +80,20 @@ class Studentstatistics extends Component {
sortDirections: sortDirections,
render: (text, record) => (
<div style={{width: '100px'}} className="maxnamewidth100s textalignrights">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s textalignrights" style={{
color:"#333333"
}} title={record.total_duration}>{record.total_duration}</a>
@ -82,6 +110,20 @@ class Studentstatistics extends Component {
width: '100px',
render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.user_name}>{record.user_name}</a>

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

@ -40,6 +40,20 @@ class Videostatisticscomtwo extends Component {
width: '100px',
render: (text, record) => (
<div style={{width: "100px",wordWrap: 'break-word', wordBreak: 'break-word'}} className="maxnamewidth100s">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.user_name}>{record.user_name}</a>
@ -64,12 +78,27 @@ class Videostatisticscomtwo extends Component {
dataIndex: 'total_duration',
key: 'total_duration',
align: "center",
className: 'font-14 maxnamewidth100s',
className: 'font-14 maxnamewidth200s',
width: '100px',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<div style={{width: '100px'}} className="maxnamewidth100s"><a className="maxnamewidth100s" style={{
<div style={{width: '100px'}} className="maxnamewidth200s">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth200s" style={{
color:"#333333"
}} title={record.total_duration}>{record.total_duration}</a></div>
),
@ -85,6 +114,20 @@ class Videostatisticscomtwo extends Component {
sortDirections: sortDirections,
render: (text, record) => (
<div style={{width: '100px'}} className="maxnamewidth100s">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.feq}>{record.feq}</a>
@ -99,9 +142,27 @@ class Videostatisticscomtwo extends Component {
className: 'font-14 ',
render: (text, record) => (
<div>
<a style={{
color:"#333333"
}} title={moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}> {moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}</a>
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
{
record.start_at?
<a style={{
}} title={moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}>{moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}</a>
:
<span style={{color:"#333333"}}>--</span>
}
</div>
),
},
@ -113,9 +174,30 @@ class Videostatisticscomtwo extends Component {
className: 'font-14 ',
render: (text, record) => (
<div>
<a style={{
color:"#333333"
}} title={moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}>{moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}</a>
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
{
record.end_at?
<a style={{
}} title={moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}>{moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}</a>
:
<span style={{color:"#333333"}}>--</span>
}
</div>
),
}
@ -204,8 +286,8 @@ class Videostatisticscomtwo extends Component {
is_finished: response.data.data[i].is_finished,
total_duration: response.data.data[i].total_duration?formatSeconds(response.data.data[i].total_duration):0,
feq: response.data.data[i].feq,
start_at: response.data.data[i].start_at,
end_at: response.data.data[i].end_at,
start_at: response.data.data[i].start_at?response.data.data[i].start_at:null,
end_at: response.data.data[i].end_at?response.data.data[i].end_at:null,
title: response.data.data[i].title,
})
}

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

@ -35,6 +35,20 @@ class Videostatisticslist extends Component {
width: '150px',
render: (text, record) => (
<div style={{width: '150px'}} className="maxnamewidth150s textalignlefts">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth150s textalignlefts" style={{
color:"#333333"
}} title={record.title}>{record.title}</a>
@ -66,6 +80,20 @@ class Videostatisticslist extends Component {
sortDirections: sortDirections,
render: (text, record) => (
<div style={{width: '100px'}} className="maxnamewidth100s textalignrights">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s textalignrights" style={{
color:"#333333"
}} title={record.total_time}>{record.total_time}</a>
@ -82,6 +110,20 @@ class Videostatisticslist extends Component {
width: '100px',
render: (text, record) => (
<span style={{width: '100px'}} className="maxnamewidth100s">
<script>
{
`
a{ 
    text-decoration:none;
    color:#333;
}
a:hover{
    text-decoration:none;
    color:#333;
}
`
}
</script>
<a className="maxnamewidth100s" style={{
color:"#333333"
}} title={record.user_name}>{record.user_name}</a>

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

@ -102,7 +102,7 @@ function VideoInReviewItem (props) {
{
props&&props.mykt!=undefined?
props&&props.mykt!=undefined?isReview !== true &&
<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'}}

Write Preview
Loading…
Cancel
Save