diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
index ec1cf4e48..cad289855 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitedit.js
@@ -1,5 +1,5 @@
 import React,{Component} from "React";
-import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin} from "antd";
+import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Spin,Tooltip} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
 import { WordsBtn,getUrl } from 'educoder';
@@ -571,7 +571,7 @@ class GraduationTasksSubmitedit extends Component{
                       <div className={"fl ml20"}>成员要求：2～5人</div>
                       <Search
                         className={"fl mt5 ml20"}
-                        style={{width:"20%"}}
+                        style={{width:"270px"}}
                         placeholder="请输入姓名或学号搜索"
                         id="subject_search_input"
                         value={search}
@@ -581,26 +581,54 @@ class GraduationTasksSubmitedit extends Component{
                       ></Search>
                     </div>
 
-
+										<style>{`
+               .fonthidden{
+                    overflow:hidden;
+                    text-overflow:ellipsis;
+                    white-space:nowrap
+                }
+                .width87{
+                    width: 87px;
+    								height: 24px;
+                }
+                img.edu-nodata-img {
+										width: 200px;
+										margin: 50px 90px 20px;
+										display: block;
+								}
+              `}</style>
                   </Form.Item>
-                  <div className={"ml20"} style={{width:"100%"}}>
+                  <div className={"ml20 mt10"} style={{width:"100%"}}>
 
 
                     <div className={"members fl"}
                          onScroll={this.contentViewScroll}>
 
                       <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
-                        {memberslist&&memberslist.members.map((item,key)=>{
+												{memberslist===undefined?"":memberslist.members.length===0? 	<div className="square-list clearfix">
+													<div className="edu-tab-con-box clearfix edu-txt-center">
+														<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+														<p className="edu-nodata-p mb20">未找到包含{search}的学生</p>
+													</div>
+												</div>:memberslist&&memberslist.members.map((item,key)=>{
                           return(
                             <div key={key} style={{
                               width: '375px',
                               height: '30px'
                             }}>
-                              <Checkbox value={item.user_id} checked={parseInt(task_status[key])===item.user_id?true:false} disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
-                              <div className={"fl ml5"} style={{width: '70px'}}>{item.user_name}</div>
-                              <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
-                              <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
-                              <div className={"fl ml40"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
+                              <Checkbox value={item.user_id}
+																				checked={
+																					task_status.map((item,key)=>{
+																						return  parseInt(task_status[key])===item.user_id?true:false
+																					})
+																				}
+																				disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
+															<Tooltip placement="bottom" title={item.user_name}>
+                              <div className={"fl ml5 fonthidden width87"} style={{width: '70px'}}>{item.user_name}</div>
+															</Tooltip>
+                              <div className={"fl ml5 fonthidden width87 color-grey-9"}  style={{width: '70px'}}>{item.group_name}</div>
+                              <div className={"fl ml5 color-grey-9 fonthidden width87"}  style={{width: '70px'}}>{item.student_id}</div>
+                              <div className={"fl ml20"}>{item.commit_status===false?<span className={"color-orange"}>已提交</span> :""}</div>
                             </div>
                           )
                         })}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
index e1284832c..1c72433b6 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTasksSubmitnew.js
@@ -2,7 +2,7 @@ import React,{Component} from "React";
 import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Tooltip,Spin} from "antd";
 import {Link} from 'react-router-dom';
 import TPMMDEditor from '../../../tpm/challengesnew/TPMMDEditor';
-import { WordsBtn,getUrl } from 'educoder';
+import { WordsBtn,getUrl,getImageUrl} from 'educoder';
 import axios from 'axios';
 import Modals from '../../../modals/Modals';
 const Search = Input.Search;
@@ -354,7 +354,6 @@ class GraduationTasksSubmitnew extends Component{
    let newlist =memberslist.members;
    let newcheckedValues=checkedValues;
    let selects=[];
-
     selects.push(selectobjct)
    for(var i=0; i<newlist.length; i++){
      for(var z=0; z<newcheckedValues.length; z++){
@@ -379,6 +378,7 @@ class GraduationTasksSubmitnew extends Component{
     let selects=selectmemberslist;
 
     for(var i=0; i<newlist.length; i++){
+
       if(newlist[i]===id){
         newlist.splice(i,1)
       }
@@ -389,6 +389,7 @@ class GraduationTasksSubmitnew extends Component{
         selects.splice(z,1)
       }
     }
+
     this.setState({
       task_status:newlist,
       selectmemberslist:selects
@@ -522,7 +523,7 @@ render(){
               <div className={"fl ml20"}>成员要求：2～5人</div>
               <Search
                 className={"fl mt5 ml20"}
-                style={{width:"20%"}}
+                style={{width:"270px"}}
                 placeholder="请输入姓名或学号搜索"
                 id="subject_search_input"
                 value={search}
@@ -541,6 +542,15 @@ render(){
                     text-overflow:ellipsis;
                     white-space:nowrap
                 }
+                .width87{
+                    width: 87px;
+    								height: 24px;
+                }
+                img.edu-nodata-img {
+										width: 200px;
+										margin: 50px 90px 20px;
+										display: block;
+								}
               `}</style>
 
           <div className={"ml20"} style={{width:"100%"}}>
@@ -548,17 +558,31 @@ render(){
             <div className={"members fl"}
                  onScroll={this.contentViewScroll}>
               <CheckboxGroup value={task_status} onChange={this.funtaskstatus} style={{ paddingTop: '4px'}}>
-                {memberslist&&memberslist.members.map((item,key)=>{
+                {memberslist===undefined?"":memberslist.members.length===0?
+									<div className="square-list clearfix">
+										<div className="edu-tab-con-box clearfix edu-txt-center">
+											<img className="edu-nodata-img mb20" src={getImageUrl("images/educoder/nodata.png")}/>
+											<p className="edu-nodata-p mb20">未找到包含{search}的学生</p>
+										</div>
+									</div>:memberslist&&memberslist.members.map((item,key)=>{
+
                   return(
                     <div key={key} style={{
                       width: '375px',
                       height: '30px'
                     }}>
-                      <Checkbox value={item.user_id} checked={parseInt(task_status[key])===item.user_id?true:false} disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
-                      <Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{width: '70px'}}>{item.user_name}</div></Tooltip>
-                      <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
-                      <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
-                      <div className={"fl ml40"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
+                      <Checkbox value={item.user_id} checked={
+												task_status.map((item,key)=>{
+													return  parseInt(task_status[key])===item.user_id?true:false
+												})
+                      }
+										   disabled={item.commit_status===true?true:false}  className="fl "></Checkbox>
+                      <Tooltip placement="bottom" title={item.user_name}>
+												<div className={"fl ml5 fonthidden width87"}>{item.user_name}</div>
+                      </Tooltip>
+                      <div className={"fl ml5 fonthidden width87 color-grey-9"} title={item.group_name}>{item.group_name}</div>
+                      <div className={"fl ml5 color-grey-9 fonthidden width87"} title={item.student_id}>{item.student_id}</div>
+                      <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
                     </div>
                   )
                 })}
@@ -584,12 +608,13 @@ render(){
                     height: '30px',
                     display:item.user_name===undefined?"none":""
                   }}>
-                    <Tooltip placement="bottom" title={item.user_nam}>
-                      <div className={"fl ml5 fonthidden"} style={{width: '50px'}}>{item.user_name}</div>
+                    <Tooltip placement="bottom" title={item.user_name}>
+                      <div className={"fl ml5 fonthidden width87"}>{item.user_name}</div>
                     </Tooltip>
-                    <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
-                    <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
-                    {key>0?<div className={"fr"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+                    <div className={"fl ml5 fonthidden width87 color-grey-9"}>{item.group_name}</div>
+                    <div className={"fl ml5 color-grey-9 fonthidden width87"}>{item.student_id}</div>
+                    {key>0?<div className={"fl ml20"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
+
                   </div>
                 )
               })}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index 3971cab0f..52c12d069 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -92,7 +92,7 @@ class GraduationTaskssettinglist extends Component{
 					for (var i = 0; i < worklists.length; i++) {
 						datalist.push({
 							name: worklists[i].name,
-							number: (parseInt(page)-1)*parseInt(limit)+(i+1),
+							number: (parseInt(pages)-1)*parseInt(limit)+(i+1),
 							stduynumber: worklists[i].student_id,
 							classroom: worklists[i].class_grouping_name,
 							grouping: result.data.have_grouping === true ? worklists[i].grouping_name : null,
diff --git a/public/react/src/modules/user/LoginRegisterComponent.js b/public/react/src/modules/user/LoginRegisterComponent.js
index 846000984..800453b36 100644
--- a/public/react/src/modules/user/LoginRegisterComponent.js
+++ b/public/react/src/modules/user/LoginRegisterComponent.js
@@ -576,6 +576,7 @@ class LoginRegisterComponent extends Component {
                             <Input placeholder="请输入登录手机号码或邮箱" value={this.state.login}
                                    onChange={this.loginInputonChange}
                                    name="username"
+																	 className="loginInput"
                                    style={{marginTop: '30px'}}></Input>
 
                             {
@@ -605,7 +606,7 @@ class LoginRegisterComponent extends Component {
                     {
                         parseInt(tab[0])==1 &&
                         <div style={{width: '340px'}}>
-                            <Input className={loginInputsyl} placeholder="请使用手机号/邮箱账号进行注册"
+                            <Input className={loginInputsyl+" loginInput"} placeholder="请使用手机号/邮箱账号进行注册"
                                    value={this.state.logins}
                                    type="text" autoComplete="off"
                                    onChange={this.loginInputonChanges}
diff --git a/public/react/src/modules/user/common.css b/public/react/src/modules/user/common.css
index 9106ffda6..2fd37604d 100644
--- a/public/react/src/modules/user/common.css
+++ b/public/react/src/modules/user/common.css
@@ -1,47 +1,49 @@
-.login_register_content, .login_register_content .ant-tabs-tabpane {
-  display: flex;
-  justify-content: center;              
-}
-.login_register_content .ant-input {
-  background:rgb(244,244,244);
-}
-.login_register_content {
-  width: 434px;
-  box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
-  border-radius:6px;
-  background: #fff;
-}
-  .login_register_content .ant-tabs-ink-bar {
-    width: 21px !important;
-    left: 19px;
-  }
-  .login_register_content .ant-tabs {
-    width: 354px;
-  }
-
-  .login_section {
-    width: 100%;
-    display:flex;
-    justify-content: center;
-    align-items: center;
-    flex-direction: column;
-  }
-  .loginInput {
-    width: 100%;
-    margin-bottom: 16px;
-    height: 38px;
-  }
-
-  .left_right {
-    width: 100%;
-    display: flex;
-    justify-content: space-between;
-  }
-  .login_btn {
-    width: 100%;
-    margin-top: 26px;
-    margin-bottom: 26px;
-  }
-  .dragValidator {
-    margin-bottom: 16px;
+.login_register_content, .login_register_content .ant-tabs-tabpane {
+  display: flex;
+  justify-content: center;              
+}
+.login_register_content .ant-input {
+  background:rgb(244,244,244);
+}
+.login_register_content {
+  width: 434px;
+  box-shadow:3px 10px 21px 0px rgba(76,76,76,0.15);
+  border-radius:6px;
+  background: #fff;
+}
+  .login_register_content .ant-tabs-ink-bar {
+    width: 21px !important;
+    left: 19px;
+  }
+  .login_register_content .ant-tabs {
+    width: 354px;
+  }
+
+  .login_section {
+    width: 100%;
+    display:flex;
+    justify-content: center;
+    align-items: center;
+    flex-direction: column;
+  }
+  .loginInput {
+    width: 100%;
+    margin-bottom: 16px;
+    background-color: #fff!important;
+      height: 45px;
+      padding: 5px;
+  }
+
+  .left_right {
+    width: 100%;
+    display: flex;
+    justify-content: space-between;
+  }
+  .login_btn {
+    width: 100%;
+    margin-top: 26px;
+    margin-bottom: 26px;
+  }
+  .dragValidator {
+    margin-bottom: 16px;
   }
\ No newline at end of file