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

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

@@ -104,17 +104,17 @@ class ListPageIndex extends Component{
               {/*头部banner*/}
               <CoursesBanner {...this.props}></CoursesBanner>
 
-            {yslGuideone===null||yslGuideone===undefined||yslGuideone===false?
+            {/*{yslGuideone===null||yslGuideone===undefined||yslGuideone===false?*/}
-              (
+            {/*  (*/}
-                this.props.isAdmin()===true?
+            {/*    this.props.isAdmin()===true?*/}
-                  <Guide
+            {/*      <Guide*/}
-                    setwindowlocal={(b)=>this.setwindowlocal(b)}
+            {/*        setwindowlocal={(b)=>this.setwindowlocal(b)}*/}
-                  >
+            {/*      >*/}
-                  </Guide>
+            {/*      </Guide>*/}
-                  :""
+            {/*      :""*/}
-              )
+            {/*  )*/}
-              :""
+            {/*  :""*/}
-            }
+            {/*}*/}
 
               <div className="educontent clearfix" style={{flex: "1 0 auto"}}>
 

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

@@ -85,9 +85,9 @@ function buildColumns(that, student_works) {
 					overflow: 'hidden',
 					textOverflow: 'ellipsis',
 					whiteSpace: 'nowrap',
-          width: '98px',
+          width: '74px',
           margin: '0 auto'
-					 }} title={text}>
+					 }} title={text && text.length > 5 ? text : ''}>
 				{/* <Tooltip placement="bottom" title={text}>
 				</Tooltip> */}
 					{text}
@@ -185,7 +185,7 @@ function buildColumns(that, student_works) {
       </span>
     )},
   }, {
-    width: 150,
+    width: 106,
     title: '更新时间',
     dataIndex: 'update_time',
     key: 'update_time',
@@ -325,7 +325,7 @@ function buildColumns(that, student_works) {
   }
   if (isAdminOrStudent || that.props.work_public == true) {
     columns.push({
-      width: 92,
+      width: 72,
       title: '操作',
       key: 'operation',
       dataIndex: 'operation',
@@ -654,7 +654,7 @@ class CommonWorkList extends Component{
             }
 
             .workListContent .ant-table-thead > tr > th, .workListContent .ant-table-tbody > tr > td {
-              padding: 10px 2px;
+              padding: 10px 1px;
             }
           `}</style>
           <div style={{ background: '#fff'}} className="workListContent">

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

@@ -2492,7 +2492,7 @@ class Listofworksstudentone extends Component {
 
 								<div className="clearfix">
                                 <span className="fl color-grey-6 font-12"><span
-																	className="color-orange-tip">{teacherdata === undefined ? "" :teacherdata.student_works&&teacherdata.student_works.length}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
+																	className="color-orange-tip">{teacherdata === undefined ? "" : teacherdata.all_member_count}</span>个检索结果（{teacherdata === undefined ? "" : teacherdata.all_member_count}学生） </span>
 									<style>
 										{
 											`