diff --git a/public/react/package.json b/public/react/package.json
index d29adb905..e644e2166 100644
--- a/public/react/package.json
+++ b/public/react/package.json
@@ -61,6 +61,7 @@
     "postcss-loader": "2.0.8",
     "promise": "8.0.1",
     "prop-types": "^15.6.1",
+    "qrcode.react": "^1.0.0",
     "qs": "^6.6.0",
     "quill": "^1.3.7",
     "quill-delta-to-html": "^0.11.0",
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 26a871416..e2f51d4e1 100644
--- a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
+++ b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js
@@ -39,10 +39,15 @@ class Teaccomponent extends Component{
 		axios.post(url, data)
 			.then((result) => {
 				if (result.data.status === 0) {
-					// this.props.showNotification(`组卷成功`);
-					// console.log(result.data.exam_id);
-					//本来调试卷库首页的
+					// try {
+					// 	this.props.showNotification(`截止成功`);
+					// }catch (e) {
+					//
+					// }
 				  this.props.getsetdatas();
+				}else{
+					this.props.showNotification(result.data.message);
+
 				}
 			}).catch((error) => {
 			//console.log(error);
@@ -57,10 +62,16 @@ class Teaccomponent extends Component{
 		axios.delete(url, data)
 			.then((result) => {
 				if (result.data.status === 0) {
-					// this.props.showNotification(`组卷成功`);
-					// console.log(result.data.exam_id);
-					//本来调试卷库首页的
+					// try {
+					// 	this.props.showNotification(`删除成功`);
+					// }catch (e) {
+					//
+					// }
+
 					this.props.getsetdatas();
+				}else{
+					this.props.showNotification(result.data.message);
+
 				}
 			}).catch((error) => {
 			//console.log(error);
@@ -68,7 +79,51 @@ class Teaccomponent extends Component{
 	}
 
   //学生签到
-	Signin=(type,)=>{
+	Signin=(attendance_mode,attendance_id,code)=>{
+		const url = `/weapps/course_member_attendances.json`;
+		var data={
+
+		}
+		 if(attendance_mode==="QUICK"){
+		 	//快捷签到
+			 data={
+				 attendance_mode:"QUICK",
+				 attendance_id:attendance_id,
+			 }
+			 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) => {
+			 })
+		 }else if(attendance_mode==="QRCODE"){
+			 //二维码签到
+			 data={
+				 attendance_mode:"QRCODE",
+				 attendance_id:attendance_id,
+				 code:code,
+			 }
+       this.props.GotomQrcodesodesy(data,true)
+		 }else if(attendance_mode==="NUMBER"){
+		 	//数字签到
+			 data={
+				 attendance_mode:"NUMBER",
+				 attendance_id:attendance_id,
+				 code:code,
+			 }
+			 this.props.Gotomodes(data,true)
+
+		 }
 
 
 	}
diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css
index e6f4ccf21..08ebe7f0a 100644
--- a/public/react/src/modules/courses/signin/css/signincdi.css
+++ b/public/react/src/modules/courses/signin/css/signincdi.css
@@ -211,8 +211,8 @@
  }
 
 .ymaxnamewidth60{
-    max-width: 60px;
-    width: 60px;
+    max-width: 70px;
+    width: 70px;
     overflow:hidden;
     text-overflow:ellipsis;
     white-space:nowrap;
diff --git a/public/react/src/modules/courses/signin/model/Qrcodesignin.js b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
index aa028cb17..1979a6370 100644
--- a/public/react/src/modules/courses/signin/model/Qrcodesignin.js
+++ b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
@@ -1,12 +1,11 @@
 import React,{ Component } from "react";
-
 import { Modal , Button} from 'antd';
+import QRCode  from 'qrcode.react';
 
 class Qrcodesignin extends Component {
   constructor(props) {
     super(props)
   }
-
   render() {
 
     const leftbuton={
@@ -33,7 +32,11 @@ class Qrcodesignin extends Component {
 
           <div>
             <div className={" marginauto clearfix edu-txt-center"}>
-              <a><img alt="example" src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" style={{"width": "100%"}} /></a>
+							<QRCode
+								value={this.props.Qrcodesignintypedata.code}  //value参数为生成二维码的链接
+								size={200} //二维码的宽高尺寸
+								fgColor="#000000"  //二维码的颜色
+							/>
             </div>
 
 
@@ -43,13 +46,13 @@ class Qrcodesignin extends Component {
 
             <div className={"mt20 marginauto clearfix edu-txt-center"}>
               <a>
-                <Button type="primary" ghost style={leftbuton}>
+                <Button type="primary" ghost style={leftbuton} onClick={()=>this.props.GotomQrcodesodesy(null,false)}>
                   取消
                 </Button>
               </a>
 
               <a>
-                <Button type="primary" className={"ml20"} style={rightbuton}>
+                <Button type="primary" className={"ml20"} style={rightbuton} onClick={()=>this.props.GotomQrcodesodesy(null,false)}>
                   确定
                 </Button>
               </a>
@@ -71,4 +74,4 @@ class Qrcodesignin extends Component {
 
 
 
-export default Qrcodesignin
\ No newline at end of file
+export default Qrcodesignin
diff --git a/public/react/src/modules/courses/signin/model/Studentssignmodel.js b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
index b09f865f5..7650d103d 100644
--- a/public/react/src/modules/courses/signin/model/Studentssignmodel.js
+++ b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
@@ -1,12 +1,43 @@
 import React,{ Component } from "react";
 
 import { Modal , Form, Input,Button} from 'antd';
+import axios from 'axios';
 
 class Studentssignmodel extends Component {
   constructor(props) {
     super(props)
   }
-
+  setdatas=()=>{
+		this.props.form.validateFields((err, values) => {
+			if (!err) {
+				const url = `/weapps/course_member_attendances.json`;
+				let data={
+					code:values.name,
+					attendance_mode:"NUMBER",
+					attendance_id:this.props.Studentssigntypedata.attendance_id,
+				}
+				axios.post(url, data)
+					.then((result) => {
+						if (result.data.status === 0) {
+							try {
+								this.props.showNotification(`签到成功`);
+							}catch (e) {
+
+							}
+							this.props.getsetdatas();
+							this.props.Gotomodes(null,false)
+						}else{
+							this.props.showNotification(result.data.message);
+
+						}
+					}).catch((error) => {
+				})
+			}
+		});
+
+
+
+	}
   render() {
     const { getFieldDecorator } =  this.props.form;
     const formItemLayout = {
@@ -45,13 +76,13 @@ class Studentssignmodel extends Component {
 
             <div className={"mt20 marginauto clearfix edu-txt-center"}>
               <a>
-                <Button type="primary" ghost style={leftbuton}>
+                <Button type="primary" ghost style={leftbuton} onClick={()=>this.props.Gotomodes(null,false)}>
                   取消
                 </Button>
               </a>
 
               <a>
-                <Button type="primary" className={"ml20"} style={rightbuton}>
+                <Button type="primary" className={"ml20"} style={rightbuton} onClick={()=>this.setdatas()}>
                   确定
                 </Button>
               </a>
@@ -73,4 +104,4 @@ class Studentssignmodel extends Component {
 
 const Studentssignmodels = Form.create({ name: 'Studentssignmodel' })(Studentssignmodel);
 
-export default Studentssignmodels
\ No newline at end of file
+export default Studentssignmodels
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 18f327485..7f56dd2f1 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -25,6 +25,10 @@ class Students_signin extends Component{
 			normal_count:0,
 			leave_count:0,
 			absence_count:0,
+			Studentssigntype:false,
+			Studentssigntypedata:null,
+			Qrcodesignintype:false,
+			Qrcodesignintypedata:null,
 		}
 	}
 
@@ -136,10 +140,47 @@ class Students_signin extends Component{
 		this.gogetdatas(data);
 	}
 
+	Gotomodes(data,bool){
+		 if(bool===true){
+		 	this.setState({
+				Studentssigntypedata:data,
+				Studentssigntype:true
+			})
+		 }else{
+		 	this.setState({
+				Studentssigntype:false,
+				Studentssigntypedata:null,
+
+			})
+		 }
+
+
+	}
+	GotomQrcodesodesy(data,bool){
+		if(bool===true){
+			this.setState({
+				Qrcodesignintype:false,
+				Qrcodesignintypedata:data,
+			})
+		}else{
+			this.setState({
+				Qrcodesignintype:false,
+				Qrcodesignintypedata:null,
+
+			})
+		}
+
+
+	}
+
+
+
 
 	render(){
 
-		let {page,per_page,count,defaultActiveKey,limit,attendances_count,datas,absence_count,leave_count,normal_count} =this.state;
+		let {page,per_page,count,defaultActiveKey,limit,attendances_count,datas,absence_count,leave_count,normal_count,
+			Studentssigntype,Studentssigntypedata,Qrcodesignintype,Qrcodesignintypedata,
+		} =this.state;
 		const  isAdmin =this.props.isAdmin();
 
 		return(
@@ -155,11 +196,19 @@ class Students_signin extends Component{
 					<Studentssignmodels
 						{...this.state}
 						{...this.props}
+						Studentssigntype={Studentssigntype}
+						Studentssigntypedata={Studentssigntypedata}
+						Gotomodes={(d,b)=>this.Gotomodes(d,b)}
+						getsetdatas={()=>this.getsetdatas()}
 					/>
 					{/*二维码*/}
 					<Qrcodesignin
 						{...this.state}
 						{...this.props}
+						Qrcodesignintype={Qrcodesignintype}
+						Qrcodesignintypedata={Qrcodesignintypedata}
+						getsetdatas={()=>this.getsetdatas()}
+						GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)}
 					/>
 
 					<div className="clearfix   yslmaxheigthk" >
@@ -169,7 +218,14 @@ class Students_signin extends Component{
 							<Tabs defaultActiveKey="1" onChange={this.callback}>
 								<TabPane tab="正在签到" key="1">
 									<p className="mt20 mysligtes">共{attendances_count}个签到正在进行</p>
-									<Teaccomponent getsetdatas={()=>this.getsetdatas()} datas={datas} defaultActiveKey={defaultActiveKey} {...this.state} {...this.props}
+									<Teaccomponent
+										Gotomodes={(d,b)=>this.Gotomodes(d,b)}
+										GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)}
+										getsetdatas={()=>this.getsetdatas()}
+										datas={datas}
+										defaultActiveKey={defaultActiveKey}
+										{...this.state}
+										{...this.props}
 
 									></Teaccomponent>
 
@@ -199,7 +255,15 @@ class Students_signin extends Component{
 
 
 
-									<Teaccomponent  getsetdatas={()=>this.getsetdatas()} datas={datas} defaultActiveKey={defaultActiveKey} {...this.state} {...this.props}></Teaccomponent>
+									<Teaccomponent
+										Gotomodes={(d,b)=>this.Gotomodes(d,b)}
+										GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)}
+										getsetdatas={()=>this.getsetdatas()}
+										datas={datas}
+										defaultActiveKey={defaultActiveKey}
+										{...this.state}
+										{...this.props}
+									></Teaccomponent>
 
 
 									<div className="mb30 clearfix educontent mt40 intermediatecenter">
@@ -221,10 +285,6 @@ class Students_signin extends Component{
 								}
 
 							</Tabs>
-							<div className="positiondivs sortinxdirection xiaoshou">
-								<i className="iconfont icon-bianji5  posiivsicon"></i>
-								<p className="posiivs xiaoshou" onClick={()=>this.Qrcodesignintypefun()}>创建签到</p>
-							</div>
 							{
 								isAdmin?
 									<div className="positiondivs sortinxdirection xiaoshou">