diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
index 762fe1406..c74f8a1d7 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js
@@ -140,9 +140,11 @@ class GraduationTaskssettingapp extends Component{
 
 
   componentDidMount(){
-
+		let query=this.props.location.search
+		const type = query.split('?tab=');
+    let id=parseInt(type[1])
     this.getsettings();
-		if(this.props.isAdmin()===true){
+		if(this.props.isAdmin()===true&&isNaN(id)){
 			this.editSetting()
 		}
   }
@@ -484,6 +486,31 @@ class GraduationTaskssettingapp extends Component{
 
 
     let {latepenalty,hascommit,minnums,max_nums,publish_time,end_time,crosscomment,latetime,starttimetype}=this.state;
+
+		if(isNaN(parseInt(this.state.minnum))){
+			this.setState({
+				numtype:true
+			})
+			this.scrollToAnchor("publishtimestart");
+			return
+		}else{
+			this.setState({
+				numtype:false
+			})
+		}
+		if(isNaN(parseInt(this.state.maxnum))){
+			this.setState({
+				numtype:true
+			})
+			this.scrollToAnchor("publishtimestart");
+			return
+		}else{
+			this.setState({
+				numtype:false
+			})
+		}
+
+
     if(latepenalty===undefined){
       this.setState({
         latepenaltytype:true,
@@ -611,26 +638,7 @@ class GraduationTaskssettingapp extends Component{
 			return
 		}
 
-    if(isNaN(parseInt(this.state.minnum))){
-      this.setState({
-        numtype:true
-      })
-      return
-    }else{
-      this.setState({
-        numtype:false
-      })
-    }
-    if(isNaN(parseInt(this.state.maxnum))){
-      this.setState({
-        numtype:true
-      })
-      return
-    }else{
-      this.setState({
-        numtype:false
-      })
-    }
+
 
 
 
@@ -1036,7 +1044,7 @@ class GraduationTaskssettingapp extends Component{
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
                   <Link className="active"
                         style={{paddingLeft:'38px'}}
-                        to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
+                        to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>
 
                   {/*<a className={"fr color-blue font-16"}>导出</a>*/}
                   <style>
@@ -1066,7 +1074,7 @@ class GraduationTaskssettingapp extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} calssName="color-dark">导出成绩</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
                       <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
@@ -1093,9 +1101,9 @@ class GraduationTaskssettingapp extends Component{
                 {task_type===2?<div className="stud-class-set bor-bottom-greyE pd20 edu-back-white pl30" >
                     <div className={"xingrequired font-16 color-dark h20 mb20"}>分组设置 <span className={"font-14 color-grey-c"}>（提交作品时需要关联同组成员，组内成员作品共享）</span></div>
                     <div className={"mb30 h20 ml40"}>
-                      <Input className="mr20" style={{ width:"100px" }} value={minnum}  onInput={this.setminnum}  disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
+                      <Input className={numtype===true?"noticeTip mr20":"mr20"} style={{ width:"100px" }} value={minnum}  onInput={this.setminnum}  disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
                       <span className="mr20">~</span>
-                      <Input  className="mr20" style={{width:"100px" }} value={maxnum} onInput={this.setmaxnum} disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
+                      <Input  className={numtype===true?"noticeTip mr20":"mr20"} style={{width:"100px" }} value={maxnum} onInput={this.setmaxnum} disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true}/>
                       <span className="mr10">人</span>
                       <span className={"font-14 color-grey-c"}>（学生提交作品时需要关联同组成员，组内成员作品共享）</span>
                     </div>
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
index ecfd21257..7ef1f99c5 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
@@ -1288,7 +1288,7 @@ class GraduationTaskssettinglist extends Component{
 											<Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
 											<Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
 											<Link style={{paddingLeft:'38px'}}
-											      to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
+											      to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>
 
 											{/*<a className={"fr color-blue font-16"} href={"/courses/"+courseId+"/graduation_tasks/"+task_Id+"/edit"}>编辑任务</a>*/}
 											{/*<a className={"fr color-blue font-16"} onClick={this.end}>立即截止</a>*/}
@@ -1322,7 +1322,7 @@ class GraduationTaskssettinglist extends Component{
 											{this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
 												导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
 												<ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} calssName="color-dark">导出成绩</a></li>
+													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
 													<li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
 												</ul>
 											</li>:""}
diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
index f373af827..80055f5d3 100644
--- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
+++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js
@@ -275,7 +275,7 @@ class GraduationTasksquestions extends Component{
                   <Link to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/list"}>任务列表</Link>
                   <Link className="active"  to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/questions"}>任务问答</Link>
                   <Link style={{paddingLeft:'38px'}}
-                        to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
+                        to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting?tab=3"}>设置</Link>
 
                   {/*<a className={"fr color-blue font-16"}>导出成绩</a>*/}
                   {/*{this.props.isAdmin()?<a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} className={"fr color-blue font-16"}>导出成绩</a>:""}*/}
@@ -308,7 +308,7 @@ class GraduationTasksquestions extends Component{
                   {this.props.isAdmin()? <li className="li_line drop_down fr color-blue font-16 mr20 mt20" style={{"paddingLeft":"0px"}}>
                     导出<i className="iconfont icon-xiajiantou font-12 ml2"></i>
                     <ul className="drop_down_menu" style={{"right":"-34px","left":"unset","height":"auto"}}>
-                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xls"} calssName="color-dark">导出成绩</a></li>
+                      <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.xlsx"} calssName="color-dark">导出成绩</a></li>
                       <li><a href={"/api/graduation_tasks/"+task_Id+"/tasks_list.zip"} calssName="color-dark">导出作品附件</a></li>
                     </ul>
                   </li>:""}
diff --git a/public/react/src/modules/courses/graduation/topics/index.js b/public/react/src/modules/courses/graduation/topics/index.js
index f84f53952..aaba86e9e 100644
--- a/public/react/src/modules/courses/graduation/topics/index.js
+++ b/public/react/src/modules/courses/graduation/topics/index.js
@@ -353,7 +353,7 @@ onBoardsNew=()=>{
                 {/* 参考普通作业 - 题库选用 */}
                 {/* <WordsBtn style="blue" className="mr30" onClick={()=>this.useFromBank()}>题库选用</WordsBtn> 正式版没有，先隐藏*/}
                 <p className="fl"><UseBank {...this.props} {...this.state} object_type={"gtopic"} useBankSuccess={this.useBankSuccess}></UseBank></p>
-                < a href={`/api/courses/${this.props.match.params.coursesId}/graduation_topics/export.xls`} className={"color-blue mr20 font-16"}>导出</a>
+                < a href={`/api/courses/${this.props.match.params.coursesId}/graduation_topics/export.xlsx`} className={"color-blue mr20 font-16"}>导出</a>
                 <WordsBtn style="blue" className="font-16" onClick={()=>this.onBoardsNew()}>新建</WordsBtn>
               </React.Fragment>):""
             }
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworks.js b/public/react/src/modules/courses/shixunHomework/Listofworks.js
index d346486d4..e38a0c453 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworks.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworks.js
@@ -1116,7 +1116,7 @@ class Listofworks extends Component {
 								>设置</Link>
 								{this.props.isAdmin() ? <a
 									className="fr color-blue font-16"
-									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xls`}
+									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
 								>导出</a> : ""}
 								{this.props.isAdmin() ?
 									teacherdata && teacherdata.end_immediately === true ?
diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
index 3fbdb2d3b..461c4d74d 100644
--- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
+++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
@@ -590,7 +590,7 @@ class ShixunStudentWork extends Component {
 								>设置</Link>
 								{this.props.isAdmin() ? <a
 									className="fr color-blue font-16"
-									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xls`}
+									href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
 								>导出</a> : ""}
 								{this.props.isAdmin()?
 									data.end_immediately===true?
diff --git a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
index 70a92aae6..919a744cf 100644
--- a/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
+++ b/public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
@@ -1592,7 +1592,7 @@ class Trainingjobsetting extends Component {
                                 {/*</Link>*/}
                                 {this.props.isAdmin() ? <a
                                     className="fr color-blue font-16"
-                                    href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xls`}
+                                    href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
                                 >导出</a> : ""}
                                 {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
                                     <a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a> : "": ""}
diff --git a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
index 419bca1b5..a06a5be32 100644
--- a/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
+++ b/public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js
@@ -411,7 +411,7 @@ class Workquestionandanswer extends Component {
                                 {/*<a className="fr color-blue font-16"   href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xls`}>导出成绩</a>*/}
                                 {this.props.isAdmin() ? <a
                                   className="fr color-blue font-16"
-                                  href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xls`}
+                                  href={`/api/homework_commons/${this.props.match.params.coursesId}/works_list.xlsx`}
                                 >导出</a> : ""}
                                 {this.props.isAdmin() ?jobsettingsdata&&jobsettingsdata.data.end_immediately===true?
                                   <a className="fr color-blue font-16" onClick={this.homeworkends}>立即截止</a>:"" : ""}