diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 696448464..922c89714 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/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 ModulationModal from "../coursesPublic/ModulationModal"; +import NoneData from '../../../modules/courses/coursesPublic/NoneData'; import ModulationModal_exercise from "../coursesPublic/ModulationModal_exercise"; const Search = Input.Search; const RadioGroup = Radio.Group; @@ -488,34 +486,34 @@ class Studentshavecompletedthelist extends Component { width:'98px', render: (text, record) => ( - {record.completion === "--" ? - - -- - + {record.completion === "--" ? + + -- + - : - 90 ? { - color: '#DD1717', - textAlign: "center", - width:'98px', - } : parseInt(record.completion) <= 90 ? { - color: '#FF6800', - textAlign: "center", - width:'98px', - } : parseInt(record.completion) <= 60 ? { - color: '#747A7F', - textAlign: "center", - width:'98px', - } : { - color: '#747A7F', - textAlign: "center", - width:'98px', - }}>{record.completion} - } + : + 90 ? { + color: '#DD1717', + textAlign: "center", + width:'98px', + } : parseInt(record.completion) <= 90 ? { + color: '#FF6800', + textAlign: "center", + width:'98px', + } : parseInt(record.completion) <= 60 ? { + color: '#747A7F', + textAlign: "center", + width:'98px', + } : { + color: '#747A7F', + textAlign: "center", + width:'98px', + }}>{record.completion} + } ) }, @@ -559,7 +557,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", render: (text, record) => ( { @@ -596,7 +594,7 @@ class Studentshavecompletedthelist extends Component { dataIndex: 'finalscore', key: 'finalscore', align: 'center', - className: "edu-txt-center font-14", + className: "edu-txt-center tabletd font-14", render: (text, record) => ( { diff --git a/public/react/src/modules/courses/exercise/yslexercisetable.css b/public/react/src/modules/courses/exercise/yslexercisetable.css index b638aa304..be146b2ec 100644 --- a/public/react/src/modules/courses/exercise/yslexercisetable.css +++ b/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; +} \ No newline at end of file