Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

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

@@ -152,7 +152,7 @@ function buildColumns(that, student_works) {
         <span>
           {project_info && project_info.name && <a href={project_info.id == -1 ? 'javascript:void(0)' : `/projects/${project_info.id}`} 
               target={ project_info.id == -1 ? '' : "_blank" }
-              className="overflowHidden1" style={{color:'#4CACFF', width: '80px', margin: '0 auto', display: 'block'}} title={project_info.name}
+              className="overflowHidden1" style={{color:'#4CACFF', width: that.state.anonymous_comment ? '80px' : '130px', margin: '0 auto', display: 'block'}} title={project_info.name}
           >{project_info.name}</a>}
         </span>
       ),
@@ -749,6 +749,9 @@ class CommonWorkList extends Component{
                 border-bottom: none;
               }
               .studentTable .ant-table-tbody { background: '#F1F9FF' }
+              .studentTable table, .stageTable table{
+                font-size: 13px !important;
+              }
             `}</style>
             { isStudent &&StudentData===undefined?"":StudentData===undefined?"":
               <Table

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

@@ -132,7 +132,7 @@ class ShixunHomeworkPage extends Component {
 			<div className="newMain clearfix ">
 
 
-				<div className={"educontent mb20"} style={{width: "1200px"}}>
+				<div className={"educontent mt20 mb20"} style={{width: "1200px"}}>
 
 					<div className="educontent mb20">
 						<p className="clearfix mb20 mt10">