调整

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

@@ -101,36 +101,43 @@ class Fileslists extends Component{
 		}
 	}
   componentDidUpdate = (prevProps) => {
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
+
-			this.getcourse_groupslists()
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.Id!=this.props.match.params.Id){
-			this.setState({
+
-				isSpin:true,
+
-				checkBoxValues:[],
+      if(this.props.match.params.main_id){
-				checkAllValue:false,
+        this.getcourse_groupslists()
-			})
+        this.setState({
-      if(this.props.match.params.main_id!=undefined){
+          isSpin:true,
-				this.setState({
+          checkBoxValues:[],
-					child:false,
+          checkAllValue:false,
-					sort:"desc"
+        })
-				})
+        if(this.props.match.params.main_id!=undefined){
-        this.seactall(undefined,"desc");
+          this.setState({
+            child:false,
+            sort:"desc"
+          })
+          this.seactall(undefined,"desc");
+        }
       }
-    }
+
-    if(prevProps.match.params.Id != this.props.match.params.Id){
+      if(this.props.match.params.Id){
-			this.getcourse_groupslists()
+        this.getcourse_groupslists()
-			this.setState({
+        this.setState({
-				isSpin:true,
+          isSpin:true,
-				checkBoxValues:[],
+          checkBoxValues:[],
-				checkAllValue:false,
+          checkAllValue:false,
-			})
+        })
-      if(this.props.match.params.Id!=undefined){
+        if(this.props.match.params.Id!=undefined){
-				this.setState({
+          this.setState({
-					child:true,
+            child:true,
-					sort:"desc"
+            sort:"desc"
-				})
+          })
-        this.seactall(parseInt(this.props.match.params.Id),"desc")
+          this.seactall(parseInt(this.props.match.params.Id),"desc")
+        }
       }
     }
+
   }
 
   updadatalist=(id)=>{
@@ -916,7 +923,7 @@ class Fileslists extends Component{
 							{
 								`
 								 .filesnameslist{
-										max-width: 200px;
+										max-width: 370px;
 										overflow: hidden;
 										text-overflow: ellipsis;
 										white-space: nowrap;

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

@@ -295,9 +295,11 @@ function buildColumns(that, student_works, studentData) {
       key: 'user_comment_count',
       dataIndex: 'user_comment_count',
 
-      render: (student_score, record) => (
+      render: (user_comment_count, record) => (
         <span  style={{color:'#989898', cursor: 'default'}}>
-          {record.user_comment_count}
+           <Tooltip title={"在匿评期间评阅的作品数量"}>
+             {record.user_comment_count}
+            </Tooltip>
       </span>
       ),
     })

public/react/src/modules/courses/coursesDetail/CoursesLeftNav.js

@@ -548,7 +548,11 @@ class Coursesleftnav extends Component{
 							description:result.data.message
 						});
 
-
+						if(positiontype==="shixun_homeworks"){
+              this.updasaveNavmoda()
+              trigger('updateNavSuccess')
+              this.props.history.push(`/classrooms/${coursesId}/shixun_homework/${result.data.category_id}`);
+            }
 						if(positiontype==="files"){
               this.updasaveNavmoda()
               trigger('updateNavSuccess')
@@ -561,7 +565,7 @@ class Coursesleftnav extends Component{
 							this.props.history.push(`/classrooms/${coursesId}/boards/${result.data.category_id}`);
 						}
 
-            if(positiontype!="course_groups"){
+            if(positiontype!="course_groups"&&positiontype!="shixun_homeworks"){
               this.updasaveNavmoda()
             }
 

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

@@ -146,27 +146,31 @@ class ShixunHomework extends Component{
 
   componentDidUpdate = (prevProps) => {
 
-    if(prevProps.match.params.main_id != this.props.match.params.main_id){
+    if(prevProps.coursesidtype!=this.props.coursesidtype||prevProps.match.params.main_id!=this.props.match.params.main_id||prevProps.match.params.category_id!=this.props.match.params.category_id) {
-      if(this.props.match.params.main_id!=undefined){
+
-      	this.setState({
+      if(this.props.match.params.main_id){
-					checkedtype:false,
+        if(this.props.match.params.main_id!=undefined){
-					orders:"8",
+          this.setState({
-					order:undefined,
+            checkedtype:false,
-					page:1
+            orders:"8",
-				})
+            order:undefined,
-        this.seactall();
+            page:1
+          })
+          this.seactall();
+        }
       }
-    }
+      if(this.props.match.params.category_id){
-    if(prevProps.match.params.category_id != this.props.match.params.category_id){
+        if(this.props.match.params.category_id!=undefined){
-      if(this.props.match.params.category_id!=undefined){
+          this.setState({
-				this.setState({
+            checkedtype:false,
-					checkedtype:false,
+            orders:"8",
-					orders:"8",
+            order:undefined,
-					order:undefined,
+            page:1
-					page:1
+          })
-				})
+          this.seactall(parseInt(this.props.match.params.category_id))
-        this.seactall(parseInt(this.props.match.params.category_id))
+        }
       }
+
     }
 
   }