diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index 3bb714831..34bef6192 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/public/react/src/modules/courses/signin/css/signincdi.css @@ -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; diff --git a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js index 65fdf6db8..7a03931ca 100644 --- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js +++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js @@ -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) => ( -
- + + {record.title} @@ -66,6 +80,20 @@ class Studentstatistics extends Component { sortDirections: sortDirections, render: (text, record) => (
+ {record.total_duration} @@ -82,6 +110,20 @@ class Studentstatistics extends Component { width: '100px', render: (text, record) => ( + {record.user_name} diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js index fee328025..4959e77ff 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js @@ -40,6 +40,20 @@ class Videostatisticscomtwo extends Component { width: '100px', render: (text, record) => (
+ {record.user_name} @@ -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) => ( -
+ + {record.total_duration}
), @@ -85,6 +114,20 @@ class Videostatisticscomtwo extends Component { sortDirections: sortDirections, render: (text, record) => (
+ {record.feq} @@ -99,9 +142,27 @@ class Videostatisticscomtwo extends Component { className: 'font-14 ', render: (text, record) => (
- {moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')} + + { + record.start_at? + {moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')} + : + -- + }
), }, @@ -113,9 +174,30 @@ class Videostatisticscomtwo extends Component { className: 'font-14 ', render: (text, record) => (
- {moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')} + + { + record.end_at? + {moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')} + : + -- + + } +
), } @@ -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, }) } diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js index cf36eda6b..def241d3b 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js @@ -35,6 +35,20 @@ class Videostatisticslist extends Component { width: '150px', render: (text, record) => (
+ {record.title} @@ -66,6 +80,20 @@ class Videostatisticslist extends Component { sortDirections: sortDirections, render: (text, record) => (
+ {record.total_time} @@ -82,6 +110,20 @@ class Videostatisticslist extends Component { width: '100px', render: (text, record) => ( + {record.user_name} diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js index ce65e98a1..93c4b42ef 100644 --- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js +++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js @@ -102,7 +102,7 @@ function VideoInReviewItem (props) { { - props&&props.mykt!=undefined? + props&&props.mykt!=undefined?isReview !== true && Setmyktid(props.newcourse_video_id,props.newtitle)} style={{ marginTop: '1px', display: 'inline-block'}} @@ -126,7 +126,7 @@ function VideoInReviewItem (props) { :"" } - + { deleteVideo &&