Merge branch 'dev_cxt' of http://bdgit.educoder.net/Hjqreturn/educoder into dev_cxt

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

@@ -104,32 +104,32 @@ class Listofworksstudentone extends Component {
 					key: 'number',
 					align: "center",
 					className: 'font-14',
-					width: '100px',
+					width: '90px',
 					render: (text, record) => (
-						<span style={{width: '100px'}}>
+						<span style={{width: '90px'}}>
 						{record.number === undefined ?
 							<span style={{
 								color: '#9A9A9A',
 								textAlign: "center",
-								width: '100px'
+								width: '90px'
 							}}> --</span>
 							: record.number === "" ?
 								<span style={{
 									color: '#9A9A9A',
 									textAlign: "center",
-									width: '100px'
+									width: '90px'
 								}}>--</span>
 								: record.number === "--" ?
 									<span style={{
 										color: '#9A9A9A',
 										textAlign: "center",
-										width: '100px'
+										width: '90px'
 									}}>--</span>
 									:
 									<span style={{
 										color: '#07111B',
 										textAlign: "center",
-										width: '100px'
+										width: '90px'
 									}}>  {record.number}</span>
 						}
         </span>
@@ -187,31 +187,31 @@ class Listofworksstudentone extends Component {
 					dataIndex: 'stduynumber',
 					key: 'stduynumber',
 					align: "center",
-					className: 'font-14 maxnamewidth145',
-					width: '145px',
+					className: 'font-14 maxnamewidth120',
+					width: '120px',
 					render: (text, record) => (
-						<span className="maxnamewidth145" style={{
-							width: '145px',
+						<span className="maxnamewidth120" style={{
+							width: '120px',
 						}}>
 							{record.stduynumber === undefined ?
 								<span style={{
 									color: '#000',
 									textAlign: "center",
-									width: '145px',
+									width: '120px',
 								}}>--
 									</span>
 								: record.stduynumber === null ?
 									<span style={{
 										color: '#000',
 										textAlign: "center",
-										width: '145px',
+										width: '120px',
 									}}>--
 									</span>
 									: record.stduynumber === "" ?
 										<span style={{
 											color: '#000',
 											textAlign: "center",
-											width: '145px',
+											width: '120px',
 										}}>--
 									</span>
 										:
@@ -221,14 +221,12 @@ class Listofworksstudentone extends Component {
 											style={{
 												color: '#000',
 												textAlign: "center",
-												width: '145px',
+												width: '120px',
 											}}>{
 											record.stduynumber
 										}
 										</a>
-
 							}
-
         </span>
 					),
 				},

public/react/src/modules/courses/shixunHomework/style.css

@@ -73,6 +73,14 @@
   white-space:nowrap;
   cursor: default;
 }
+
+.maxnamewidth120{
+    max-width: 120px;
+    overflow:hidden;
+    text-overflow:ellipsis;
+    white-space:nowrap;
+    cursor: default;
+}
 .maxnamewidth145{
   max-width: 145px;
   overflow:hidden;