Merge remote-tracking branch 'origin/master'

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

@@ -31,7 +31,7 @@ function renderScore(score, content) {
   } else if (score >= 60) {
     color = '#FF6800'
   }
-  return <a href="javascript:;"  style={{ color, minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
+  return <a href="javascript:;"  style={{ color, cursor: 'default', minWidth: '30px', display: 'inline-block', textAlign: 'center' }}>
       {score == null || score == undefined || score == '--' ? '--': (content || score)}
     </a>
 }
@@ -105,7 +105,7 @@ function buildColumns(that, student_works) {
           <a href="javascript:;"  
             title={record.student_id}
             style={{color:'#9A9A9A', 'text-overflow': 'ellipsis', 'white-space': 'nowrap', 'width': '100px', display: 'block', overflow: 'hidden'
-                , margin: '0 auto'}}
+                , margin: '0 auto', cursor: 'default'}}
           >{record.student_id}</a>
       </span>
       ),
@@ -121,7 +121,7 @@ function buildColumns(that, student_works) {
 
       render: (text, record) => (
         <span>
-          <a href="javascript:;"  style={{color:'#9A9A9A'}}>{record.group_name}</a>
+          <a href="javascript:;"  style={{color:'#9A9A9A', cursor: 'default'}}>{record.group_name}</a>
         </span>
       ),
     } )
@@ -177,7 +177,7 @@ function buildColumns(that, student_works) {
       }
       return (
       <span>
-        <a href="javascript:;"  style={{color: color}}>
+        <a href="javascript:;"  style={{color: color, cursor: 'default'}}>
           {status === 0 ? "未提交" : status === 1 ? "按时提交" : status === 2 ? "延时提交" : ""}
         </a>
       </span>
@@ -190,7 +190,7 @@ function buildColumns(that, student_works) {
 
     render: (update_time, record) => (
       <span>
-        <a href="javascript:;"  style={{color:'#989898'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
+        <a href="javascript:;"  style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
     </span>
     ),
   }]) 
@@ -450,17 +450,17 @@ class CommonWorkList extends Component{
   
   }
   teacherCommentOptionChange = (values, isAllChecked) => {
-    this.setState({arg_teacher_comment: isAllChecked ? [] : values}, () => {
+    this.setState({arg_teacher_comment: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }
   statusOptionChange = (values, isAllChecked) => {
-    this.setState({arg_work_status: isAllChecked ? [] : values}, () => {
+    this.setState({arg_work_status: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }
   courseGroupOptionChange = (values, isAllChecked) => {
-    this.setState({arg_course_group: isAllChecked ? [] : values}, () => {
+    this.setState({arg_course_group: isAllChecked ? [] : values, page: 1}, () => {
       this.fetchList()
     })
   }
@@ -648,7 +648,7 @@ class CommonWorkList extends Component{
 
               <CheckAllGroup options={options_teacher_comment} label={'你的评阅：'} onChange={this.teacherCommentOptionChange}></CheckAllGroup>
               <CheckAllGroup options={options_status} label={'作品状态：'} onChange={this.statusOptionChange}></CheckAllGroup>
-              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '86%'}}></CheckAllGroup>}
+              {options_course_group.length > 1 && <CheckAllGroup options={options_course_group} label={'分班情况：'} onChange={this.courseGroupOptionChange} checkboxGroupStyle={{width: '980px'}}></CheckAllGroup>}
 
 
               {/*   value={search} */}

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

@@ -216,7 +216,7 @@ export function TPMIndexHOC(WrappedComponent) {
       // 非课堂成员
       isNotMember = () => {
         // return this.state.coursedata&&this.state.coursedata.course_identity >= 0 &&
-        return this.state.coursedata&&this.state.coursedata.course_identity >6
+        return this.state.coursedata&&this.state.coursedata.course_identity >= 6
       }
 
       // setTrialapplication = ()=>{