From f06c19278c040fdfbe1a74a63ba32bfafd547e63 Mon Sep 17 00:00:00 2001
From: jingquan huang <huang.jingquan@163.com>
Date: Fri, 13 Mar 2020 21:05:36 +0800
Subject: [PATCH 1/9] =?UTF-8?q?=E5=B0=8F=E7=A8=8B=E5=BA=8F=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/queries/weapps/subject_query.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/queries/weapps/subject_query.rb b/app/queries/weapps/subject_query.rb
index 0a3c9beb2..f062e40ff 100644
--- a/app/queries/weapps/subject_query.rb
+++ b/app/queries/weapps/subject_query.rb
@@ -8,7 +8,7 @@ class Weapps::SubjectQuery < ApplicationQuery
   end
 
   def call
-    subjects = @current_laboratory.subjects.unhidden.publiced
+    subjects = @current_laboratory.subjects.unhidden.publiced.show_moblied
 
     # 课程体系的过滤
     if params[:sub_discipline_id].present?

From bac5cb92b6827d04e6249fb9698203ea1d0b5197 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 00:49:18 +0800
Subject: [PATCH 2/9] =?UTF-8?q?=E8=B0=83=E6=95=B4=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E5=8F=82=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/react/src/modules/paths/ShixunPathSearch.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/react/src/modules/paths/ShixunPathSearch.js b/public/react/src/modules/paths/ShixunPathSearch.js
index 844215974..d445a0c1d 100644
--- a/public/react/src/modules/paths/ShixunPathSearch.js
+++ b/public/react/src/modules/paths/ShixunPathSearch.js
@@ -30,7 +30,7 @@ class ShixunPathSearch extends Component {
 
   //适配器
   onChangeLabel(value) {
-    let rs = value === 'new' ? 'updated_at' : 'myshixuns_scount'
+    let rs = value === 'new' ? 'updated_at' : 'myshixuns_count'
     let { discipline_id, sub_discipline_id } = this.state;
     this.setState({
       order: rs,

From 8228762cd82bce147bf6ad613bc71c59fad640d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 01:08:16 +0800
Subject: [PATCH 3/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/modules/courses/signin/component/Teacherentry.js     | 2 +-
 .../react/src/modules/courses/signin/student/Signedinlist.js | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index 0f6c8e9ae..1fedde76f 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -36,7 +36,7 @@ class Teacherentry extends Component {
 			<React.Fragment>
 				<div className={index===0?"ws100s edu-back-white ": "ws100s edu-back-white mt20"}>
 					<div className="ws100s teacherentrydiv ">
-						<p className="ws100s teachedivp ymaxnamewidthdivp xiaoshou" onClick={()=>this.props.qiandaoxiangq(true,item.id)}>
+						<p className={isAdmin?"ws100s teachedivp ymaxnamewidthdivp xiaoshou":"ws100s teachedivp ymaxnamewidthdivp"} onClick={isAdmin?()=>this.props.qiandaoxiangq(true,item.id):""}>
 							{
 								item.name
 							}
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 46c6643c4..ae5410554 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -219,24 +219,29 @@ class Signedinlist extends Component {
         title: '序号',
         dataIndex: 'index',
         key: 'index',
+        width:300,
         className: "textcenter",
       },
       {
         title: '姓名',
         dataIndex: 'user_name',
         key: 'user_name',
+        width:300,
         className: "textcenter",
       },
       {
         title: '学号',
         dataIndex: 'student_id',
         key: 'student_id',
+        width:300,
         className: "textcenter",
       },
       {
         title: '状态',
         key: 'attendance_status',
+        width:300,
         dataIndex: 'attendance_status',
+        className: "textcenter",
         render: (text, record) => (
           <span>
             <Select key={record.index} defaultValue={record.attendance_status} className={"Signedinlistbox"} style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>

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

---
 public/react/src/AppConfig.js                 |  4 +-
 .../courses/signin/component/Teacherentry.js  | 20 +++-
 .../teachercomponent/Teaccomponent.js         | 98 ++++++++++++-------
 3 files changed, 79 insertions(+), 43 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index fee6eb724..332e8ea73 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -42,11 +42,11 @@ if (isDev) {
       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
-debugType="admin";
+// debugType="admin";
 // 老师
 // debugType="teacher";
 // 学生
-// debugType="student";
+debugType="student";
 
 
 
diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js
index 0f6c8e9ae..6cbb48858 100644
--- a/public/react/src/modules/courses/signin/component/Teacherentry.js
+++ b/public/react/src/modules/courses/signin/component/Teacherentry.js
@@ -112,10 +112,24 @@ class Teacherentry extends Component {
 										(
 											this.props.defaultActiveKey === "1" ?
 												<div className="ws100s xaxisreverseorder">
+													{
+														item.attendance_status?
+															(
+																item.attendance_status==="ABSENCE"?
+																	<div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}>
+																		签到
+																	</div>
+																	:
+																	item.attendance_status==="NORMAL"?
+																		<div className="qiandaobutton" >
+																			正常签到
+																		</div>
+																		:""
+															)
+												    :
+															""
+													}
 
-													<div className="qiandaobutton xiaoshou" onClick={()=>this.props.Signin(item.mode,item.id,item.attendance_code)}>
-														签到
-													</div>
 												</div>
 												:
 												<div className="ws100s xaxisreverseorder">
diff --git a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
index 5b8d21b1d..a03df188d 100644
--- a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
+++ b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
@@ -4,8 +4,9 @@ import axios from 'axios';
 import Teacherentry from "../Teacherentry";
 import NoneDatas from '../NoneDatas';
 import LoadingSpin from '../../../../../common/LoadingSpin';
+import { Modal, Button } from 'antd';
 
-import Listjihe from "../../../../question/component/Listjihe";
+const { confirm } = Modal;
 
 //在线学习
 class Teaccomponent extends Component{
@@ -34,55 +35,76 @@ class Teaccomponent extends Component{
 	}
    //截止
 	thisEnd=(attendance_id)=>{
-		const url = `/weapps/attendances/${attendance_id}/end.json`;
-		var data={
 
-		}
-		axios.post(url, data)
-			.then((result) => {
-				if (result.data.status === 0) {
-					// try {
-					// 	this.props.showNotification(`截止成功`);
-					// }catch (e) {
-					//
-					// }
-				  this.props.getsetdatas();
-				}else{
-					this.props.showNotification(result.data.message);
+		confirm({
+			title: '提示',
+			content: '确认截止此签到吗?',
+			onOk() {
+				const url = `/weapps/attendances/${attendance_id}/end.json`;
+				var data={
 
 				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+				axios.post(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							// try {
+							// 	this.props.showNotification(`截止成功`);
+							// }catch (e) {
+							//
+							// }
+							this.props.getsetdatas();
+						}else{
+							this.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
 	}
    //删除
 	thisdelete=(attendance_id)=>{
-		const url = `/weapps/attendances/${attendance_id}.json`;
-		var data={
-
-		}
-		axios.delete(url, data)
-			.then((result) => {
-				if (result.data.status === 0) {
-					// try {
-					// 	this.props.showNotification(`删除成功`);
-					// }catch (e) {
-					//
-					// }
-
-					this.props.getsetdatas();
-				}else{
-					this.props.showNotification(result.data.message);
+		confirm({
+			title: '提示',
+			content: '确认删除此签到吗?',
+			onOk () {
+				const url = `/weapps/attendances/${attendance_id}.json`;
+				var data={
 
 				}
-			}).catch((error) => {
-			//console.log(error);
-		})
+				axios.delete(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							try {
+								this.props.showNotification(`删除成功`);
+							}catch (e) {
+
+							}
+
+							this.props.getsetdatas();
+						}else{
+							this.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+					//console.log(error);
+				})
+			},
+			onCancel() {
+
+			},
+		});
+
 	}
 
   //学生签到
 	Signin=(attendance_mode,attendance_id,code)=>{
-		debugger
+
 		const url = `/weapps/course_member_attendances.json`;
 		var data={
 

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

---
 public/react/src/AppConfig.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/react/src/AppConfig.js b/public/react/src/AppConfig.js
index 332e8ea73..fee6eb724 100644
--- a/public/react/src/AppConfig.js
+++ b/public/react/src/AppConfig.js
@@ -42,11 +42,11 @@ if (isDev) {
       window.location.search.indexOf('debug=a') != -1 ? 'admin' : parsed.debug || 'admin'
 }
 // 超管
-// debugType="admin";
+debugType="admin";
 // 老师
 // debugType="teacher";
 // 学生
-debugType="student";
+// debugType="student";
 
 
 

From 4c2a8b37db01a57d1cc6d0776078845692b88991 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 02:11:54 +0800
Subject: [PATCH 6/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/signin/css/Signinstatistics.css   | 24 ++++++++
 .../courses/signin/student/Signedinlist.js    | 57 +++++++++++++------
 .../courses/signin/student/Signindetails.js   |  8 ---
 3 files changed, 65 insertions(+), 24 deletions(-)

diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
index 0cd32b0a4..627458052 100644
--- a/public/react/src/modules/courses/signin/css/Signinstatistics.css
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -161,4 +161,28 @@
 
 .textcenter{
     text-align: center !important;
+}
+
+.sginboxcolor26C7C9 .ant-select-selection--single{
+     border:1px solid #26C7C9 !important;
+ }
+
+.sginboxcolor26C7C9 .ant-select-arrow{
+    color: #26C7C9 !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-selection--single{
+    border:1px solid #EAAE4E !important;
+}
+
+.sginboxcolorEAAE4E .ant-select-arrow{
+    color: #EAAE4E !important;
+}
+
+.sginboxcolorFF835C .ant-select-selection--single{
+    border:1px solid #FF835C !important;
+}
+
+.sginboxcolorFF835C .ant-select-arrow{
+    color: #FF835C !important;
 }
\ 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 ae5410554..0606b9c38 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -21,14 +21,14 @@ class Signedinlist extends Component {
       attendance_status:undefined,
       state:[
         {id:undefined,name:"全部状态"},
-        {id:"NORMAL",name:"正常出勤"},
-        {id:"LEAVE",name:"请假"},
-        {id:"ABSENCE",name:"旷课"},
+        {id:"NORMAL",name:"正常签到"},
+        {id:"LEAVE",name:"请 假"},
+        {id:"ABSENCE",name:"旷 课"},
       ],
       newstate:[
-        {id:"NORMAL",name:"正常出勤"},
-        {id:"LEAVE",name:"请假"},
-        {id:"ABSENCE",name:"旷课"},
+        {id:"NORMAL",name:"正常签到"},
+        {id:"LEAVE",name:"请 假"},
+        {id:"ABSENCE",name:"旷 课"},
       ],
       course_members_count:'--',
       attendance_count:'--',
@@ -58,8 +58,8 @@ class Signedinlist extends Component {
         this.setState({
           listattendanceslist:listattendanceslist,
           data:this.props.headdata,
-          course_members_count:this.props.headdata.all_count,
-          attendance_count:this.props.headdata.normal_count
+          course_members_count:this.props.headdata.normal_count,
+          attendance_count:this.props.headdata.all_count
         })
       }
 
@@ -147,8 +147,8 @@ class Signedinlist extends Component {
           })
         }else{
           this.setState({
-            course_members_count:response.data.all_count,
-            attendance_count: response.data.normal_count
+            course_members_count:response.data.normal_count,
+            attendance_count: response.data.all_count
           })
         }
         this.setState({
@@ -190,6 +190,17 @@ class Signedinlist extends Component {
   }
 
   handleChange=(attendance_status,value)=>{
+
+    let {member_attendances}=this.state;
+    let newmember_attendances=member_attendances;
+
+    newmember_attendances.map((item,key)=>{
+      if(item.user_id===value){
+        item.attendance_status=attendance_status
+      }
+    })
+    console.log(newmember_attendances)
+
     let url=`/weapps/course_member_attendances/update_status.json`;
 
     axios.post(url, {
@@ -201,7 +212,9 @@ class Signedinlist extends Component {
       .then((response) => {
         if (response.data.status == 0) {
           this.props.showNotification(`修改状态成功`);
-
+          this.setState({
+            member_attendances:newmember_attendances
+          })
         }
       })
       .catch(function (error) {
@@ -212,7 +225,7 @@ class Signedinlist extends Component {
 
   }
   render() {
-   let {attendanceslist,state,data,member_attendances,newstate}=this.state;
+   let {attendanceslist,state,data,member_attendances,newstate,attendance_status}=this.state;
 
     const columns = [
       {
@@ -244,11 +257,16 @@ class Signedinlist extends Component {
         className: "textcenter",
         render: (text, record) => (
           <span>
-            <Select key={record.index} defaultValue={record.attendance_status} className={"Signedinlistbox"} style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>
+            <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"?"colorFF835C Signedinlistbox sginboxcolorFF835C":"Signedinlistbox"}
+
+                    style={{ width: 167 }} onChange={(e)=>this.handleChange(e,record.user_id)}>
                   {
                     newstate&&newstate.map((item,key)=>{
                       return(
-                        <Option value={item.id} key={key}>{item.name}</Option>
+                        <Option value={item.id} key={key}
+                                className={item.name==="正常签到"?"color26C7C9 sginbox":item.name==="请 假"?"colorEAAE4E sginbox":item.name==="旷 课"?"colorFF835C sginbox":""}>{item.name}</Option>
                       )
                     })
                   }
@@ -279,11 +297,18 @@ class Signedinlist extends Component {
 
               <Col className="gutter-row ml20" span={6}>
 
-                <Select defaultValue="全部状态" className={"Signedinlistbox"} style={{ width: 167 }} onChange={this.handleChangestate}>
+                <Select defaultValue="全部状态"
+                         className={"Signedinlistbox"}
+                        //className={attendance_status&&attendance_status==="NORMAL"?"color26C7C9 Signedinlistbox sginboxcolor26C7C9":attendance_status&&attendance_status==="LEAVE"?"colorEAAE4E Signedinlistbox sginboxcolorEAAE4E":attendance_status&&attendance_status==="ABSENCE"?"colorFF835C Signedinlistbox sginboxcolorFF835C":"Signedinlistbox"}
+                        style={{ width: 167 }} onChange={this.handleChangestate}>
                   {
                     state&&state.map((item,key)=>{
                       return(
-                        <Option value={item.id} key={key}>{item.name}</Option>
+                        <Option value={item.id} key={key}
+                                //className={item.name==="正常签到"?"color26C7C9":item.name==="请假"?"colorEAAE4E":item.name==="旷课"?"colorFF835C":""}
+                        >
+                          {item.name}
+                        </Option>
                       )
                     })
                   }
diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js
index b1d497b65..b9a7c7446 100644
--- a/public/react/src/modules/courses/signin/student/Signindetails.js
+++ b/public/react/src/modules/courses/signin/student/Signindetails.js
@@ -25,8 +25,6 @@ class Signindetails extends Component{
 			//.log(response);
 			if(response){
 				if(response.data){
-					console.log("头部数据")
-					console.log(response.data)
 					this.setState({
 						headdata:response.data
 					})
@@ -37,12 +35,6 @@ class Signindetails extends Component{
 	}
 
 
-	componentDidUpdate = (prevProps) => {
-		console.log("componentDidUpdate");
-
-
-	}
-
 
 	render(){
 		let {headdata}= this.state;

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

---
 .../teachercomponent/Teaccomponent.js         | 20 ++++++++++---------
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
index a03df188d..099625aaf 100644
--- a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
+++ b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
@@ -35,6 +35,7 @@ class Teaccomponent extends Component{
 	}
    //截止
 	thisEnd=(attendance_id)=>{
+		let thiss=this
 
 		confirm({
 			title: '提示',
@@ -52,9 +53,9 @@ class Teaccomponent extends Component{
 							// }catch (e) {
 							//
 							// }
-							this.props.getsetdatas();
+							thiss.props.getsetdatas();
 						}else{
-							this.props.showNotification(result.data.message);
+							thiss.props.showNotification(result.data.message);
 
 						}
 					}).catch((error) => {
@@ -69,6 +70,7 @@ class Teaccomponent extends Component{
 	}
    //删除
 	thisdelete=(attendance_id)=>{
+		let thiss=this
 		confirm({
 			title: '提示',
 			content: '确认删除此签到吗?',
@@ -80,15 +82,15 @@ class Teaccomponent extends Component{
 				axios.delete(url, data)
 					.then((result) => {
 						if (result.data.status === 0) {
-							try {
-								this.props.showNotification(`删除成功`);
-							}catch (e) {
-
-							}
+							// try {
+							// 	thiss.props.showNotification(`删除成功`);
+							// }catch (e) {
+							//
+							// }
 
-							this.props.getsetdatas();
+							thiss.props.getsetdatas();
 						}else{
-							this.props.showNotification(result.data.message);
+							thiss.props.showNotification(result.data.message);
 
 						}
 					}).catch((error) => {

From 5c450a59184b4c949531798a36a1c4bf6158bcb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 14 Mar 2020 02:21:03 +0800
Subject: [PATCH 8/9] =?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/teacher/Teachers_signin.js        | 12 ++++++++++++
 1 file changed, 12 insertions(+)

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 1a8326885..10a1a1a43 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -111,6 +111,18 @@ class Students_signin extends Component{
 								leave_count:response.data.leave_count,
 								absence_count:response.data.absence_count,
 							})
+							if(response.data.attendances.length===0&&mydata.page!==1){
+								this.setState({
+									page:mydata.page-1,
+									limit:5
+								})
+								let data={
+									key: mydata.key,
+									page:mydata.page-1,
+									limit:5
+								}
+								this.gogetdatas(data);
+							}
 						}
 					 }
 			this.setState({

From c406514fc36a4e2155074e84deb57d2be9fb9cab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 02:30:18 +0800
Subject: [PATCH 9/9] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../courses/signin/student/Signedinlist.js        | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 0606b9c38..f9c3459a6 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -43,7 +43,7 @@ class Signedinlist extends Component {
   }
   componentDidUpdate(prevProps, prevState) {
     if(prevProps.headdata!=this.props.headdata){
-      console.log(this.props.headdata)
+
       let {attendanceslist}=this.state;
       if(this.props.headdata){
         let listattendanceslist=attendanceslist;
@@ -124,8 +124,7 @@ class Signedinlist extends Component {
 
   }
   getpath=(id)=>{
-    let {attendanceslist}=this.state;
-    let listattendanceslist=attendanceslist
+    let listattendanceslist=[]
     let url=`/weapps/attendances/${this.props&&this.props.switattendance_id}.json`;
     axios.get(url).then((response) => {
       if(response.data){
@@ -152,7 +151,7 @@ class Signedinlist extends Component {
           })
         }
         this.setState({
-          listattendanceslist:attendanceslist,
+          listattendanceslist:listattendanceslist,
           data:response.data
         })
 
@@ -199,7 +198,7 @@ class Signedinlist extends Component {
         item.attendance_status=attendance_status
       }
     })
-    console.log(newmember_attendances)
+
 
     let url=`/weapps/course_member_attendances/update_status.json`;
 
@@ -241,6 +240,9 @@ class Signedinlist extends Component {
         key: 'user_name',
         width:300,
         className: "textcenter",
+        render: (text, record) => (
+          <span>{record.user_name===null?"--":record.user_name}</span>
+        )
       },
       {
         title: '学号',
@@ -248,6 +250,9 @@ class Signedinlist extends Component {
         key: 'student_id',
         width:300,
         className: "textcenter",
+        render: (text, record) => (
+          <span>{record.student_id===null?"--":record.student_id}</span>
+        )
       },
       {
         title: '状态',