Merge remote-tracking branch 'origin/master'

public/react/src/App.js

@@ -241,6 +241,7 @@ class App extends Component {
 
 	render() {
 	 // let {isRenders} = this.state;
+
 		return (
 			<LocaleProvider locale={zhCN}>
 
@@ -254,7 +255,7 @@ class App extends Component {
 
 					{/*{*/}
 					{/*	isRenders === true?*/}
-						<Trialapplication></Trialapplication>
+					{/*<Trialapplication></Trialapplication>*/}
 					{/*:""*/}
 					{/*}*/}
 

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

@@ -1557,9 +1557,10 @@ class GraduationTaskssettinglist extends Component{
 												{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>:""}
-																{item==="修改作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/edit"}>修改作品</a>:""}
-																{item==="查看作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/edit"}>查看作品</a> :""}
+														  	{item==="提交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>提交作品</a>:""}
+														  	{item==="补交作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+task_Id+"/works/new"}>补交作品</a>:""}
+																{item==="修改作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>修改作品</a>:""}
+																{item==="查看作品"?<a className={"fr color-blue font-16"} href={"/courses/"+this.props.match.params.coursesId+"/graduation_tasks/"+category_id+"/"+taskslistdata.work_id+"/works/edit"}>查看作品</a> :""}
 													  		{item==="创建项目"?<a className={"fr color-blue font-16"} href={'/projects/new'}>创建项目</a>:""}
 															  {item==="关联项目"?<a className={"fr color-blue font-16"} onClick={this.AssociationItems}>关联项目</a>:""}
 														  	{item==="取消关联"?<a className={"fr color-blue font-16"} onClick={this.cannelAssociation}>取消关联</a>:""}

public/react/src/modules/tpm/NewHeader.js

@@ -170,6 +170,7 @@ class NewHeader extends Component {
       submitapplications:false,
       isRender:false,
       isRenders:false,
+      showTrial:false,
       user:undefined,
     }
   }
@@ -511,14 +512,19 @@ submittojoinclass=(value)=>{
   }
 }
 
-  trialapplications =()=>{
-    this.setState({
-      isRenders: true,
-    })
+  // trialapplications =()=>{
+  //   console.log("点击了")
+  //   this.setState({
+  //     isRenders: true,
+  //     showTrial:true,
+  //   })
+  // }
+
+  // 关闭
+  cancelModulationModels = () => {
+    this.setState({isRenders: false})
   }
 
-
-
   render() {
     const isLogin = true;   // 这里不会出现未登录的情况，服务端在服务端路由时发现如果是未登录，则跳转到登录页了。
     const {match ,} = this.props;
@@ -537,8 +543,8 @@ submittojoinclass=(value)=>{
       submitapplications,
       submitapplicationsvalue,
       user,
-      isRenders,
       isRender,
+      isRenders,
     }=this.state;
     /*
         用户名称  用户头像url
@@ -575,14 +581,16 @@ submittojoinclass=(value)=>{
               />
         {/*      :""*/}
         {/*}*/}
+        <Trialapplication></Trialapplication>
 
-        {
-          isRenders&&isRenders===true?
-              <Trialapplication
-                  {...this.state}
-              />
-              :""
-        }
+        {/*{*/}
+        {/*  isRenders&&isRenders===true?*/}
+        {/*      <Trialapplication*/}
+        {/*          {...this.state}*/}
+        {/*          Cancel={() => this.cancelModulationModels()}*/}
+        {/*      />*/}
+        {/*      :""*/}
+        {/*}*/}
 
         <div className="educontent clearfix">
           {/*<%= link_to image_tag("/images/educoder/logo.png", alt:"高校智能化教学与实训平台", className:"logoimg"), home_path %>*/}
@@ -713,7 +721,7 @@ submittojoinclass=(value)=>{
                 <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.my_project_url}>我的项目</a></li>
                 <li><a href={this.props.Headertop===undefined?"":this.props.Headertop.account_manager_url}>账号管理</a></li>
                 {/*<li><a onClick={()=>this.educoderlogin()} >登入测试接口</a></li>*/}
-                <li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>
+                {/*<li><a onClick={()=>this.trialapplications()} >试用申请</a> </li>*/}
                 <li className="bor-top-greyE">
                   {/*<a href={this.props.Headertop===undefined?"":this.props.Headertop.logout_url}>退出</a>*/}
                   {/*<a  onClick={()=>this.educoderlogin()}>退出</a>*/}