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

app/models/searchable/course.rb

@@ -21,8 +21,8 @@ module Searchable::Course
   def to_searchable_json
     {
       id: id,
-      author_name: teacher.real_name,
+      author_name: teacher&.real_name,
-      author_school_name: teacher.school_name,
+      author_school_name: teacher&.school_name,
       visits_count: visits,
       members_count: members_count,
       is_public: is_public == 1

public/react/src/modules/courses/Resource/Fileslistitem.js

@@ -263,7 +263,7 @@ class Fileslistitem extends Component{
 
                     <p className="color-grey panel-lightgrey mt8 fl ml30" style={{width:'100%'}}>
                       <span className="mr50">
-                        <span className="mr15 color-dark">{discussMessage.author.login}</span>
+                        <span className="mr15 color-dark">{discussMessage.author.name}</span>
                         <span className="mr15 color-grey9">大小 {discussMessage.filesize}</span>
                         <span className="mr15 color-grey9">下载 {discussMessage.downloads_count}</span>
                         <span className="mr15 color-grey9">引用 {discussMessage.quotes}</span>

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

@@ -439,10 +439,24 @@ class GraduationTasksSubmitnew extends Component{
           ).then((response) => {
             this.setState({
               spinnings:false
-            })
+            });
-            if(response!==undefined){
+            // /courses/2915/graduation_tasks/1301/appraise
-              this.goback()
+            // window.location.href
+            if(response){
+              if(response.data){
+                if(response.data.work_id){
+                  window.location.href=`/courses/${this.props.match.params.coursesId}/graduation_tasks/${response.data.work_id}/appraise`
+                }
               }
+            }
+            // console.log(this.props);
+            // console.log(response);
+
+            // 新需求
+            // https://www.trustie.net/issues/23015
+            // if(response!==undefined){
+            //   this.goback()
+            // }
             // if(response.status===200) {
             //   GraduationTasksnewtype=false;
             //   if(response.data.status===0){

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

@@ -367,9 +367,9 @@ class Listofworksstudentone extends Component {
 					render: (text, record) => (
 						<span>
                         {
-													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A'}}>--</span>
+													record.submitstate === "未提交" ?<span style={{	color: '#9A9A9A',cursor:"default"}}>--</span>
 														:
-														<span style={{"text-align": "center"}}
+														<span style={{textAlign: "center",cursor:"default"}}
 																	className="color-blue"
 																	onClick={() => this.Viewstudenttraininginformation(record)}>{record.operating}</span>
 												}
@@ -691,9 +691,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
 							<span>
-                       <a style={{"text-align": "center"}} className="color-blue"
+                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)
@@ -985,9 +985,9 @@ class Listofworksstudentone extends Component {
 					align: 'center',
 					className:'font-14',
 					render: (text, record) => (
-						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A'}}>--</span> :
+						record.submitstate === "未提交" ? <span style={{	color: '#9A9A9A',cursor:"default"}}>--</span> :
 							<span>
-                       <a style={{"text-align": "center"}} className="color-blue"
+                       <a style={{textAlign: "center",cursor:"default"}} className="color-blue"
 													onClick={() => this.Viewstudenttraininginformationt(record)}>{record.operating}</a>
         </span>
 					)

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

@@ -1018,7 +1018,8 @@ class ShixunHomework extends Component{
         <div className="edu-back-white">
           <p className="clearfix padding30 bor-bottom-greyE">
             <p style={{height: '20px'}}>
-            <span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>
+            {/*<span className="font-18 fl color-dark-21">{datas&&datas.category_name===undefined||datas&&datas.category_name===null?datas&&datas.main_category_name:datas&&datas.category_name+" 作业列表"}</span>*/}
+              <span className="font-18 fl color-dark-21">实训作业</span>
               <li className="fr">
               {this.props.isAdmin()===true?datas&&datas.category_name===undefined||datas&&datas.category_name===null?
                   <span>