调整新需求

dev_local_cqdsj
杨树林 5 years ago
parent 6d04519e2b
commit 2328c928a3

@ -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) => (
<span>
<a href="javascript:;"
@ -203,6 +204,7 @@ function buildColumns(that, student_works, studentData) {
key: 'update_time',
sorter: true,
defaultSortOrder: 'descend',
sortDirections: sortDirections,
render: (update_time, record) => (
<span>
<a href="javascript:;" style={{color:'#989898', cursor: 'default'}}>{update_time ? moment(update_time).format('YYYY-MM-DD HH:mm') : '--'}</a>
@ -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 (
<span>

@ -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) => (
<span className="maxnamewidth175" style={{
width:'175px',
@ -203,6 +204,7 @@ class Studentshavecompletedthelist extends Component {
width:'175px',
sorter: true,
defaultSortOrder: 'descend',
sortDirections: sortDirections,
render: (text, record) => (
<span style={{
width:'175px',
@ -298,6 +300,7 @@ class Studentshavecompletedthelist extends Component {
align: 'center',
className: "edu-txt-center font-14",
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span>
{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) => (
<span>
{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) => (
<span>
{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) => (
<span>
{record.efficiencyscore === "--" ?

@ -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) => (
<span>
<div style={{color:'#9A9A9A'}} className={"studentnumber"} title={record.stduynumber}>{record.stduynumber}</div>
@ -824,6 +825,7 @@ class GraduationTaskssettinglist extends Component{
className:'edu-txt-center',
sorter: true,
defaultSortOrder: 'descend',
sortDirections: sortDirections,
render: (text, record) => (
<span>
<a style={{color:'#989898'}}>
@ -866,6 +868,7 @@ class GraduationTaskssettinglist extends Component{
dataIndex: 'finalscore',
className:'edu-txt-center',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span>
<Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅": <pre>

@ -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 ? <span>{item.StudentNo}</span> : "--"
@ -294,6 +295,7 @@ class PollDetailTabFirst extends Component{
width:160,
sorter: true,
defaultSortOrder: 'descend',
sortDirections: sortDirections,
render:(time,item,index)=>{
return(
item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm')

@ -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) => (
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
@ -1094,6 +1095,7 @@ class Listofworksstudentone extends Component {
align: 'center',
className: 'font-14',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span>
{
@ -1208,6 +1210,7 @@ class Listofworksstudentone extends Component {
align: "center",
className: 'font-14 maxnamewidth110',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
@ -1421,6 +1424,7 @@ class Listofworksstudentone extends Component {
align: 'center',
className: 'font-14',
sorter: true,
sortDirections: sortDirections,
render: (text, record) => (
<span>
{
@ -4035,4 +4039,4 @@ class Listofworksstudentone extends Component {
}
}
export default Listofworksstudentone;
export default Listofworksstudentone;

@ -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) => (
<span>
<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
@ -736,6 +737,8 @@ class ShixunStudentWork extends Component {
key: 'classroom',
dataIndex: 'classroom',
sorter: true,
defaultSortOrder: 'descend',
sortDirections: sortDirections,
render: (text, record) => (
<span>
<a style={{"color": record.classroom>=90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}%</a>
@ -1049,4 +1052,4 @@ export default ShixunStudentWork;
// data={ jobsettingsdata&& jobsettingsdata.data}
// />}
{/* </div>*/}
{/*</div>*/}
{/*</div>*/}

Loading…
Cancel
Save