Merge branch 'dev_aliyun' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

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

@@ -120,6 +120,7 @@ class Detailss extends Component {
 								defaultActiveKey === "1" ?
 									<div className="ws25s" style={{
 										position: "relative",
+										overflow: 'hidden',
 									}}>
 										{
 											item && item.mode === "NUMBER" ?
@@ -140,6 +141,15 @@ class Detailss extends Component {
 													<p className="h40s  font-16" style={{
 														color: "#909399"
 													}}>签到码：</p>
+													<div style={{
+														overflow: 'hidden',
+														height: "1px",
+														width: "1px",
+														position: "absolute",
+														right: "-200px",
+													}}>
+														<input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
+													</div>
 												</div>
 												:
 												item && item.mode === "QRCODE" ?
@@ -174,20 +184,7 @@ class Detailss extends Component {
 
 						</div>
 					</div>
-					{
+
-						defaultActiveKey === "1" ?
-							item && item.mode === "NUMBER" ?
-								<div style={{
-									overflow: 'hidden',
-									height: "1px",
-									width: "1px"
-								}}>
-									<input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
-								</div>
-								:""
-							:
-							""
-					}
 				</div>
 
 			</React.Fragment>

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

@@ -103,6 +103,7 @@
     text-align: right;
     margin-right: 20px;
     line-height: 32px;
+    height: 32px;
 }
 
 #form_in_modal_group_ids .ant-select-selection{

public/react/src/modules/courses/signin/student/Signedinlist.js

@@ -14,7 +14,7 @@ class Signedinlist extends Component {
       limit:5,
       page:1,
       loading:false,
-      attendanceslist:[{id:undefined,name:"全部分班"}],
+      attendanceslist:[],
       data:null,
       group_ids:[],
       members_count:0,
@@ -42,9 +42,9 @@ class Signedinlist extends Component {
   componentDidUpdate(prevProps, prevState) {
     if(prevProps.headdata!=this.props.headdata){
 
-      let {attendanceslist}=this.state;
       if(this.props.headdata){
-        let listattendanceslist=attendanceslist;
+        let listattendanceslist=[];
+        listattendanceslist.push({id:undefined,name:"全部分班"})
         if(this.props.headdata.course_groups){
 
           if(this.props.headdata.course_groups.length>0){
@@ -54,7 +54,7 @@ class Signedinlist extends Component {
           }
         }
         this.setState({
-          listattendanceslist:listattendanceslist,
+          attendanceslist:listattendanceslist,
           data:this.props.headdata,
           course_members_count:this.props.headdata.normal_count,
           attendance_count:this.props.headdata.all_count
@@ -126,7 +126,7 @@ class Signedinlist extends Component {
     let url=`/weapps/attendances/${this.props&&this.props.switattendance_id}.json`;
     axios.get(url).then((response) => {
       if(response.data){
-
+        listattendanceslist.push({id:undefined,name:"全部分班"})
         if(response.data.course_groups.length>0){
           response.data.course_groups.map((item,key)=>{
             listattendanceslist.push(item)
@@ -149,7 +149,7 @@ class Signedinlist extends Component {
           })
         }
         this.setState({
-          listattendanceslist:listattendanceslist,
+          attendanceslist:listattendanceslist,
           data:response.data
         })
 

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

@@ -353,10 +353,10 @@ class Students_signin extends Component{
 										{
 											isAdmin===true?
 												<TabPane tab="签到统计" key="3">
-													<Signinstatistics
+													{defaultActiveKey&&defaultActiveKey==="3"?<Signinstatistics
 														{...this.props}
 														{...this.state}
-													/>
+													/>:""}
 												</TabPane>
 												:
 												""