From 899c75787a7fc690a4821d117ce6d97ff756ebd8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Wed, 18 Mar 2020 00:56:32 +0800
Subject: [PATCH 1/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/user/usersInfo/video/VideoInReviewItem.js     | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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 &&
                             <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'}}
@@ -126,7 +126,7 @@ function VideoInReviewItem (props) {
                                 <i className={`icon-fuzhi iconfont copybtn_item_${id}`} data-clipboard-text={getCopyText((play_url || file_url), cover_url)}></i>
                             </Tooltip>:""
                         }
-                        
+
                         {
                             deleteVideo &&
                             <Tooltip title="删除" placement="bottom">

From 49c87cf075333673f50448dbdc4963ec6cd31064 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 18 Mar 2020 01:06:28 +0800
Subject: [PATCH 2/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/Studentstatistics.js            | 42 +++++++++++
 .../component/Videostatisticscomtwo.js        | 73 ++++++++++++++++++-
 .../component/Videostatisticslist.js          | 42 +++++++++++
 3 files changed, 156 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
index 65fdf6db8..ac17e8bf8 100644
--- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
+++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
@@ -35,6 +35,20 @@ class Studentstatistics 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 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>
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index 9889d97b8..c390bdb45 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) => (
 						<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>
@@ -69,7 +83,22 @@ class Videostatisticscomtwo extends Component {
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
-						<div style={{width: '100px'}} className="maxnamewidth100s"><a className="maxnamewidth100s" style={{
+						<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.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,6 +142,20 @@ class Videostatisticscomtwo extends Component {
 					className: 'font-14 ',
 					render: (text, record) => (
 						<div>
+							<script>
+								{
+									`
+							a{ 
+							    text-decoration:none;
+							    color:#333; 
+							}
+							a:hover{
+							    text-decoration:none;
+							    color:#333; 
+							}
+							`
+								}
+							</script>
 							<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>
@@ -113,6 +170,20 @@ class Videostatisticscomtwo extends Component {
 					className: 'font-14 ',
 					render: (text, record) => (
 						<div>
+							<script>
+								{
+									`
+							a{ 
+							    text-decoration:none;
+							    color:#333; 
+							}
+							a:hover{
+							    text-decoration:none;
+							    color:#333; 
+							}
+							`
+								}
+							</script>
 								<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>
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) => (
 						<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>

From 41ee0e954af8aa4481276460f86d55db8a276861 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 18 Mar 2020 01:12:10 +0800
Subject: [PATCH 3/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/courses/signin/css/signincdi.css | 8 ++++++++
 .../videostatistics/component/Studentstatistics.js        | 8 ++++----
 .../videostatistics/component/Videostatisticscomtwo.js    | 6 +++---
 3 files changed, 15 insertions(+), 7 deletions(-)

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 ac17e8bf8..7a03931ca 100644
--- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
+++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
@@ -31,10 +31,10 @@ 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">
+						<div style={{width: '200px'}} className="maxnamewidth200s textalignlefts">
 							<script>
 								{
 									`
@@ -49,7 +49,7 @@ class Studentstatistics extends Component {
 							`
 								}
 							</script>
-							<a className="maxnamewidth150s textalignlefts" style={{
+							<a className="maxnamewidth200s textalignlefts" style={{
 								color:"#333333"
 							}} title={record.title}>{record.title}</a>
 
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index c390bdb45..004425c63 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -78,12 +78,12 @@ 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">
+						<div style={{width: '100px'}} className="maxnamewidth200s">
 							<script>
 								{
 									`
@@ -98,7 +98,7 @@ class Videostatisticscomtwo extends Component {
 							`
 								}
 							</script>
-							<a className="maxnamewidth100s" style={{
+							<a className="maxnamewidth200s" style={{
 							color:"#333333"
 						}} title={record.total_duration}>{record.total_duration}</a></div>
 					),

From 9409cd90cffe99486545f5103729db8d9a9f8bdc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Wed, 18 Mar 2020 01:15:40 +0800
Subject: [PATCH 4/4] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/Videostatisticscomtwo.js        | 27 +++++++++++++------
 1 file changed, 19 insertions(+), 8 deletions(-)

diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index 004425c63..4bb725cec 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -156,9 +156,13 @@ class Videostatisticscomtwo extends Component {
 							`
 								}
 							</script>
-							<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>
+							{
+								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>
 					),
 				},
@@ -184,9 +188,16 @@ class Videostatisticscomtwo extends Component {
 							`
 								}
 							</script>
-								<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>
+							{
+								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>
 					),
 				}
@@ -275,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,
 							})
 						}