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

# Conflicts:
#	public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js

@@ -21,9 +21,7 @@ import moment from 'moment';
 import 'moment/locale/zh-cn';
 import './yslexercisetable.css';
 import {getImageUrl, toPath, sortDirections} from 'educoder';
-import CheckBoxGroup from "../../page/component/CheckBoxGroup";
+import NoneData from '../../../modules/courses/coursesPublic/NoneData';
-import NoneData from '../../../modules/courses/coursesPublic/NoneData'
-import ModulationModal from "../coursesPublic/ModulationModal";
 import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise";
 const Search = Input.Search;
 const RadioGroup = Radio.Group;
@@ -502,34 +500,34 @@ class Studentshavecompletedthelist extends Component {
 					width:'98px',
 					render: (text, record) => (
 						<span>
-							             			{record.completion === "--" ?
+							{record.completion === "--" ?
-																	<span style={{
+								<span style={{
-																		color: '#999999',
+									color: '#999999',
-																		textAlign: "center",
+									textAlign: "center",
-																		width:'98px',
+									width:'98px',
-																	}}>
+								}}>
-																		--
+									--
-																	</span>
+								</span>
 
-																	:
+								:
-																	<span style={parseInt(record.completion) > 90 ? {
+								<span style={parseInt(record.completion) > 90 ? {
-																		color: '#DD1717',
+									color: '#DD1717',
-																		textAlign: "center",
+									textAlign: "center",
-																		width:'98px',
+									width:'98px',
-																	} : parseInt(record.completion) <= 90 ? {
+								} : parseInt(record.completion) <= 90 ? {
-																		color: '#FF6800',
+									color: '#FF6800',
-																		textAlign: "center",
+									textAlign: "center",
-																		width:'98px',
+									width:'98px',
-																	} : parseInt(record.completion) <= 60 ? {
+								} : parseInt(record.completion) <= 60 ? {
-																		color: '#747A7F',
+									color: '#747A7F',
-																		textAlign: "center",
+									textAlign: "center",
-																		width:'98px',
+									width:'98px',
-																	} : {
+								} : {
-																		color: '#747A7F',
+									color: '#747A7F',
-																		textAlign: "center",
+									textAlign: "center",
-																		width:'98px',
+									width:'98px',
-																	}}>{record.completion}</span>
+								}}>{record.completion}</span>
-																}
+							}
         </span>
 					)
 				},
@@ -573,8 +571,7 @@ class Studentshavecompletedthelist extends Component {
 					dataIndex: 'efficiencyscore',
 					key: 'efficiencyscore',
 					align: 'center',
-					className: "edu-txt-center tabletd font-14",
+					className: "edu-txt-center tabletd font-14 columnstwoachievement",
-					width:"199px",
 					render: (text, record) => (
 						<span>
 							{
@@ -612,7 +609,6 @@ class Studentshavecompletedthelist extends Component {
 					key: 'finalscore',
 					align: 'center',
 					className: "edu-txt-center tabletd font-14",
-					width:"98px",
 					render: (text, record) => (
 						<span>
 							{

public/react/src/modules/courses/exercise/yslexercisetable.css

@@ -55,3 +55,8 @@
     white-space: nowrap;
     cursor: default;
 }
+.columnstwoachievement{
+    width: 216px;
+    text-align: right !important;
+    padding-right: 60px !important;
+}