From 34df3fd1c06e8a1302df83715ed08ce1071f06fb 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 11:21:29 +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

---
 .../modules/courses/signin/css/signincdi.css  |  1 +
 .../videostatistics/Videostatistics.js        | 13 +----------
 .../component/Videostatisticscom.js           |  4 ++++
 .../component/Videostatisticscomtwo.js        | 22 +++++++++++++++----
 .../component/Videostatisticslist.js          |  2 +-
 5 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 a7fbbb20a..9416de345 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -440,3 +440,4 @@
 .mr32{
     margin-right: 32px;
 }
+
diff --git a/public/react/src/modules/courses/videostatistics/Videostatistics.js b/public/react/src/modules/courses/videostatistics/Videostatistics.js
index f497b3ca6..ba4891b2c 100644
--- a/public/react/src/modules/courses/videostatistics/Videostatistics.js
+++ b/public/react/src/modules/courses/videostatistics/Videostatistics.js
@@ -64,19 +64,8 @@ class Videostatistics extends Component{
 							<div className="ws100s" style={{
 								position: "relative",
 							}}>
-								<div className="ws100s " style={{
-									position: "absolute",
-									top: "-29px",
-								}}>
 
-									<p className="sortinxdirection" >
-										<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou" onClick={()=>this.props.statisticsy(false)}></i>
-										<p className="fh mr20 colorbluesigin xiaoshou" onClick={()=>this.props.statisticsy(false)}>返回</p>
-									</p>
-
-
-								</div>
-								<Videostatisticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} ></Videostatisticscom>
+								<Videostatisticscom {...this.state} {...this.props} watch_staticsdata={watch_staticsdata} statisticsy={(b)=>this.props.statisticsy(b)}></Videostatisticscom>
 
 
 
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
index 1111b6509..3c12ff424 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscom.js
@@ -35,6 +35,10 @@ class Videostatisticscom extends Component {
 				}}>
 					<div className="ws100s teacherentrydivss ">
 						<div className="ws100s sortinxdirection">
+								<p className="sortinxdirection h40s" onClick={()=>this.props.statisticsy(false)} >
+									<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)}></i>
+									<p className="fh mr20 colorbluesigin xiaoshou h40s" onClick={()=>this.props.statisticsy(false)}>返回</p>
+								</p>
 							<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>
 						</div>
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
index b64cd06ac..8c4025143 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticscomtwo.js
@@ -203,7 +203,7 @@ class Videostatisticscomtwo extends Component {
 								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
 								user_name: response.data.data[i].user_name,
 								is_finished: response.data.data[i].is_finished,
-								total_duration: response.data.data[i].total_duration,
+								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,
@@ -291,10 +291,24 @@ class Videostatisticscomtwo extends Component {
 			}
 
 		} else {
-			data = {
-				id: CourseId,
-				page: this.state.page
+			try {
+				if(id!==null&&id===0){
+					data = {
+						id: CourseId,
+						page: this.state.page,
+						group_id: id
+					}
+				}else{
+					data = {
+						id: CourseId,
+						page: this.state.page
+					}
+				}
+
+			}catch (e) {
+
 			}
+
 		}
 		this.getdatas(data);
 	}
diff --git a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
index fa24c9c32..a30d872de 100644
--- a/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
+++ b/public/react/src/modules/courses/videostatistics/component/Videostatisticslist.js
@@ -152,7 +152,7 @@ class Videostatisticslist extends Component {
 								number: (parseInt(this.state.page) - 1) * parseInt(this.state.limit) + (i + 1),
 								title: response.data.videos[i].title,
 								people_num: response.data.videos[i].people_num,
-								total_time: response.data.videos[i].total_time,
+								total_time: response.data.videos[i].total_time?formatSeconds(response.data.videos[i].total_time):0,
 								user_name: response.data.videos[i].user_name,
 								id: response.data.videos[i].id,
 						})