From ec9ce0b2a189cd57853564de5e238311eda8db25 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Thu, 12 Mar 2020 18:11:43 +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  | 21 ++++++++++++++++++-
 .../courses/signin/mymain/Signinmain.js       | 19 ++++++++++++++++-
 .../courses/signin/student/Students_signin.js |  4 ++--
 .../courses/signin/teacher/Teachers_signin.js |  7 ++++---
 4 files changed, 44 insertions(+), 7 deletions(-)

diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index b60b8c6e1..004c56ef1 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -92,6 +92,25 @@
 .hs30s{
     height: 30%;
 }
-.yslmaxheigth80 .ant-tabs .ant-tabs-top{
+.yslmaxheigthk{
+}
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar {
     border-bottom: 1px solid #ffffff !important;
+    background: #ffffff !important;
+    background-color: #ffffff !important;
+    margin: 0 !important;
+}
+yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-nav-container {
+    padding-left: 25px;
+}
+
+
+.yslmaxheigthk .ws100s .ant-tabs .ant-tabs-bar .ant-tabs-tab{
+    padding: 25px 16px !important;
+    font-size: 16px;
+    font-family: Microsoft YaHei;
+    font-weight: bold;
+
 }
+
+
diff --git a/public/react/src/modules/courses/signin/mymain/Signinmain.js b/public/react/src/modules/courses/signin/mymain/Signinmain.js
index f1bafc0fe..60d14b0f8 100644
--- a/public/react/src/modules/courses/signin/mymain/Signinmain.js
+++ b/public/react/src/modules/courses/signin/mymain/Signinmain.js
@@ -1,6 +1,8 @@
 import React,{ Component } from "react";
 import '../css/signincdi.css';
 import { Tabs } from 'antd';
+import Teachers_signin from '../teacher/Teachers_signin';
+import Students_signin from '../student/Students_signin';
 const { TabPane } = Tabs;
 // 主签到目录 		主签到目录
 class Signinmain extends Component{
@@ -25,9 +27,24 @@ class Signinmain extends Component{
 
 	// 主签到目录
 	render(){
+		const isAdmin = this.props.isAdmin()
+
 		return(
 			<React.Fragment>
-					<div className="edu-back-white">
+					<div >
+						{
+							isAdmin===true?
+								<Teachers_signin  {...this.state} {...this.props}>
+
+								</Teachers_signin>
+								:
+								<Students_signin {...this.state} {...this.props}>
+
+
+								</Students_signin>
+
+
+						}
 
 					</div>
 			</React.Fragment>
diff --git a/public/react/src/modules/courses/signin/student/Students_signin.js b/public/react/src/modules/courses/signin/student/Students_signin.js
index 889f106f6..1a5c1082b 100644
--- a/public/react/src/modules/courses/signin/student/Students_signin.js
+++ b/public/react/src/modules/courses/signin/student/Students_signin.js
@@ -31,8 +31,8 @@ class Teachers_signin extends Component{
 	render(){
 		return(
 			<React.Fragment>
-				<div className="edu-back-white">
-					<div className="clearfix padding20 bor-bottom-greyE yslmaxheigth80" >
+				<div className="">
+					<div className="clearfix   yslmaxheigthk" >
 						<div className="ws100s">
 							<Tabs defaultActiveKey="1" onChange={this.callback}>
 								<TabPane tab="正在签到" key="1">
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 64c924d87..af180ebdb 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -31,12 +31,13 @@ class Students_signin extends Component{
 	render(){
 		return(
 			<React.Fragment>
-				<div className="edu-back-white">
-					<div className="clearfix padding20 bor-bottom-greyE yslmaxheigth80" >
+				<div className="">
+
+					<div className="clearfix   yslmaxheigthk" >
 						<div className="ws100s">
 							<Tabs defaultActiveKey="1" onChange={this.callback}>
 								<TabPane tab="正在签到" key="1">
-									Content of Tab Pane 1
+									<p className="mt30">共3个签到正在进行</p>
 								</TabPane>
 								<TabPane tab="历史签到" key="2">
 									Content of Tab Pane 2