Merge remote-tracking branch 'origin/PCqiandao' into PCqiandao

public/react/src/modules/courses/signin/component/Teacherentry.js

@@ -24,11 +24,12 @@ class Teacherentry extends Component{
 
 
 	render(){
+		const  isAdmin =this.props.isAdmin();
 		return(
 			<React.Fragment>
 				<div className="ws100s edu-back-white " >
 					<div className="ws100s teacherentrydiv ">
-          <p className="ws100s teachedivp">
+          <p className="ws100s teachedivp ymaxnamewidthdivp">
 						2020-03-10第五次签到
 					</p>
 
@@ -45,8 +46,55 @@ class Teacherentry extends Component{
 						</div>
 
 
-						<div  className="ws100s">
+						<div  className="ws100s sortinxdirection mt17">
+							<div className="ws80s sortinxdirection">
+
+
+							<div className="teachedivps ">
+								签到发起人：
+							</div>
+							<div className="teachedivpsy ymaxnamewidth60">
+								胡一菲
+							</div>
 
+							<div className="teachedivps ml20">
+								签到方式：
+							</div>
+							<div className="teachedivpsy ymaxnamewidth80">
+								二维码签到
+							</div>
+
+							<div className="teachedivps ml20">
+								开始结束时间：
+							</div>
+							<div className="teachedivpsy">
+								2010-03-10 10:00-11:00
+							</div>
+							</div>
+
+							<div className="ws20s sortinxdirection">
+								{
+									isAdmin===true?
+										(
+											this.props.defaultActiveKey==="0"?
+												<div className="ws100s xaxisreverseorder">
+													<div className="jiezhis">截止</div>
+													<div className="shanchu">删除</div>
+												</div>
+												:
+												<div className="ws100s xaxisreverseorder">
+													<div className="jiezhis">截止</div>
+													<div className="shanchu">删除</div>
+												</div>
+										)
+										:
+										<div className="ws100s xaxisreverseorder">
+
+
+										</div>
+
+								}
+							</div>
 
 						</div>
 					</div>

public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js

@@ -27,7 +27,7 @@ class Teaccomponent extends Component{
 		return(
 			<React.Fragment>
 
-				<Teacherentry {...this.props} {...this.state}></Teacherentry>
+				<Teacherentry defaultActiveKey={this.props.defaultActiveKey}{...this.props} {...this.state}></Teacherentry>
 
 			</React.Fragment>
 		)

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

@@ -88,10 +88,15 @@
 .ws70s{
     width: 70%;
 }
-
+.ws80s{
+    width: 80%;
+}
 .hs30s{
     height: 30%;
 }
+.ws20s{
+    width: 20%;
+}
 .yslmaxheigthk{
 
 }
@@ -165,12 +170,26 @@
     font-weight:bold;
     color:rgba(51,51,51,1);
 }
+.ymaxnamewidthdivp{
+    max-width:100%;
+    width: 100%;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .teachedivps{
     font-size:14px;
     font-family:Microsoft YaHei;
     font-weight:400;
     color:rgba(144,147,153,1);
 }
+.teachedivpsy{
+    font-size:14px;
+    font-family:Microsoft YaHei;
+    font-weight:400;
+    color:#333333;
+}
 .progressivps{
     width:200px;
     margin-left: 10px;
@@ -183,3 +202,40 @@
     color:rgba(64,158,255,1);
     margin-left: 15px;
 }
+.w60ys{
+     width: 60px;
+ }
+
+.ymaxnamewidth60{
+    max-width: 60px;
+    width: 60px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.ymaxnamewidth80{
+    max-width: 80px;
+    width: 80px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
+.w80ys{
+    width: 80px;
+}
+
+.jiezhis{
+    font-size:14px;
+    font-family:Microsoft YaHei;
+    font-weight:400;
+    color:rgba(64,158,255,1);
+}
+.shanchu{
+    font-size:14px;
+    font-family:Microsoft YaHei;
+    font-weight:400;
+    color:rgba(245,108,108,1);
+    margin-right: 30px;
+}

public/react/src/modules/courses/signin/teacher/Teachers_signin.js

@@ -1,6 +1,6 @@
 import React,{ Component } from "react";
 import '../css/signincdi.css';
-import { Tabs } from 'antd';
+import { Tabs,Pagination} from 'antd';
 import  Teaccomponent from '../component/teachercomponent/Teaccomponent';
 import Histeacomponent from '../component/teachercomponent/Histeacomponent';
 import Createsignmodel from '../model/Createsignmodel';
@@ -11,7 +11,11 @@ class Students_signin extends Component{
 		super(props);
 
 		this.state={
-			visible:false
+			visible:false,
+			page:1,
+			per_page:20,
+			count:50,
+			defaultActiveKey:"1",
 		}
 	}
 
@@ -26,6 +30,9 @@ class Students_signin extends Component{
 
 	callback=(key)=> {
 		console.log(key);
+		this.setState({
+			defaultActiveKey: key,
+		})
 	}
 
 	Createsign=()=>{
@@ -33,9 +40,16 @@ class Students_signin extends Component{
 		 visible:true
 	 })
 	}
+	paginationonChange = (pageNumber) => {
+		this.setState({
+			page: pageNumber,
+		})
+	}
 
 
 	render(){
+
+		let {page,per_page,count,defaultActiveKey} =this.state
 		return(
 			<React.Fragment>
 				<Createsignmodel
@@ -51,11 +65,22 @@ class Students_signin extends Component{
 							<Tabs defaultActiveKey="1" onChange={this.callback}>
 								<TabPane tab="正在签到" key="1">
 									<p className="mt20 mysligtes">共3个签到正在进行</p>
-									<Teaccomponent  {...this.state} {...this.props}></Teaccomponent>
+									<Teaccomponent  defaultActiveKey={defaultActiveKey} {...this.state} {...this.props}></Teaccomponent>
+
+									<div className="mb30 clearfix educontent mt40 intermediatecenter">
+										<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+																pageSize={per_page}
+																total={count}></Pagination>
+									</div>
 								</TabPane>
 								<TabPane tab="历史签到" key="2">
 									<p className="mt20 mysligtes">共3个签到正在进行</p>
-									<Histeacomponent  {...this.state} {...this.props}></Histeacomponent>
+									<Teaccomponent defaultActiveKey={defaultActiveKey} {...this.state} {...this.props}></Teaccomponent>
+									<div className="mb30 clearfix educontent mt40 intermediatecenter">
+										<Pagination showQuickJumper current={page} onChange={this.paginationonChange}
+																pageSize={per_page}
+																total={count}></Pagination>
+									</div>
 								</TabPane>
 								<TabPane tab="签到统计" key="3">
 									Content of Tab Pane 3