From c6b6843cf6a9be84de4798888f76d0cd0166603a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 13 Mar 2020 20:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/signin/component/Detailss.js      | 27 ++++++++++++++-----
 .../courses/signin/student/Signindetails.js   | 15 ++++++++---
 .../courses/signin/teacher/Teachers_signin.js |  1 +
 3 files changed, 34 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index 6b82ca3db..665685dd8 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -50,6 +50,13 @@ class Detailss extends Component{
 
 	render(){
 		const  isAdmin =this.props.isAdmin();
+		let item=this.props.headdata;
+		let jdt;
+		try {
+			jdt = item.normal_count / item.all_count * 100;
+		} catch (e) {
+			jdt = 100;
+		}
 		return(
 			<React.Fragment>
 				<div className="ws100s edu-back-white sortinxdirection"  style={{
@@ -57,7 +64,7 @@ class Detailss extends Component{
 				}}>
 					<div className="ws100s teacherentrydiv ">
 						<p className="ws100s teachedivp ymaxnamewidthdivp">
-							2020-03-10第五次签到
+							{item&&item.name}
 						</p>
 
 						<div  className="ws100s sortinxdirection mt17">
@@ -65,10 +72,10 @@ class Detailss extends Component{
 								签到人数：
 							</div>
 							<div className="progressivps">
-								<Progress percent={30} />
+								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
 							</div>
 							<div className="progressivpss">
-								已签到22 / 应签到55
+								已签到{item&&item.normal_count ? item.normal_count : 0} / 应签到 {item&&item.all_count ? item.all_count : 0}
 							</div>
 						</div>
 
@@ -81,21 +88,29 @@ class Detailss extends Component{
 									签到发起人：
 								</div>
 								<div className="teachedivpsy ymaxnamewidth60 h40s">
-									胡一菲
+									{item&&item.author.user_name}
 								</div>
 
 								<div className="teachedivps ml20 h40s">
 									签到方式：
 								</div>
 								<div className="teachedivpsy ymaxnamewidth80 h40s">
-									二维码签到
+									{item&&item.mode ?
+										item.mode === "QRCODE" ?
+											"二维码签到"
+											: item.mode === "NUMBER" ?
+											"数字签到"
+											: item.mode === "QUICK" ?
+												"快捷签到"
+												: ""
+										: ""}
 								</div>
 
 								<div className="teachedivps ml20 h40s">
 									开始结束时间：
 								</div>
 								<div className="teachedivpsy h40s">
-									2010-03-10 10:00-11:00
+									{item&&item.attendance_date} {item&&item.start_time}-{item&&item.end_time}
 								</div>
 							</div>
 							<div className="ws25s xaxisreverseorder" style={{
diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js
index 8555f6965..052a435a5 100644
--- a/public/react/src/modules/courses/signin/student/Signindetails.js
+++ b/public/react/src/modules/courses/signin/student/Signindetails.js
@@ -10,8 +10,9 @@ class Signindetails extends Component{
 		super(props);
 
 		this.state={
-
+			headdata:null
 		}
+
 	}
 
 	componentDidMount() {
@@ -21,8 +22,11 @@ class Signindetails extends Component{
 			//.log(response);
 			if(response){
 				if(response.data){
-					console.log("历史数据")
+					console.log("头部数据")
 					console.log(response.data)
+					this.setState({
+						headdata:response.data
+					})
 
 				}
 			}
@@ -42,6 +46,7 @@ class Signindetails extends Component{
 
 
 	render(){
+		let {headdata}= this.state;
 		return(
 			<React.Fragment>
 				<div className="ws100s" style={{
@@ -57,7 +62,11 @@ class Signindetails extends Component{
 						</p>
 
 					</div>
-          <Detailss switattendance_id={this.props.switattendance_id} {...this.props} {...this.state}></Detailss>
+          <Detailss
+						headdata={headdata}
+						switattendance_id={this.props.switattendance_id}
+						{...this.props}
+						{...this.state}></Detailss>
 
 
 				{/*	列表+筛选 */}
diff --git a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
index 5d73a81a3..2bdcd7ef1 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -331,6 +331,7 @@ class Students_signin extends Component{
 							:
 							// 签到详情
 							<Signindetails
+								defaultActiveKey={defaultActiveKey}
 								switattendance_id={switattendance_id}
 								{...this.props}
 								{...this.state}