diff --git a/public/react/src/modules/courses/busyWork/CommonWorkList.js b/public/react/src/modules/courses/busyWork/CommonWorkList.js index 02ae6bbf3..7d7de40b3 100644 --- a/public/react/src/modules/courses/busyWork/CommonWorkList.js +++ b/public/react/src/modules/courses/busyWork/CommonWorkList.js @@ -2,7 +2,7 @@ import React,{Component} from "React"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal, Table, Divider, Tag,DatePicker,Radio,Tooltip,Spin, Pagination} from "antd"; import {Link} from 'react-router-dom'; import locale from 'antd/lib/date-picker/locale/zh_CN'; -import { WordsBtn, ConditionToolTip, queryString,getImageUrl, on, off, NoneData} from 'educoder'; +import {WordsBtn, ConditionToolTip, queryString, getImageUrl, on, off, NoneData, sortDirections} from 'educoder'; import axios from 'axios'; import Modals from '../../modals/Modals'; import CoursesListType from '../coursesPublic/CoursesListType'; @@ -113,6 +113,7 @@ function buildColumns(that, student_works, studentData) { dataIndex: 'student_id', key: 'student_id', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( ( {update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'} @@ -311,6 +313,7 @@ function buildColumns(that, student_works, studentData) { key: 'work_score', dataIndex: 'work_score', sorter: true, + sortDirections: sortDirections, render: (work_score, record) => { return ( diff --git a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js index 829df6fe7..12a13d6e1 100644 --- a/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js +++ b/public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js @@ -20,7 +20,7 @@ import '../poll/pollStyle.css' import moment from 'moment'; import 'moment/locale/zh-cn'; import './yslexercisetable.css'; -import {getImageUrl, toPath} from 'educoder'; +import {getImageUrl, toPath, sortDirections} from 'educoder'; import CheckBoxGroup from "../../page/component/CheckBoxGroup"; import NoneData from '../../../modules/courses/coursesPublic/NoneData' const Search = Input.Search; @@ -111,6 +111,7 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14 maxnamewidth175", width:'175px', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( ( ( {record.efficiencyscore === "--" ? @@ -882,6 +885,7 @@ class Studentshavecompletedthelist extends Component { align: 'center', className: "edu-txt-center font-14", sorter: true, + sortDirections: sortDirections, render: (text, record) => ( {record.stduynumber === "--" ? @@ -937,6 +941,7 @@ class Studentshavecompletedthelist extends Component { className: "edu-txt-center font-14", sorter: true, defaultSortOrder: 'descend', + sortDirections: sortDirections, render: (text, record) => ( {record.updatetime==="--"? @@ -986,6 +991,7 @@ class Studentshavecompletedthelist extends Component { align: 'center', className: "edu-txt-center font-14", sorter: true, + sortDirections: sortDirections, render: (text, record) => ( {record.efficiencyscore === "--" ? diff --git a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js index 65b6a13e3..43bb9ba0b 100644 --- a/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js +++ b/public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js @@ -1,7 +1,7 @@ import React,{Component} from "React"; import { Form, Select, Input, Button,Checkbox,Upload,Icon,message,Modal,Pagination, Table, Divider, Tag,Tooltip} from "antd"; import {Link} from 'react-router-dom'; -import { getImageUrl , NoneData } from 'educoder'; +import {getImageUrl, NoneData, sortDirections} from 'educoder'; import axios from 'axios'; import moment from 'moment'; import HomeworkModal from "../../coursesPublic/HomeworkModal"; @@ -771,6 +771,7 @@ class GraduationTaskssettinglist extends Component{ key: 'stduynumber', className:'edu-txt-center', sorter: true, + sortDirections: sortDirections, render: (text, record) => (
{record.stduynumber}
@@ -824,6 +825,7 @@ class GraduationTaskssettinglist extends Component{ className:'edu-txt-center', sorter: true, defaultSortOrder: 'descend', + sortDirections: sortDirections, render: (text, record) => ( @@ -866,6 +868,7 @@ class GraduationTaskssettinglist extends Component{ dataIndex: 'finalscore', className:'edu-txt-center', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( diff --git a/public/react/src/modules/courses/poll/PollDetailTabFirst.js b/public/react/src/modules/courses/poll/PollDetailTabFirst.js index d64a29ebd..07b9ee197 100644 --- a/public/react/src/modules/courses/poll/PollDetailTabFirst.js +++ b/public/react/src/modules/courses/poll/PollDetailTabFirst.js @@ -1,7 +1,7 @@ import React,{ Component } from "react"; import {Checkbox,Input,Table, Pagination} from "antd"; -import { WordsBtn } from 'educoder' +import {WordsBtn, sortDirections} from 'educoder' import moment from 'moment'; import CheckAllGroup from '../common/button/CheckAllGroup' import NoneData from "../coursesPublic/NoneData" @@ -259,6 +259,7 @@ class PollDetailTabFirst extends Component{ key: 'StudentNo', className:"edu-txt-center", sorter: true, + sortDirections: sortDirections, render:(StudentNo,item,index)=>{ return( item.StudentNo ? {item.StudentNo} : "--" @@ -294,6 +295,7 @@ class PollDetailTabFirst extends Component{ width:160, sorter: true, defaultSortOrder: 'descend', + sortDirections: sortDirections, render:(time,item,index)=>{ return( item.time == null ? -- : moment(item.time).format('YYYY-MM-DD HH:mm') diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js index 3b19630bc..172baa8ca 100644 --- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js +++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import CoursesListType from '../coursesPublic/CoursesListType'; -import {WordsBtn, ActionBtn} from 'educoder'; +import {WordsBtn, ActionBtn, sortDirections} from 'educoder'; import { Form, Select, @@ -874,6 +874,7 @@ class Listofworksstudentone extends Component { align: "center", className: 'font-14 maxnamewidth110', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( {record.stduynumber === undefined ? @@ -1094,6 +1095,7 @@ class Listofworksstudentone extends Component { align: 'center', className: 'font-14', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( { @@ -1208,6 +1210,7 @@ class Listofworksstudentone extends Component { align: "center", className: 'font-14 maxnamewidth110', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( {record.stduynumber === undefined ? @@ -1421,6 +1424,7 @@ class Listofworksstudentone extends Component { align: 'center', className: 'font-14', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( { @@ -4035,4 +4039,4 @@ class Listofworksstudentone extends Component { } } -export default Listofworksstudentone; \ No newline at end of file +export default Listofworksstudentone; diff --git a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js index d5f1dd7cd..0c0591acf 100644 --- a/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js +++ b/public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js @@ -1,6 +1,6 @@ import React, {Component} from "react"; import CoursesListType from '../coursesPublic/CoursesListType'; -import {WordsBtn,ActionBtn} from 'educoder'; +import {WordsBtn, ActionBtn, sortDirections} from 'educoder'; import ShixunWorkModal from './Shixunworkdetails/ShixunWorkModal'; import HomeworkModal from "../coursesPublic/HomeworkModal"; import OneSelfOrderModal from "../coursesPublic/OneSelfOrderModal"; @@ -725,6 +725,7 @@ class ShixunStudentWork extends Component { dataIndex: 'stduynumber', key: 'stduynumber', sorter: true, + sortDirections: sortDirections, render: (text, record) => ( {record.stduynumber} @@ -736,6 +737,8 @@ class ShixunStudentWork extends Component { key: 'classroom', dataIndex: 'classroom', sorter: true, + defaultSortOrder: 'descend', + sortDirections: sortDirections, render: (text, record) => ( =90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}% @@ -1049,4 +1052,4 @@ export default ShixunStudentWork; // data={ jobsettingsdata&& jobsettingsdata.data} // />} {/* */} -{/**/} \ No newline at end of file +{/**/}