From 1c7d2fddb00f924e6b545e422c5af67a7f01ede8 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:30:25 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../user/usersInfo/video/VideoInReviewItem.js | 35 ++++++++++---------
1 file changed, 19 insertions(+), 16 deletions(-)
diff --git a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
index 5003bec77..ce65e98a1 100644
--- a/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
+++ b/public/react/src/modules/user/usersInfo/video/VideoInReviewItem.js
@@ -91,32 +91,26 @@ function VideoInReviewItem (props) {
- {
- props&&props.mykt!=undefined?
-
- Setmyktid(props.newcourse_video_id,props.newtitle)}
- style={{ marginTop: '1px', display: 'inline-block'}}
- >
- :""
- }
-
{
isReview !== true && moveVideo &&
moveVideo(props)}
- style={{ marginTop: '1px', display: 'inline-block'}}
+ style={{ marginTop: '1px', display: 'inline-block'}}
>
}
+
+
{
- deleteVideo &&
-
- deleteVideo(props)}
- style={{ marginTop: '1px', display: 'inline-block'}}
+ props&&props.mykt!=undefined?
+
+ Setmyktid(props.newcourse_video_id,props.newtitle)}
+ style={{ marginTop: '1px', display: 'inline-block'}}
>
-
+ :""
}
+
{
isReview !== true && operation &&
@@ -125,13 +119,22 @@ function VideoInReviewItem (props) {
>
}
+
{
isReview !== true && !link ?
:""
}
-
+
+ {
+ deleteVideo &&
+
+ deleteVideo(props)}
+ style={{ marginTop: '1px', display: 'inline-block'}}
+ >
+
+ }
From 31ab41198f3c7853fc9db08bcc6acfb14b9fb823 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 00:36:56 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/signin/css/signincdi.css | 8 ++++++++
.../component/Studentstatistics.js | 14 +++++++-------
.../component/Videostatisticscomtwo.js | 2 +-
.../component/Videostatisticslist.js | 18 +++++++++---------
4 files changed, 25 insertions(+), 17 deletions(-)
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index a5e067ca6..3bb714831 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -494,4 +494,12 @@
}
.ml32{
margin-left: 32px;
+
+}
+
+.textalignlefts{
+ text-align: left;
+}
+.textalignrights{
+ text-align: right;
}
diff --git a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
index ad07fc10d..65fdf6db8 100644
--- a/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
+++ b/public/react/src/modules/courses/videostatistics/component/Studentstatistics.js
@@ -34,12 +34,12 @@ class Studentstatistics extends Component {
className: 'font-14 maxnamewidth150s',
width: '150px',
render: (text, record) => (
-
-
+ {record.title}
-
+
),
},
{
@@ -65,12 +65,12 @@ class Studentstatistics extends Component {
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
-
-
+ {record.total_duration}
-
+
),
},
{
@@ -98,7 +98,7 @@ class Studentstatistics extends Component {
width: '90px',
render: (text, record) => (
{record.is_finished === true ?
- 是 : 否}
+ 是 : 否}
),
},
],
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index b7bdea200..9889d97b8 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -56,7 +56,7 @@ class Videostatisticscomtwo extends Component {
width: '90px',
render: (text, record) => (
{record.is_finished === true ?
- 是 : 否}
+ 是 : 否}
),
},
{
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
index de1cef0b0..cf36eda6b 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
@@ -31,15 +31,15 @@ class Videostatisticslist extends Component {
dataIndex: 'title',
key: 'title',
align: "center",
- className: 'font-14 maxnamewidth150s',
+ className: 'font-14 maxnamewidth150s ',
width: '150px',
render: (text, record) => (
-
-
+ {record.title}
-
+
),
},
{
@@ -56,21 +56,21 @@ class Videostatisticslist extends Component {
),
},
{
- title: '累计观看时长',
+ title: '观看时长',
dataIndex: 'total_time',
key: 'total_time',
align: "center",
- className: 'font-14 maxnamewidth100s',
+ className: 'font-14 maxnamewidth100s ',
width: '100px',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
-
-
+ {record.total_time}
-
+
),
},
{