Merge branches 'dev_aliyun' and 'dev_local' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_local

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

@@ -735,8 +735,12 @@ render(){
                           disabled={item.commit_status || item.user_id == this.props.current_user.user_id ===true?true:false}  className="fl "
                       ></Checkbox>
                       <Tooltip placement="bottom" title={item.user_nam}><div className={"fl ml5 fonthidden"} style={{width: '70px'}}>{item.user_name}</div></Tooltip>
-                      <div className={"fl ml20 color-grey-9"}>{item.group_name}</div>
-                      <div className={"fl ml20 color-grey-9"}>{item.student_id}</div>
+                      <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '147px' }}
+                        title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
+                      >{item.group_name}</div>
+                      <div className={"fl ml20 color-grey-9 overflowHidden1"} style={{  maxWidth: '84px' }}
+                        title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
+                      >{item.student_id}</div>
                       <div className={"fl ml20"}>{item.commit_status===true?<span className={"color-orange"}>已提交</span> :""}</div>
                     </div>
                   )
@@ -766,8 +770,12 @@ render(){
                     <Tooltip placement="bottom" title={item.user_nam}>
                       <div className={"fl ml5 fonthidden"} style={{width: '50px'}}>{item.user_name}</div>
                     </Tooltip>
-                    <div className={"fl ml40 color-grey-9"}>{item.group_name}</div>
-                    <div className={"fl ml40 color-grey-9"}>{item.student_id}</div>
+                    <div className={"fl ml40 color-grey-9 overflowHidden1"} style={{  maxWidth: '147px' }}
+                      title={item.group_name && item.group_name.length > 9 ? item.group_name : ''}
+                    >{item.group_name}</div>
+                    <div className={"fl ml40 color-grey-9 overflowHidden1"} style={{  maxWidth: '84px' }}
+                      title={item.student_id && item.student_id.length > 12 ? item.student_id : ''}
+                    >{item.student_id}</div>
                     {item.user_id != this.props.current_user.user_id ?<div className={"fr"}><i className={"iconfont icon-shanchudiao fl "} style={{marginTop:'-4px'}} onClick={()=>this.delecttask_status(item.user_id)}></i></div>:""}
                   </div>
                 )

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

@@ -961,6 +961,9 @@ class GraduationTaskssettinglist extends Component{
 						 .linbox{
 								height: 26px;
 						 }
+						 .ant-table-tbody>tr>td, .ant-table-thead>tr>th{
+						     padding: 16px 10px
+						 }
 						`
 						}
 					</style>

public/react/src/modules/user/usersInfo/InfosBanner.js

@@ -26,6 +26,8 @@ class InfosBanner extends Component{
      let {username}= this.props.match.params;
      let {pathname}=this.props.location;
      moduleName=pathname.split("/")[3];
+
+     console.log(is_current)
     return(
       <div className="bannerPanel mb60">
         <div className="educontent">
@@ -113,6 +115,14 @@ class InfosBanner extends Component{
                 onClick={() => this.setState({moduleName: 'videos'})}
                 to={`/users/${username}/videos`}>视频</Link>
             </li>}
+
+						{((is_current && current_user && current_user.is_teacher ) || current_user && current_user.admin)
+						&& <li className={`${moduleName == 'videos' ? 'active' : '' }`}>
+							<Link
+								onClick={() => this.setState({moduleName: 'videos'})}
+								to={`/users/${username}/videos`}>题库</Link>
+						</li>}
+
           </div>
         </div>
       </div>