调整

public/react/src/modules/courses/busyWork/CommonWorkSetting.js

@@ -421,7 +421,7 @@ class CommonWorkSetting extends Component{
       Topval:"本操作只对“未发布”的对象生效",
       Botvalleft:"暂不发布",
       Botval:"则通过后续手动设置，定时发布",
-      starttime:starttime,
+      starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
       endtime:endtime,
       Cancelname:"暂不发布",
       Savesname:"立即发布",

public/react/src/modules/courses/coursesPublic/Associationmodel.js

@@ -86,7 +86,7 @@ class Associationmodel extends Component{
              ModalSave:this.goback,
              loadtype:true
            })
-
+					this.props.funlist()
          }
 
        }

public/react/src/modules/courses/exercise/Exercise.js

@@ -213,7 +213,7 @@ class Exercise extends Component{
                     Topval:"本操作只对“未发布”的对象生效",
                     Botvalleft:"暂不发布",
                     Botval:"则通过后续手动设置，定时发布",
-                    starttime:"发布时间："+this.props.getNowFormatDates(1),
+                    starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 									  starttimes:this.props.getNowFormatDates(1),
                     endtime:"截止时间："+this.props.getNowFormatDates(2),
                     Cancelname:"暂不发布",

public/react/src/modules/courses/graduation/tasks/GraduateTaskItem.js

@@ -65,6 +65,7 @@ class GraduateTaskItem extends Component{
           cardsModalsavetype:this.cannerassocition,
           loadtype:true
         })
+				this.props.funlist()
       }
 
     }).catch((error)=>{

public/react/src/modules/courses/graduation/tasks/GraduationTaskssetting.js

@@ -415,7 +415,7 @@ class GraduationTaskssettingapp extends Component{
       Topval:"发布设置均可修改",
       Botvalleft:"点击修改",
       Botval:"此设置将对所有分班生效",
-      starttime:moment(moment(handleDateString(this.props.getNowFormatDates(1)))).format("YYYY-MM-DD HH:mm") ,
+      starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
       endtime:endtime,
@@ -1164,7 +1164,7 @@ class GraduationTaskssettingapp extends Component{
 
                   <div className={"h20 mb30 ml30"} >
                     <span>截止时间：</span>
-                    <Tooltip placement="bottom" title={this.props.isAdmin()===true?endtimetype===true?"时间已过，不能再修改":"":""}>
+                    <Tooltip placement="bottom" title={this.props.isSuperAdmin()===true?"":this.props.isAdmin()===true?endtimetype===true?"时间已过，不能再修改":"":""}>
                     <span>
                     <DatePicker
                       showToday={false}
@@ -1301,8 +1301,10 @@ class GraduationTaskssettingapp extends Component{
                         <RadioGroup onChange={this.funcommentstatus} disabled={this.props.isAdmin()===true?flagPageEdit===true?false:true:true} value={crosscomment===false?undefined:commentstatus===0?2:commentstatus===2?2:commentstatus===4?4:undefined}>
 
                           <Radio style={radioStyle} value={2}>指导老师手动分配   <span className={"font-14 color-grey-c ml10"}>（由指导老师在作品列表中，手动选择每个作品被分配的评阅老师）</span></Radio>
-                          <Radio style={radioStyle} value={4}>答辩组间老师互评   <span className={"font-14 color-grey-c ml10"}>（由系统按照设置在答辩组之间自动分配:<Link to={"/courses/"+courseId+"/teachers"}>
-                            <span className={"color-blue"}>答辩组设置</span></Link></span></Radio>
+                          <Radio style={radioStyle} value={4}>答辩组间老师互评   <span className={"font-14 color-grey-c ml10"}>（由系统按照设置在答辩组之间自动分配:
+														<a href={"/courses/"+courseId+"/teachers"} target="_blank">
+                            <span className={"color-blue"}>答辩组设置</span></a>
+                          </span></Radio>
 
                         </RadioGroup>
                     </span>

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js

@@ -332,7 +332,7 @@ class GraduationTaskssettinglist extends Component{
 			Topval:"发布设置均可修改",
 			Botvalleft:"点击修改",
 			Botval:"此设置将对所有分班生效",
-			starttime:moment(new Date()).format('YYYY-MM-DD 00:00'),
+			starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
 			endtime:endtime,
@@ -544,6 +544,7 @@ class GraduationTaskssettinglist extends Component{
 		axios.get(url).then((result)=>{
 
 			if(result.data.status===0){
+				this.searchValue()
 				this.setState({
 					Modalstype:true,
 					Modalstopval:result.data.message,
@@ -730,7 +731,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								tag.name
+																								{tag.name}
                                             </a>
                                                 :
 																							<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -863,7 +864,7 @@ class GraduationTaskssettinglist extends Component{
 																					其它历史评分将全部失效</pre>:""}>
 
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								tag.name
+																								{tag.name}
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -1012,7 +1013,8 @@ class GraduationTaskssettinglist extends Component{
 																						<Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																							其它历史评分将全部失效</pre>:""}>
 																								{tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																										tag.name</a>
+																									{tag.name}
+																								</a>
 																										:
 																										<a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
 																											 onClick={tag.name==="调分"?()=>this.showModulationtype(tag.id):tag.name==="分配"?()=>this.showAllocationModal(tag.id):""}
@@ -1145,7 +1147,7 @@ class GraduationTaskssettinglist extends Component{
                                         <Tooltip placement="bottom" title={tag.name==="分配"?"指定该作品的交叉评阅人":tag.name==="调分"?<pre>调整学生最终成绩<br/>
 																					其它历史评分将全部失效</pre>:""}>
                                             {tag.name==="评阅"?tag.status===0?"--":<a style={{color:'#4CACFF'}} href={"/courses/"+courseId+"/graduation_tasks/"+tag.id+"/appraise"} >
-																								tag.name
+																							{tag.name}
                                             </a>
                                                 :
                                                 <a style={{color:tag.name==="调分"?"#000":'#4CACFF'}}
@@ -1256,6 +1258,7 @@ class GraduationTaskssettinglist extends Component{
 						visible={visibles}
 						Cancel={this.Cancel}
 						taskid={taskslistdata&&taskslistdata.task_id}
+						funlist={this.searchValue()}
 					/>:""}
 
 					{taskslistdata&&taskslistdata?
@@ -1551,7 +1554,7 @@ class GraduationTaskssettinglist extends Component{
 												      to={"/courses/"+courseId+"/graduation_tasks/"+category_id+"/"+task_Id+"/setting"}>设置</Link>
 
 
-												{taskslistdata.work_status===undefined?"":taskslistdata.work_status.map((item,key)=>{
+												{taskslistdata.work_status===undefined||taskslistdata.work_status===null||taskslistdata.work_status.length===0?"":taskslistdata.work_status.map((item,key)=>{
 													return(
 														<span key={key}>
 																{item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}

public/react/src/modules/courses/graduation/tasks/GraduationTaskssettingquestions.js

@@ -81,7 +81,7 @@ class GraduationTasksquestions extends Component{
       Topval:"发布设置均可修改",
       Botvalleft:"点击修改",
       Botval:"此设置将对所有分班生效",
-      starttime:moment(new Date()).format('YYYY-MM-DD 00:00'),
+			starttime:moment(moment(new Date())).format("YYYY-MM-DD HH:mm") ,
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
       endtime:endtime,

public/react/src/modules/courses/graduation/tasks/index.js

@@ -413,7 +413,7 @@ class GraduationTasks extends Component{
       Topval:"本操作只对“未发布”的对象生效",
       Botvalleft:"暂不发布",
       Botval:"则通过后续手动设置，定时发布",
-      starttime:"发布时间："+starttime,
+      starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 			starttimes:this.props.getNowFormatDates(1),
 			typs:"start",
       endtime:"截止时间："+endtime,

public/react/src/modules/courses/poll/Poll.js

@@ -355,7 +355,7 @@ class Poll extends Component{
           Topval:"本操作只对“未发布”的对象生效",
           Botvalleft:"暂不发布",
           Botval:"则通过后续手动设置，定时发布",
-          starttime:"发布时间："+this.props.getNowFormatDates(1),
+          starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					starttimes:this.props.getNowFormatDates(1),
           endtime:"截止时间："+this.props.getNowFormatDates(2),
           Cancelname:"暂不发布",

public/react/src/modules/courses/poll/pollPublicBtn/ImmediatelyPublish.js

@@ -81,7 +81,7 @@ class Immediatelypublish extends Component{
               Topval:"本操作只对“未发布”的对象生效",
               Botvalleft:"暂不发布",
               Botval:"则通过后续手动设置，定时发布",
-              starttime:"发布时间："+this.props.getNowFormatDates(1),
+              starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 							starttimes:this.props.getNowFormatDates(1),
               endtime:"截止时间："+this.props.getNowFormatDates(2),
               Cancelname:"暂不发布",
@@ -120,7 +120,7 @@ class Immediatelypublish extends Component{
               Topval:"本操作只对“未发布”的对象生效",
               Botvalleft:"暂不发布",
               Botval:"则通过后续手动设置，定时发布",
-              starttime:"发布时间："+this.props.getNowFormatDates(1),
+              starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 							starttimes:this.props.getNowFormatDates(1),
               endtime:"截止时间："+this.props.getNowFormatDates(2),
               Cancelname:"暂不发布",

public/react/src/modules/courses/shixunHomework/Listofworks.js

@@ -821,7 +821,7 @@ class Listofworks extends Component {
 					Topval: "本操作只对“未发布”的对象生效",
 					Botvalleft: "暂不发布",
 					Botval: "则通过后续手动设置，定时发布",
-					starttime: "发布时间：" + starttime,
+					starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					endtime: "截止时间：" + endtime,
 					starttimes:starttime,
 					typs:"start",

public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js

@@ -304,7 +304,7 @@ class ShixunStudentWork extends Component {
 					Topval:"本操作只对“未发布”的对象生效",
 					Botvalleft:"暂不发布",
 					Botval:"则通过后续手动设置，定时发布",
-					starttime:"发布时间："+starttime,
+					starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					endtime:"截止时间："+endtime,
 					Cancelname:"暂不发布",
 					Savesname:"立即发布",

public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js

@@ -1237,7 +1237,7 @@ class Trainingjobsetting extends Component {
                     Topval: "本操作只对“未发布”的对象生效",
                     Botvalleft: "暂不发布",
                     Botval: "则通过后续手动设置，定时发布",
-                    starttime: "发布时间：" + starttime,
+                    starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 								   	starttimes:starttime,
 								  	typs:"start",
                     endtime: "截止时间：" + endtime,

public/react/src/modules/courses/shixunHomework/Workquestionandanswer.js

@@ -148,7 +148,7 @@ class Workquestionandanswer extends Component {
                     Topval: "本操作只对“未发布”的对象生效",
                     Botvalleft: "暂不发布",
                     Botval: "则通过后续手动设置，定时发布",
-                    starttime: "发布时间：" + starttime,
+                    starttime: "发布时间：" + moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
                     endtime: "截止时间：" + endtime,
                     Cancelname: "暂不发布",
                     Savesname: "立即发布",

public/react/src/modules/courses/shixunHomework/shixunHomework.js

@@ -209,7 +209,7 @@ class ShixunHomework extends Component{
           Topval:"本操作只对“未发布”的对象生效",
           Botvalleft:"暂不发布",
           Botval:"则通过后续手动设置，定时发布",
-          starttime:"发布时间："+starttime,
+          starttime:"发布时间："+moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					starttimes:starttime,
           endtime:"截止时间："+endtime,
           Cancelname:"暂不发布",
@@ -403,7 +403,7 @@ class ShixunHomework extends Component{
           Topval:"本操作只对“未发布”的对象生效",
           Botvalleft:"暂不发布",
           Botval:"则通过后续手动设置，定时发布",
-          starttime:"发布时间："+ starttime,
+          starttime:"发布时间："+ moment(moment(new Date())).format("YYYY-MM-DD HH:mm"),
 					starttimes:starttime,
 					typs:"start",
           endtime:"截止时间："+ endtime,