From 93e72ca6dab245dd6322f095273aa18b60d7bcf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com> Date: Tue, 17 Mar 2020 12:30:25 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../courses/signin/component/Detailss.js | 13 +++++++--- .../modules/courses/signin/css/signincdi.css | 20 ++++++++++++++- .../courses/signin/student/Signindetails.js | 8 +----- .../component/Videostatisticscom.js | 6 ++--- .../component/Videostatisticscomtwo.js | 25 ++++++++++--------- 5 files changed, 46 insertions(+), 26 deletions(-) diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js index c1f43e0cf..0ee8b5871 100644 --- a/public/react/src/modules/courses/signin/component/Detailss.js +++ b/public/react/src/modules/courses/signin/component/Detailss.js @@ -65,9 +65,16 @@ class Detailss extends Component { position: "relative" }}>
-

- {item && item.name} -

+
+

this.props.qiandaoxiangq(false)}> + this.props.qiandaoxiangq(false)}> +

this.props.qiandaoxiangq(false)}>返回

+

+

+ {item && item.name} +

+
+
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index cdd41eede..53f621471 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/public/react/src/modules/courses/signin/css/signincdi.css @@ -214,6 +214,14 @@ white-space:nowrap; cursor: default; } +.ymaxnamewidthdivp86{ + max-width:86%; + width: 86%; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + cursor: default; +} .teachedivps{ font-size:14px; font-family:Microsoft YaHei; @@ -411,6 +419,14 @@ white-space:nowrap; cursor: default; } +.maxnamewidth140s{ + width: 140px; + max-width: 140px; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap; + cursor: default; +} .maxnamewidth200s{ text-align: center; width: 200px; @@ -451,4 +467,6 @@ .mr32{ margin-right: 32px; } - +.mr27{ + margin-right: 27px; +} diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js index a5df6c2b2..ef0f5e525 100644 --- a/public/react/src/modules/courses/signin/student/Signindetails.js +++ b/public/react/src/modules/courses/signin/student/Signindetails.js @@ -43,14 +43,8 @@ class Signindetails extends Component{
-
-

- this.props.qiandaoxiangq(false)}> -

this.props.qiandaoxiangq(false)}>正在签到

-

- -
this.props.qiandaoxiangq(b)} defaultActiveKey={this.props.defaultActiveKey} headdata={headdata} switattendance_id={this.props.switattendance_id} diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js index dff57d642..220a59b46 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js @@ -35,9 +35,9 @@ class Videostatisticscom extends Component { }}>
-

this.props.statisticsy(false)} > - this.props.statisticsy(false)}> -

this.props.statisticsy(false)}>返回

+

this.props.statisticsy(false)} style={{color:'#5091FF'}}> + this.props.statisticsy(false)} style={{color:'#5091FF'}}> +

this.props.statisticsy(false)}>返回

视频统计总览
播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js index 2dee66620..8893eb07e 100644 --- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js +++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js @@ -5,6 +5,7 @@ import {getImageUrl, sortDirections,formatSeconds} from 'educoder'; import axios from 'axios'; import LoadingSpin from "../../../../common/LoadingSpin"; import NoneDatas from "../../signin/component/NoneDatas"; +import moment from 'moment'; //条目 @@ -52,9 +53,9 @@ class Videostatisticscomtwo extends Component { key: 'is_finished', align: "center", className: 'font-14', - width: '98px', + width: '90px', render: (text, record) => ( - {record.is_finished === true ? + {record.is_finished === true ? 是 : 否} ), }, @@ -63,12 +64,12 @@ class Videostatisticscomtwo extends Component { dataIndex: 'total_duration', key: 'total_duration', align: "center", - className: 'font-14 maxnamewidth150s', - width: '150px', + className: 'font-14 maxnamewidth140s', + width: '140px', sorter: true, sortDirections: sortDirections, render: (text, record) => ( - {record.total_duration} ), @@ -78,13 +79,13 @@ class Videostatisticscomtwo extends Component { dataIndex: 'feq', key: 'feq', align: "center", - className: 'font-14 maxnamewidth100s', - width: '100px', + className: 'font-14 maxnamewidth140s', + width: '140px', sorter: true, sortDirections: sortDirections, render: (text, record) => ( - - + {record.feq} @@ -101,7 +102,7 @@ class Videostatisticscomtwo extends Component { {record.start_at} + }} title= {moment(record.start_at).format('YYYY-MM-DD HH:mm:ss')}> {record.start_at} ), }, @@ -116,7 +117,7 @@ class Videostatisticscomtwo extends Component { {record.end_at} + }} title={moment(record.end_at).format('YYYY-MM-DD HH:mm:ss')}>{record.end_at} ), } @@ -506,7 +507,7 @@ class Videostatisticscomtwo extends Component { { ` .ysltableo .ant-table-thead > tr > th, .ant-table-tbody > tr > td { - padding: 10px 10px; + padding: 10px 5px; } ` }