From 1be3767471e635b090f0513e35c1bed095a1d4aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Mon, 16 Mar 2020 19:40:47 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E7=AD=BE=E5=88=B0=E7=9B=B8?=
 =?UTF-8?q?=E5=85=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/signin/component/Detailss.js      |  2 +-
 .../courses/signin/component/Teacherentry.js  |  2 +-
 .../courses/signin/css/Signinstatistics.css   | 22 ++++++++++++++++++-
 .../modules/courses/signin/css/signincdi.css  |  6 +++++
 .../courses/signin/student/Signedinlist.js    | 12 +++++++++-
 .../courses/signin/student/Signindetails.js   |  9 +++-----
 6 files changed, 43 insertions(+), 10 deletions(-)

diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index d205ffdcb..c1f43e0cf 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -77,7 +77,7 @@ class Detailss extends Component {
 								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
 							</div>
 							<div className="progressivpss h28s">
-								已签到{item && item.normal_count ? item.normal_count : 0} /
+								已签到 {item && item.normal_count ? item.normal_count : 0} /
 								应签到 {item && item.all_count ? item.all_count : 0}
 							</div>
 						</div>
diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index 593bd4a50..ff08fe126 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -51,7 +51,7 @@ class Teacherentry extends Component {
 								<Progress percent={jdt} showInfo={false} strokeColor="#1890ff"/>
 							</div>
 							<div className="progressivpss">
-								已签到{item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
+								已签到 {item.normal_count ? item.normal_count : 0} / 应签到 {item.all_count ? item.all_count : 0}
 							</div>
 						</div>
 
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
index ddcda4cd1..c7ff88c9f 100644
--- a/public/react/src/modules/courses/signin/css/Signinstatistics.css
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -210,4 +210,24 @@
     height: auto  !important;
     padding: 0px  !important;
     white-space: nowrap  !important;
-}
\ No newline at end of file
+}
+
+.color26C7C9 .ant-select-selection-selected-value{
+    margin: 0 30% !important;
+}
+
+.colorEAAE4E .ant-select-selection-selected-value{
+    margin: 0 40% !important;
+}
+
+.color909399 .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+.colorFF835C .ant-select-selection-selected-value{
+    margin: 0 37% !important;
+}
+
+/*.allSignedinlistbox .ant-select-selection-selected-value{*/
+/*    margin: 0 30% !important;*/
+/*}*/
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index 09379ff4c..f6f1db061 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -352,3 +352,9 @@
     color:rgba(153,153,153,1);
 
 }
+
+.colorbluesigin{
+    font-size:16px;
+    font-weight:bold;
+    color:rgba(51,51,51,1);
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 5885e8a67..ea5ffb998 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -260,9 +260,10 @@ class Signedinlist extends Component {
         className: "textcenter",
         render: (text, record) => (
           <span>
+
             <Select key={record.index} defaultValue={record.attendance_status}
                     // className={"Signedinlistbox"}
-                    className={record.attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9":record.attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E":record.attendance_status==="ABSENCE"?this.props.defaultActiveKey==="2"?"colorFF835C Signedinlistbox sginboxcolorFF835C":"color909399 Signedinlistbox sginboxcolor909399":"Signedinlistbox"}
+                    className={record.attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9 marginleft10":record.attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E marginleft10":record.attendance_status==="ABSENCE"?this.props.defaultActiveKey==="2"?"colorFF835C Signedinlistbox sginboxcolorFF835C marginleft10":"color909399 Signedinlistbox sginboxcolor909399 marginleft10":"Signedinlistbox"}
 
                     style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>
                   {
@@ -339,6 +340,15 @@ class Signedinlist extends Component {
 
           </Col>
         </Row>
+        <style>
+          {
+            `
+                .marginleft10{
+                    margin-left: 10px !important;
+                }
+             `
+          }
+        </style>
         <div className={"backfff mt10"}>
 					{
 						this.state.loading===true?
diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js
index d23ca76b2..d1f794a61 100644
--- a/public/react/src/modules/courses/signin/student/Signindetails.js
+++ b/public/react/src/modules/courses/signin/student/Signindetails.js
@@ -43,13 +43,10 @@ class Signindetails extends Component{
 				<div className="ws100s" style={{
 					position: "relative",
 				}}>
-					<div className="ws100s xaxisreverseorder" style={{
-						position: "absolute",
-						top: "-29px",
-					}}>
+					<div className="ws100s mb20">
 						<p className="sortinxdirection xiaoshou" onClick={()=>this.props.qiandaoxiangq(false)}>
-							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5"></i>
-						  <p className="fh mr20">	返回</p>
+							<i className="iconfont icon-zuojiantou  posiivsiconmyss mr5 colorbluesigin"></i>
+						  <p className="fh mr20 colorbluesigin">正在签到</p>
 						</p>
 
 					</div>