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

public/react/src/modules/courses/signin/css/signincdi.css

@@ -188,6 +188,12 @@
     padding-top: 20px;
     padding-bottom: 20px;
 }
+.teacherentrydivss{
+    padding-left: 20px;
+    padding-right: 20px;
+    padding-top: 20px;
+    padding-bottom: 20px;
+}
 .teachedivp{
     font-size:16px;
     font-family:Microsoft YaHei;

public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js

@@ -33,7 +33,7 @@ class Videostatisticscom extends Component {
 				<div className="ws100s edu-back-white sortinxdirection" style={{
 					position: "relative"
 				}}>
-					<div className="ws100s teacherentrydivs ">
+					<div className="ws100s teacherentrydivss ">
 						<div className="ws100s sortinxdirection">
 							<div className="ws50s sptits">视频统计总览</div>
 							<div className="ws50s sptitss xaxisreverseorder">播放数据从{this.props.watch_staticsdata&&this.props.watch_staticsdata.begin_at?this.props.watch_staticsdata.begin_at:0}开始统计</div>

public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import '../../signin/css/signincdi.css';
-import {Pagination, Table, Menu, Dropdown} from 'antd';
+import {Pagination, Table, Menu, Dropdown,Spin} from 'antd';
 import {getImageUrl, sortDirections} from 'educoder';
 import axios from 'axios';
 import LoadingSpin from "../../../../common/LoadingSpin";
@@ -98,7 +98,7 @@ class Videostatisticscomtwo extends Component {
 					className: 'font-14 maxnamewidth100s',
 					width: '100px',
 					render: (text, record) => (
-						<span style={{width: '100px'}} className="xiaoshou">
+						<span style={{width: '100px'}} >
 							<a  className="maxnamewidth100s" style={{
 								color:"#333333"
 							}}  title=	{record.start_at}>	{record.start_at}</a>
@@ -113,7 +113,7 @@ class Videostatisticscomtwo extends Component {
 					className: 'font-14 maxnamewidth100s',
 					width: '100px',
 					render: (text, record) => (
-						<span style={{width: '100px'}} className="xiaoshou">
+						<span style={{width: '100px'}} >
 								<a  className="maxnamewidth100s" style={{
 									color:"#333333"
 								}}  title=	{record.end_at}>{record.end_at}</a>
@@ -428,7 +428,7 @@ class Videostatisticscomtwo extends Component {
 		return (
 			<React.Fragment>
 				<div className="ws100s">
-					<div className="ws100s teacherentrydivs edu-back-white ">
+					<div className="ws100s teacherentrydivss edu-back-white ">
 						<div className="ws100s sortinxdirection">
 							<div className="ws50s sptits">视频名称视频名称…</div>
 							<div className="ws50s sptitss xaxisreverseorder font-14" style={{
@@ -471,15 +471,8 @@ class Videostatisticscomtwo extends Component {
 								`
 							}
 						</style>
-						{
+
-							loading === true ?
+								<div className="ws100s ysltableo">
-								<div style={{
-									minHeight: "400px",
-								}} className="ws100s">
-									<LoadingSpin></LoadingSpin>
-								</div>
-								:
-								<div className="ws100s ysltableo teacherentrydivs">
 									{
 										data.length === 0 ?
 											<div style={{
@@ -488,17 +481,18 @@ class Videostatisticscomtwo extends Component {
 												<NoneDatas></NoneDatas>
 											</div>
 											:
+											<Spin spinning={loading}>
 											<Table
 												columns={columnsstu}
 												dataSource={data}
 												pagination={false}
 												onChange={this.table1handleChange}
 											/>
+											</Spin>
 									}
 
 
 								</div>
-						}
 
 
 					</div>

public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js

@@ -1,6 +1,6 @@
 import React, {Component} from "react";
 import '../../signin/css/signincdi.css';
-import {Pagination,Table} from 'antd';
+import {Pagination,Table,Spin} from 'antd';
 import {getImageUrl,sortDirections} from 'educoder';
 import axios from 'axios';
 import LoadingSpin from "../../../../common/LoadingSpin";
@@ -60,13 +60,13 @@ class Videostatisticslist extends Component {
 					dataIndex: 'total_time',
 					key: 'total_time',
 					align: "center",
-					className: 'font-14 maxnamewidth150s',
+					className: 'font-14 maxnamewidth100s',
-					width: '150px',
+					width: '100px',
 					sorter: true,
 					sortDirections: sortDirections,
 					render: (text, record) => (
-						<span style={{width: '150px'}} className="maxnamewidth150s">
+						<span style={{width: '100px'}} className="maxnamewidth100s">
-										<a className="maxnamewidth150s" style={{
+										<a className="maxnamewidth100s" style={{
 											color:"#333333"
 										}} title={record.total_time}>{record.total_time}</a>
 
@@ -95,9 +95,9 @@ class Videostatisticslist extends Component {
 					key: 'id',
 					align: "center",
 					className: 'font-14',
-					width: '90px',
+					width: '50px',
 					render: (text, record) => (
-						<span style={{width: '90px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
+						<span style={{width: '50px',color:'#5091FF'}} className="xiaoshou" onClick={()=>this.props.tisticsbools(true,record.id)}>详情</span>
 					),
 				}
 			],
@@ -250,7 +250,7 @@ class Videostatisticslist extends Component {
 			<React.Fragment>
 				<div className="ws100s  mt20">
 					<div className="ws100s edu-back-white">
-						<div className="ws100s teacherentrydivs ">
+						<div className="ws100s teacherentrydivss ">
 							<div className="ws100s sortinxdirection">
 								<div className="ws100s sptits">统计详情</div>
 							</div>
@@ -265,14 +265,7 @@ class Videostatisticslist extends Component {
 								`
 							}
 						</style>
-						{
+
-							loading===true?
-								<div style={{
-									minHeight: "400px",
-								}} className="ws100s">
-									<LoadingSpin></LoadingSpin>
-								</div>
-								:
 								<div className="ws100s ysltableo teacherentrydivs">
 									{
 										data.length===0?
@@ -282,6 +275,7 @@ class Videostatisticslist extends Component {
 												<NoneDatas></NoneDatas>
 											</div>
 											:
+											<Spin spinning={loading}>
 											<Table
 												columns={columnsstu}
 												dataSource={data}
@@ -289,11 +283,11 @@ class Videostatisticslist extends Component {
 												onChange={this.table1handleChange}
 
 											/>
+											</Spin>
 									}
 
 
 								</div>
-						}
 
 					</div>