m52mxtq3o
/
educoder
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branches 'dev_aliyun' and 'yslshixunzuoye01' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

Browse Source
dev_local_cqdsj
杨树林 5 years ago
parent 1bad07bc86 69f62645ae
commit 070f707df6
11 changed files with 664 additions and 452 deletions
Show Stats Download Patch File Download Diff File

5
public/react/src/modules/competition/Registration.js
Unescape View File

@ -951,9 +951,8 @@ class Registration extends React.Component {
{
type === 4 || type === 5 ?
<RegistrationSearch {...this.props} {...this.state}
count={count}
RegistrationSearchvalue={(value) => this.RegistrationSearchvalue(value)}></RegistrationSearch>
<RegistrationSearch {...this.props} {...this.state} count={count}
RegistrationSearchvalue={(value) => this.RegistrationSearchvalue(value)}></RegistrationSearch>
: ""
}
{/*<Registrationitem></Registrationitem>*/}

4
public/react/src/modules/competition/RegistrationSearch.js
Unescape View File

@ -63,7 +63,9 @@ class RegistrationSearch extends React.Component {
lineHeight: " 24px"
}}>战队总数：<span
style={{color: "#459BE5", fontSize: "16px"}}>{this.props.count}</span><span
style={{marginLeft: "5px",}}>个</span></p>
style={{marginLeft: "5px", marginRight: "15px",}}>个</span> 参赛总人数：<span
style={{color: "#459BE5"}}>{this.props.members_count}</span><span
style={{marginLeft: "5px"}}>人</span></p>
</div>
)
}

1
public/react/src/modules/courses/busyWork/CommonWorkDetailIndex.js
Unescape View File

@ -27,6 +27,7 @@ const CommonWorkSetting = Loadable({
loader: () => import('./CommonWorkSetting'),
loading:Loading,
})
//普通作业列表
const CommonWorkList = Loadable({
loader: () => import('./CommonWorkList'),
loading:Loading,

136
public/react/src/modules/courses/busyWork/CommonWorkList.js
Unescape View File

@ -112,7 +112,7 @@ function buildColumns(that, student_works, studentData) {
title: '学号',
dataIndex: 'student_id',
key: 'student_id',
sorter: true,
render: (text, record) => (
<span>
<a href="javascript:;"
@ -131,9 +131,8 @@ function buildColumns(that, student_works, studentData) {
title: '分班',
key: 'group_name',
dataIndex: 'group_name',
render: (text, record) => (
<span>
<span>
<a href="javascript:;" style={{color:'#9A9A9A', cursor: 'default'}}>{record.group_name}</a>
</span>
),
@ -201,7 +200,7 @@ function buildColumns(that, student_works, studentData) {
title: '更新时间',
dataIndex: 'update_time',
key: 'update_time',
sorter: true,
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>
@ -306,10 +305,11 @@ function buildColumns(that, student_works, studentData) {
}
if (!niPingAndIsStudent) {
columns.push({
width: 70,
width: '113px',
title: '最终成绩',
key: 'work_score',
dataIndex: 'work_score',
sorter: true,
render: (work_score, record) => {
return (
<span>
@ -396,6 +396,7 @@ class CommonWorkList extends Component{
isSpin:true,
left_time: {},
category: {},
b_order: 'desc',
}
}
onTablePagination = (page) => {
@ -412,6 +413,7 @@ class CommonWorkList extends Component{
}
componentDidMount() {
console.log("CommonWorkList 分班list 开始加载");
this.fetchList()
on('commonwork_fetch_all', this.fetchAllListener)
$("html").animate({ scrollTop: $('html').scrollTop() - 100 });
@ -430,7 +432,7 @@ class CommonWorkList extends Component{
}
_getRequestParams() {
const { search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work } = this.state
const {search, arg_work_status, arg_teacher_comment, arg_course_group, order, page, arg_member_work, b_order} = this.state
return {
page,
search,
@ -439,7 +441,7 @@ class CommonWorkList extends Component{
teacher_comment: arg_teacher_comment.length == 0 ? '' : arg_teacher_comment[0],
order,
limit: PAGE_SIZE,
b_order: orderMap[order],
b_order: b_order,
group_id:arg_course_group,
member_work: arg_member_work
}
@ -494,8 +496,12 @@ class CommonWorkList extends Component{
this.fetchList()
})
}
funorder = (order) => {
this.setState({ order }, () => {
funorder = (order, b_order) => {
this.setState({
order: order
,
b_order: b_order
}, () => {
this.fetchList()
})
}
@ -547,6 +553,64 @@ class CommonWorkList extends Component{
}
//普通作业tbale 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
//"ascend" 升序
//"descend" 降序
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
// 时间
try {
if (sorter.columnKey === "update_time") {
let myyslorder = "";
if (sorter.order === "ascend") {
myyslorder = "asc";
} else if (sorter.order === "descend") {
myyslorder = "desc";
}
this.funorder("update_time", myyslorder);
}
} catch (e) {
}
//成绩
try {
if (sorter.columnKey === "work_score") {
let myyslorder = "";
if (sorter.order === "ascend") {
myyslorder = "asc";
} else if (sorter.order === "descend") {
myyslorder = "desc";
}
this.funorder("work_score", myyslorder)
}
} catch (e) {
}
//学号
try {
if (sorter.columnKey === "student_id") {
let myyslorder = "";
if (sorter.order === "ascend") {
myyslorder = "asc";
} else if (sorter.order === "descend") {
myyslorder = "desc";
}
this.funorder("student_id", myyslorder)
}
} catch (e) {
}
}
}
render(){
const { getFieldDecorator } = this.props.form;
const dateFormat = 'YYYY-MM-DD HH:mm';
@ -742,21 +806,21 @@ class CommonWorkList extends Component{
</li>
</ul>
</div> } */}
{
isAdminOrStudent && student_works && !!student_works.length &&
<div className="fr">
<li className="drop_down">
<span className="color-grey-9 font-12">
{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}
</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
<ul className="drop_down_normal">
<li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>
<li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>
<li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>
</ul>
</li>
</div>
}
{/*{*/}
{/* isAdminOrStudent && student_works && !!student_works.length &&*/}
{/* <div className="fr">*/}
{/* <li className="drop_down">*/}
{/* <span className="color-grey-9 font-12">*/}
{/* {order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}*/}
{/* </span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>*/}
{/* <ul className="drop_down_normal">*/}
{/* <li className={''} onClick={()=>this.funorder("update_time")}>更新时间</li>*/}
{/* <li className={''} onClick={()=>this.funorder("work_score")}>最终成绩</li>*/}
{/* <li className={''} onClick={()=>this.funorder("student_id")}>学生学号</li>*/}
{/* </ul>*/}
{/* </li>*/}
{/* </div>*/}
{/*}*/}
</div>
</div> }
@ -791,11 +855,12 @@ class CommonWorkList extends Component{
`}</style>
{ isStudent &&StudentData===undefined?"":StudentData===undefined?"":
<Table
className="studentTable"
dataSource={StudentData}
columns={columns}
pagination={false}
showHeader={ !student_works || student_works.length == 0}
className="studentTable"
dataSource={StudentData}
onChange={this.table1handleChange}
columns={columns}
pagination={false}
showHeader={ !student_works || student_works.length == 0}
/>
}
@ -833,12 +898,13 @@ class CommonWorkList extends Component{
onChange={this.onTablePagination}
*/}
<Table
className="stageTable"
dataSource={student_works}
columns={columns}
showQuickJumper
pagination={false}
loading={loadingstate}
className="stageTable"
dataSource={student_works}
columns={columns}
showQuickJumper
pagination={false}
onChange={this.table1handleChange}
loading={loadingstate}
/>
</React.Fragment>

349
public/react/src/modules/courses/exercise/Studentshavecompletedthelist.js
Unescape View File

@ -110,6 +110,7 @@ class Studentshavecompletedthelist extends Component {
align: 'center',
className: "edu-txt-center font-14 maxnamewidth175",
width:'175px',
sorter: true,
render: (text, record) => (
<span className="maxnamewidth175" style={{
width:'175px',
@ -200,6 +201,7 @@ class Studentshavecompletedthelist extends Component {
align: 'center',
className: "edu-txt-center font-14",
width:'175px',
sorter: true,
render: (text, record) => (
<span style={{
width:'175px',
@ -294,6 +296,7 @@ class Studentshavecompletedthelist extends Component {
key: 'efficiencyscore',
align: 'center',
className: "edu-txt-center font-14",
sorter: true,
render: (text, record) => (
<span>
{record.efficiencyscore === "--" ?
@ -877,6 +880,7 @@ class Studentshavecompletedthelist extends Component {
key: 'stduynumber',
align: 'center',
className: "edu-txt-center font-14",
sorter: true,
render: (text, record) => (
<span>
{record.stduynumber === "--" ?
@ -930,6 +934,7 @@ class Studentshavecompletedthelist extends Component {
key: 'updatetime',
align: 'center',
className: "edu-txt-center font-14",
sorter: true,
render: (text, record) => (
<span>
{record.updatetime==="--"?
@ -978,6 +983,7 @@ class Studentshavecompletedthelist extends Component {
key: 'efficiencyscore',
align: 'center',
className: "edu-txt-center font-14",
sorter: true,
render: (text, record) => (
<span>
{record.efficiencyscore === "--" ?
@ -1221,6 +1227,7 @@ class Studentshavecompletedthelist extends Component {
},
],
exercise_status:0,
order_type: "desc",
}
// console.log("Studentshavecompletedthelist");
// console.log(props.current_status);
@ -1244,7 +1251,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, 20, this.state.order_type);
}
paginationonChanges = (pageNumber) => {
@ -1261,7 +1268,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdata(this.state.order, null, null, null, null, pageNumber, this.state.limit)
this.Searchdata(this.state.order, null, null, null, null, pageNumber, this.state.limit, this.state.order_type);
}
@ -1459,9 +1466,9 @@ class Studentshavecompletedthelist extends Component {
thiss.Generatenewdatasy(response.data.exercise_users, response);
}
}).catch((error) => {
console.log(error);
console.log("其实数据加载失败了");
console.log("1111");
// console.log(error);
// console.log("其实数据加载失败了");
// console.log("1111");
});
@ -1613,60 +1620,8 @@ class Studentshavecompletedthelist extends Component {
}
//排序
funorder = (e) => {
if (e === "end_at") {
// 时间
// 时间排序是从小到大
if (this.state.loadingstate === true) {
this.setState({
order: "end_at",
})
} else {
this.setState({
order: "end_at",
loadingstate: true,
})
}
this.Searchdata(e, null, null, null, null, this.state.page, this.state.limit)
}
if (e === "score") {
// 成绩
//成绩排序是从大到小
if (this.state.loadingstate === true) {
this.setState({
order: "score",
})
} else {
this.setState({
order: "score",
loadingstate: true,
})
}
this.Searchdata(e, null, null, null, null, this.state.page, this.state.limit)
}
if (e === "student_id") {
//学号
//学号排序是从大到小
if (this.state.loadingstate === true) {
this.setState({
order: "student_id",
})
} else {
this.setState({
order: "student_id",
loadingstate: true
})
}
this.Searchdata(e, null, null, null, null, this.state.page, this.state.limit)
}
}
Searchdata = (order, commit_status, review, exercise_group_id, search, page, limit) => {
Searchdata = (order, commit_status, review, exercise_group_id, search, page, limit, order_type) => {
var exercise_id = this.props.match.params.Id;
// console.log(731); // 764 935
var url = `/exercises/${exercise_id}/exercise_lists.json`;
@ -1678,6 +1633,7 @@ class Studentshavecompletedthelist extends Component {
search: "",
page: page,
limit: limit,
order_type: order_type,
}
axios.get(url, {
params: params
@ -2050,7 +2006,7 @@ class Studentshavecompletedthelist extends Component {
})
}
Searchdatasys = (order, commit_status, review, exercise_group_id, search, page, limit) => {
Searchdatasys = (order, commit_status, review, exercise_group_id, search, page, limit, order_type) => {
var exercise_id = this.props.match.params.Id;
var url = `/exercises/${exercise_id}/exercise_lists.json`;
axios.get((url), {
@ -2062,6 +2018,7 @@ class Studentshavecompletedthelist extends Component {
search: search,
page: page,
limit: limit,
order_type: order_type
}
}).then((response) => {
// console.log("528");
@ -2098,7 +2055,7 @@ class Studentshavecompletedthelist extends Component {
page:1,
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, null, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
}
// notlimiteds = () => {
// this.setState({
@ -2125,7 +2082,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, undefined, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
}
checkeboxstwo = (checkedValues, data) => {
// console.log(checkedValues)
@ -2146,7 +2103,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2163,10 +2120,10 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
} else {
// console.log(checkedValues);
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, checkedValues, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
if (this.state.loadingstate === false) {
this.setState({
loadingstate: true,
@ -2196,7 +2153,7 @@ class Studentshavecompletedthelist extends Component {
course_groups: null,
unlimitedtwo: 0
})
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, null, null)
this.Searchdatasys(this.state.order, this.state.commit_status, this.state.review, undefined, this.state.searchtext, null, null, this.state.order_type)
}
checkeboxs = (checkedValues, data) => {
@ -2225,7 +2182,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2242,7 +2199,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2260,7 +2217,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
}
}
@ -2283,7 +2240,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, undefined, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, undefined, this.state.searchtext, 1, this.state.limit, this.state.order_type)
}
funtaskstatustwo = (checkedValues, data) => {
@ -2305,7 +2262,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
} else if (checkedValues.length === data.length) {
if (this.state.loadingstate === false) {
this.setState({
@ -2322,7 +2279,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
} else {
// console.log(checkedValues);
if (this.state.loadingstate === false) {
@ -2343,7 +2300,7 @@ class Studentshavecompletedthelist extends Component {
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit)
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.order_type)
this.props.setcourse_groupysls(checkedValues)
}
@ -2364,7 +2321,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.order_type);
}
};
//搜索学生按钮输入 老师
@ -2381,7 +2338,7 @@ class Studentshavecompletedthelist extends Component {
})
}
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit);
this.Searchdatasys(this.state.order, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, value, 1, this.state.limit, this.state.order_type);
// this.Startsorting(this.state.order,this.state.checkedValuesine,this.state.checkedValuesineinfo,value);
// console.log(value)
@ -2416,60 +2373,175 @@ class Studentshavecompletedthelist extends Component {
};
//排序
funordersy = (e) => {
console.log(this.state.course_groupyslstwo);
debugger
if (e === "end_at") {
// 时间
// 时间排序是从小到大
if (this.state.loadingstate === false) {
this.setState({
order: "end_at",
loadingstate: true,
})
} else {
this.setState({
order: "end_at",
})
//老师试卷table 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
//"ascend" 升序
//"descend" 降序
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
try {
//时间排序
if (sorter.columnKey === "updatetime") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "end_at",
loadingstate: true,
order_type: "asc"
})
this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "end_at",
loadingstate: true,
order_type: "desc"
})
this.Searchdatasys("end_at", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit);
}
try {
//学生学号排序
if (sorter.columnKey === "stduynumber") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "student_id",
loadingstate: true,
order_type: "asc"
})
this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "student_id",
loadingstate: true,
order_type: "desc"
})
this.Searchdatasys("student_id", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
if (e === "score") {
// 成绩
//成绩排序是从大到小
if (this.state.loadingstate === false) {
this.setState({
order: "score",
loadingstate: true,
})
} else {
this.setState({
order: "score",
})
}
}
} catch (e) {
}
try {
//成绩排序排序
if (sorter.columnKey === "efficiencyscore") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "score",
loadingstate: true,
order_type: "asc"
})
this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "score",
loadingstate: true,
order_type: "desc"
})
this.Searchdatasys("score", this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit);
}
}
//学生问卷table 列表塞选数据
table1handleChangestuden = (pagination, filters, sorter) => {
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
try {
//时间排序
if (sorter.columnKey === "updatetime") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "end_at",
loadingstate: true,
order_type: "asc"
})
this.Searchdata("end_at", null, null, null, null, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "end_at",
loadingstate: true,
order_type: "desc"
})
this.Searchdata("end_at", null, null, null, null, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
try {
//学生学号排序
if (sorter.columnKey === "stduynumber") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "student_id",
loadingstate: true,
order_type: "asc"
})
this.Searchdata("student_id", null, null, null, null, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "student_id",
loadingstate: true,
order_type: "desc"
})
this.Searchdata("student_id", null, null, null, null, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
if (e === "student_id") {
//学号
//学号排序是从大到小
if (this.state.loadingstate === false) {
this.setState({
order: "student_id",
loadingstate: true,
})
} else {
this.setState({
order: "student_id",
})
}
this.Searchdatasys(e, this.state.course_groupyslstwo, this.state.review, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page,this.state.limit);
try {
//成绩排序排序
if (sorter.columnKey === "efficiencyscore") {
if (sorter.order === "ascend") {
//升序
this.setState({
order: "score",
loadingstate: true,
order_type: "asc"
})
this.Searchdata("score", null, null, null, null, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order: "score",
loadingstate: true,
order_type: "desc"
})
this.Searchdata("score", null, null, null, null, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
}
}
setExerciseReviewAndAnswer = () => {
@ -2635,23 +2707,6 @@ class Studentshavecompletedthelist extends Component {
style={{color: '#FF6800'}}>{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.total_users}</span><span
className="color-orange-tip"></span>个检索结果（{Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_all_users}学生） </span>
<div className="fr color-grey-6 edu-menu-panel">
<ul>
<li className="edu-position edu-position-hidebox">
<a className="font-12">
{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12"></i>
<ul className="edu-position-hide undis mt10">
<li><a onClick={(e) => this.funordersy("end_at")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>提交时间</a></li>
<li><a onClick={(e) => this.funordersy("score")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>最终成绩</a></li>
<li><a onClick={(e) => this.funordersy("student_id")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>学生学号</a></li>
</ul>
</li>
</ul>
</div>
</div>
</div>
@ -2676,6 +2731,7 @@ class Studentshavecompletedthelist extends Component {
columns={columnsys}
className="mysjysltable1"
pagination={false}
onChange={this.table1handleChange}
loading={loadingstate}
// onChange={this.TablePaginationsy}
/>}
@ -2882,26 +2938,8 @@ class Studentshavecompletedthelist extends Component {
<span
style={{color: '#FF6800'}}> {Teacherliststudentlist === undefined ? "0" : Teacherliststudentlist.exercise_types.exercise_end_time}</span>}
</span>
<div className="fr color-grey-6 edu-menu-panel">
<ul>
<li className="edu-position edu-position-hidebox">
<a className="font-12 ">
{order === "end_at" ? "时间" : order === "score" ? "成绩" : order === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
<ul className="edu-position-hide undis mt10">
<li><a onClick={(e) => this.funorder("end_at")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>提交时间</a>
</li>
<li><a onClick={(e) => this.funorder("score")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>最终成绩</a>
</li>
<li><a onClick={(e) => this.funorder("student_id")} data-remote="true"
className=" font-12" style={{textAlign: "center "}}>学生学号</a>
</li>
</ul>
</li>
</ul>
</div>
</div>
</div>
@ -2936,6 +2974,7 @@ class Studentshavecompletedthelist extends Component {
columns={columns}
pagination={false}
className="mysjysltable4"
onChange={this.table1handleChangestuden}
loading={loadingstate}
/>}</div>
</div>

2
public/react/src/modules/courses/graduation/tasks/GraduationTaskDetail.js
Unescape View File

@ -515,7 +515,7 @@ class GraduationTaskDetail extends Component{
</div>
</div>
<Switch {...this.props}>
{/*//毕设任务列表*/}
<Route exact path="/courses/:coursesId/graduation_tasks/:category_id/detail/:task_Id/list"
render={
(props) => (<GraduationTaskslist {...this.props} {...props} {...this.state} {...commom} triggerRef={this.bindRef} setend_time={(time)=>this.setend_time(time)} tab={`list`}/>)

150
public/react/src/modules/courses/graduation/tasks/GraduationTaskssettinglist.js
Unescape View File

@ -19,7 +19,7 @@ const Search = Input.Search;
const qs = require('qs');
//毕设任务列表
class GraduationTaskssettinglist extends Component{
constructor(props){
@ -160,12 +160,68 @@ class GraduationTaskssettinglist extends Component{
})
}
TablePagination=(e)=>{
TablePagination = (pagination, filters, sorter) => {
// console.log(e.current);
// this.setState({
// page:e.current
// })
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
//stduynumber 学号
try {
//学生学号排序
if (sorter.columnKey === "stduynumber") {
let orderlumn = "";
if (sorter.order === "ascend") {
//升序
orderlumn = "asc";
} else if (sorter.order === "descend") {
//降序
orderlumn = "desc";
}
this.funorder("student_id", orderlumn)
}
} catch (e) {
this.setState({
page:e.current
})
}
//turnovertime 时间
try {
//学生学号排序
if (sorter.columnKey === "turnovertime") {
let orderlumn = "";
if (sorter.order === "ascend") {
//升序
orderlumn = "asc";
} else if (sorter.order === "descend") {
//降序
orderlumn = "desc";
}
this.funorder("update_time", orderlumn);
}
} catch (e) {
}
//finalscore 成绩
try {
//学生学号排序
if (sorter.columnKey === "finalscore") {
let orderlumn = "";
if (sorter.order === "ascend") {
//升序
orderlumn = "asc";
} else if (sorter.order === "descend") {
//降序
orderlumn = "desc";
}
this.funorder("work_score", orderlumn);
}
} catch (e) {
}
}
}
funteachercomment=(list,key)=> {
@ -234,47 +290,14 @@ class GraduationTaskssettinglist extends Component{
}
funorder=(value)=>{
funorder = (value, newb_order) => {
let {teacher_comment, task_status, course_group, cross_comment, b_order, search,order} = this.state;
let newb_order;
if(order===value){
if(b_order==="desc"){
this.setState({
order:value,
b_order:"asc"
})
newb_order="asc";
}else{
this.setState({
order:value,
b_order:"desc"
})
newb_order="desc";
}
}else{
if(b_order==="desc"){
this.setState({
order:value,
b_order:"desc"
})
newb_order="desc";
}else{
this.setState({
order:value,
b_order:"asc"
})
newb_order="asc";
}
}
this.setState({
loadingstate:true
})
this.setState({
order: value,
b_order: newb_order,
loadingstate: true
})
this.seacthdata(teacher_comment, task_status, course_group, cross_comment, value, newb_order, search,this.state.page);
}
@ -747,6 +770,7 @@ class GraduationTaskssettinglist extends Component{
dataIndex: 'stduynumber',
key: 'stduynumber',
className:'edu-txt-center',
sorter: true,
render: (text, record) => (
<span>
<div style={{color:'#9A9A9A'}} className={"studentnumber"} title={record.stduynumber}>{record.stduynumber}</div>
@ -798,6 +822,7 @@ class GraduationTaskssettinglist extends Component{
dataIndex: 'turnovertime',
key: 'turnovertime',
className:'edu-txt-center',
sorter: true,
render: (text, record) => (
<span>
<a style={{color:'#989898'}}>
@ -839,6 +864,7 @@ class GraduationTaskssettinglist extends Component{
key: 'finalscore',
dataIndex: 'finalscore',
className:'edu-txt-center',
sorter: true,
render: (text, record) => (
<span>
<Tooltip placement="right" title={record.finalscore.work_score==="--"?"未评阅": <pre>
@ -1220,20 +1246,7 @@ class GraduationTaskssettinglist extends Component{
{this.props.isAdmin()===true?<span className="fl color-grey-6 font-12">
<span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>
个检索结果（{taskslistdata&&taskslistdata.all_work_count} 学生）</span>:""}
{this.props.isAdmin()===true?<div className="fr color-grey-6 edu-menu-panel">
<p>
<a data-remote="true" class="color-grey-6 font-12">
{order==="update_time"?"更新时间":order==="work_score"?"最终成绩":order==="student_id"?"学生学号":""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list edu-menu-lists" style={{width: '87px'}}>
<li onClick={(e)=>this.funorder("update_time")}><a data-remote="true">更新时间</a>
</li>
<li onClick={(e)=>this.funorder("work_score" )}><a data-remote="true">最终成绩</a>
</li>
<li onClick={(e)=>this.funorder("student_id" )}><a data-remote="true">学生学号</a>
</li>
</ul>
</div>:""}
</div>
{this.props.isStudent()===true?
@ -1409,27 +1422,6 @@ class GraduationTaskssettinglist extends Component{
<div id="graduation_work_list" style={{ padding: '18px 40px 10px',height: '56px'}}>
{this.props.isAdmin()===true?
<div className="clearfix">
<span className="fl color-grey-6 font-12">
<span className="color-orange-tip">{taskslistdata&&taskslistdata.work_count}</span>
个检索结果（{taskslistdata&&taskslistdata.work_count} 学生）
</span>
<div className="fr color-grey-6 edu-menu-panel">
<p><a data-remote="true">
{order==="update_time"?"时间":order==="work_score"?"成绩":order==="student_id"?"学号":""}排序</a><i
className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i></p>
<ul className="edu-menu-list">
<li onClick={(e)=>this.funorder("update_time")} className={order==="update_time"?"none":""}><a data-remote="true">时间</a>
</li>
<li onClick={(e)=>this.funorder("work_score" )} className={order==="work_score"?"none":""}><a data-remote="true">成绩</a>
</li>
<li onClick={(e)=>this.funorder("student_id" )} className={order==="student_id"?"none":""}><a data-remote="true">学号</a>
</li>
</ul>
</div>
</div>
:""}
{this.props.isStudent()===true?
<div className="clearfix">
<span className="mr15 color-grey9">

122
public/react/src/modules/courses/poll/PollDetailTabFirst.js
Unescape View File

@ -49,7 +49,8 @@ class PollDetailTabFirst extends Component{
poll_types:undefined,
course_groups:undefined,
options_Class:[],
poll_end_at:""
poll_end_at: "",
order_type: "desc"
}
}
// 搜索框搜索
@ -59,12 +60,12 @@ class PollDetailTabFirst extends Component{
})
}
searchInfo=()=>{
let{order,search,commit_status,poll_group_id,page}=this.state
this.getTableList(order,search,commit_status,poll_group_id,page);
let {order, search, commit_status, poll_group_id, page, order_type} = this.state
this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
}
// 获取接口数据
getTableList=(order,search,commit_status,poll_group_id,page)=>{
getTableList = (order, search, commit_status, poll_group_id, page, order_type) => {
let pollId=this.props.match.params.pollId;
let courseid=this.props.match.params.coursesId;
let url=`/polls/${pollId}/poll_lists.json`;
@ -76,7 +77,8 @@ class PollDetailTabFirst extends Component{
search:search,
commit_status:commit_status,
poll_group_id:poll_group_id,
page:page
page: page,
order_type: order_type
}
}).then((result)=>{
if(result){
@ -128,8 +130,8 @@ class PollDetailTabFirst extends Component{
}
componentDidMount(){
let {order,search,commit_status,poll_group_id,page}=this.state;
this.getTableList(order,search,commit_status,poll_group_id,page);
let {order, search, commit_status, poll_group_id, page, order_type} = this.state;
this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
}
// 翻页
@ -137,17 +139,17 @@ class PollDetailTabFirst extends Component{
this.setState({
page:pageNumber
})
let {order,search,commit_status,poll_group_id}=this.state;
this.getTableList(order,search,commit_status,poll_group_id,pageNumber);
let {order, search, commit_status, poll_group_id, order_type} = this.state;
this.getTableList(order, search, commit_status, poll_group_id, pageNumber, order_type);
}
//排序
changeOrder=(order)=>{
changeOrder = (order, order_type) => {
this.setState({
order:order
})
let {search,commit_status,poll_group_id,page}=this.state;
this.getTableList(order,search,commit_status,poll_group_id,page);
this.getTableList(order, search, commit_status, poll_group_id, page, order_type);
}
//选择分班情况
classOptionsChange = (values,all) => {
@ -155,8 +157,8 @@ class PollDetailTabFirst extends Component{
this.setState({
poll_group_id:status
})
let {order,search,commit_status,page}=this.state;
this.getTableList(order,search,commit_status,status,page);
let {order, search, commit_status, page, order_type} = this.state;
this.getTableList(order, search, commit_status, status, page, order_type);
}
//选择提交状态
statusOptionChange=(values,all)=>{
@ -164,10 +166,69 @@ class PollDetailTabFirst extends Component{
this.setState({
commit_status:status
})
let {order,search,poll_group_id,page}=this.state;
this.getTableList(order,search,status,poll_group_id,page);
}
let {order, search, poll_group_id, page, order_type} = this.state;
this.getTableList(order, search, status, poll_group_id, page, order_type);
}
//问卷table 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
//"ascend" 升序
//"descend" 降序
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
try {
//学生学号排序
if (sorter.columnKey === "StudentNo") {
if (sorter.order === "ascend") {
//升序
this.setState({
order_type: "asc",
order: "student_id",
loadingstate: true,
});
this.changeOrder("student_id", "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order_type: "desc",
order: "student_id",
loadingstate: true,
})
this.changeOrder("student_id", "desc");
}
}
} catch (e) {
}
try {
//提交时间排序
if (sorter.columnKey === "time") {
if (sorter.order === "ascend") {
//升序
this.setState({
order_type: "asc",
order: "end_at",
loadingstate: true,
})
this.changeOrder("end_at", "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
order_type: "desc",
order: "end_at",
loadingstate: true,
})
this.changeOrder("end_at", "desc");
}
}
} catch (e) {
}
}
}
render(){
let {order,search,data,page,limit,course_groups,poll_types,options_Class,dataInfo,poll_end_at}=this.state;
const isAdmin =this.props.isAdmin();
@ -197,6 +258,7 @@ class PollDetailTabFirst extends Component{
dataIndex: 'StudentNo',
key: 'StudentNo',
className:"edu-txt-center",
sorter: true,
render:(StudentNo,item,index)=>{
return(
item.StudentNo ? <span>{item.StudentNo}</span> : "--"
@ -230,6 +292,7 @@ class PollDetailTabFirst extends Component{
key: 'time',
className:"edu-txt-center",
width:160,
sorter: true,
render:(time,item,index)=>{
return(
item.time == null ? <span className="color-grey-9">--</span> : moment(item.time).format('YYYY-MM-DD HH:mm')
@ -316,22 +379,23 @@ class PollDetailTabFirst extends Component{
</span>
:""
}
{
isAdmin &&
<div className="fr">
<li className="drop_down">
<span className="color-grey-9 font-12">{order=="end_at"?"提交时间":"学生学号"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>
<ul className="drop_down_normal">
<li onClick={()=>this.changeOrder("end_at")}>提交时间</li>
<li onClick={()=>this.changeOrder("student_id")}>学生学号</li>
</ul>
</li>
</div>
}
{/*{*/}
{/* isAdmin && */}
{/* <div className="fr">*/}
{/* <li className="drop_down">*/}
{/* <span className="color-grey-9 font-12">{order=="end_at"?"提交时间":"学生学号"}</span><i className="iconfont icon-xiajiantou font-12 ml2 color-grey-6"></i>*/}
{/* <ul className="drop_down_normal">*/}
{/* <li onClick={()=>this.changeOrder("end_at")}>提交时间</li>*/}
{/* <li onClick={()=>this.changeOrder("student_id")}>学生学号</li>*/}
{/* </ul>*/}
{/* </li>*/}
{/* </div>*/}
{/*}*/}
</div>}
<div className="edu-table edu-back-white minH-560">
{
data && data.length>0 ?<Table columns={columns} dataSource={data} pagination={false}></Table> :<NoneData></NoneData>
data && data.length > 0 ? <Table columns={columns} dataSource={data} pagination={false}
onChange={this.table1handleChange}></Table> : <NoneData></NoneData>
}
</div>
{

161
public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
Unescape View File

@ -818,6 +818,7 @@ class Listofworksstudentone extends Component {
},
],
b_order: "desc",
myorders: "desc",
allow_late: false,
checkedValuesine: undefined,
checkedValuesineinfo: [],
@ -872,6 +873,7 @@ class Listofworksstudentone extends Component {
key: 'stduynumber',
align: "center",
className: 'font-14 maxnamewidth110',
sorter: true,
render: (text, record) => (
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
@ -1091,6 +1093,7 @@ class Listofworksstudentone extends Component {
key: 'finalscore',
align: 'center',
className: 'font-14',
sorter: true,
render: (text, record) => (
<span>
{
@ -1204,6 +1207,7 @@ class Listofworksstudentone extends Component {
key: 'stduynumber',
align: "center",
className: 'font-14 maxnamewidth110',
sorter: true,
render: (text, record) => (
<span className="maxnamewidth110">
{record.stduynumber === undefined ?
@ -1416,6 +1420,7 @@ class Listofworksstudentone extends Component {
key: 'finalscore',
align: 'center',
className: 'font-14',
sorter: true,
render: (text, record) => (
<span>
{
@ -1530,6 +1535,7 @@ class Listofworksstudentone extends Component {
// }
//
// }
componentDidMount() {
// console.log("componentDidMount ");
// console.log("调用子组件 ");
@ -1548,6 +1554,68 @@ class Listofworksstudentone extends Component {
// this.Gettitleinformation(homeworkid);
this.Getalistofworks(homeworkid, false);
}
//实训作业tbale 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
//"ascend" 升序
//"descend" 降序
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
// console.log(sorter);
try {
//学生学号排序
if (sorter.columnKey === "stduynumber") {
if (sorter.order === "ascend") {
//升序
this.setState({
myorders: "asc",
orders: "student_id",
loadingstate: true,
});
this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
myorders: "desc",
orders: "student_id",
loadingstate: true,
})
this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
try {
//学生成绩排序
if (sorter.columnKey === "finalscore") {
if (sorter.order === "ascend") {
//升序
this.setState({
myorders: "asc",
orders: "work_score",
loadingstate: true,
})
this.Startsortingt("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "asc");
} else if (sorter.order === "descend") {
//降序
this.setState({
myorders: "desc",
orders: "work_score",
loadingstate: true,
})
this.Startsortingt("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, "desc");
}
}
} catch (e) {
}
}
}
/////////老师操作
// tearchar=()=>{
// var homeworkid = this.props.match.params.homeworkid;
@ -2275,7 +2343,7 @@ class Listofworksstudentone extends Component {
//开始排序操作
Startsortingt = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit) => {
Startsortingt = (ordervlue, checkedValuesine, checkedValuesineinfo, searchtext, page, limit, myorders) => {
//要提交的作品状态checkedValuesine
//要提交的分班状态checkedValuesineinfo
//searchtext 输入的姓名和学号
@ -2285,10 +2353,18 @@ class Listofworksstudentone extends Component {
var homeworkid = this.props.match.params.homeworkid;
let urll = `/homework_commons/${homeworkid}/works_list.json?`;
var order = "asc";
if (ordervlue === "update_time") {
order = "desc";
var order = this.state.order;
try {
if (myorders === null || myorders === undefined) {
} else {
order = myorders;
}
} catch (e) {
}
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
@ -2591,7 +2667,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
} else if (checkedValues.length === data.length) {
this.setState({
unlimited: 0,
@ -2599,7 +2675,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
} else {
// console.log(checkedValues);
this.setState({
@ -2608,7 +2684,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, checkedValues, this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
}
}
@ -2625,7 +2701,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
} else if (checkedValues.length === data.length) {
this.setState({
unlimitedtwo: 1,
@ -2634,7 +2710,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, this.state.checcourse_groupyslstwokedValuesine, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
} else {
this.setState({
checkedValuesineinfo: checkedValues,
@ -2643,7 +2719,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, checkedValues, this.state.searchtext, 1, this.state.limit, this.state.myorders);
}
@ -2676,7 +2752,7 @@ class Listofworksstudentone extends Component {
page: 1,
limit: 20,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, value, 1, 20, this.state.myorders);
// console.log(value)
@ -2692,43 +2768,10 @@ class Listofworksstudentone extends Component {
page: 1,
limit: 20,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, 20);
}
}
//排序
funordert = (e) => {
if (e === "update_time") {
// 时间
// 时间排序是从小到大
this.setState({
orders: "update_time",
loadingstate: true,
})
this.Startsortingt("update_time", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
}
if (e === "work_score") {
// 成绩
//成绩排序是从大到小
this.setState({
orders: "work_score",
loadingstate: true,
})
this.Startsortingt("work_score", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
}
if (e === "student_id") {
//学号
//学号排序是从大到小
this.setState({
orders: "student_id",
loadingstate: true,
})
this.Startsortingt("student_id", this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, 1, 20, this.state.myorders);
}
}
// 调分
// 查看学员实训信息
@ -2771,7 +2814,7 @@ class Listofworksstudentone extends Component {
.then((response) => {
if (response.data.status == '0') {
this.setState({visible: false});
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, this.state.page, this.state.limit, this.state.myorders);
this.props.showNotification(`调分成功`);
}
})
@ -2958,7 +3001,7 @@ class Listofworksstudentone extends Component {
loadingstate: true,
page: 1,
})
this.Startsortingt(this.state.orders, [], this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, [], this.state.checkedValuesineinfo, this.state.searchtext, 1, this.state.limit, this.state.myorders);
}
notlimitedst = () => {
@ -2969,7 +3012,7 @@ class Listofworksstudentone extends Component {
course_groupysls: undefined,
loadingstate: true,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, [], this.state.searchtext, 1, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, [], this.state.searchtext, 1, this.state.limit, this.state.myorders);
}
//立即截止确定按钮
coursetaskend = () => {
@ -3050,8 +3093,7 @@ class Listofworksstudentone extends Component {
page: pageNumber,
loadingstate: true,
})
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, this.state.limit);
this.Startsortingt(this.state.orders, this.state.course_groupyslstwo, this.state.checkedValuesineinfo, this.state.searchtext, pageNumber, this.state.limit, this.state.myorders);
}
setComputeTimet = () => {
@ -3454,24 +3496,6 @@ class Listofworksstudentone extends Component {
`
}
</style>
<div className="fr edu-menu-panel">
<ul>
<li className="edu-position edu-position-hidebox">
<a className="font-12">
{orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序</a>
<i className="iconfont icon-xiajiantou ml5 font-12 "></i>
<ul className="edu-position-hide undis mt10">
<li><a onClick={(e) => this.funordert("update_time")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>更新时间</a></li>
<li><a onClick={(e) => this.funordert("work_score")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>当前成绩</a></li>
<li><a onClick={(e) => this.funordert("student_id")} data-remote="true"
className=" font-12" style={{textAlign: "center"}}>学生学号</a></li>
</ul>
</li>
</ul>
</div>
</div>
@ -3514,6 +3538,7 @@ class Listofworksstudentone extends Component {
dataSource={datajs}
columns={columns}
pagination={false}
onChange={this.table1handleChange}
loading={loadingstate}
/>}
</div>

112
public/react/src/modules/courses/shixunHomework/ShixunStudentWork.js
Unescape View File

@ -43,7 +43,7 @@ const qs = require('qs');
//课堂作业设置
//作品列表(教师)
//代码查重
class ShixunStudentWork extends Component {
constructor(props) {
super(props);
@ -341,48 +341,15 @@ class ShixunStudentWork extends Component {
this.getcode_review_results(order,b_order,page,limit,group_infolist,search)
}
funorder=(value)=>{
funorder = (value, myyslorder) => {
let {order,b_order,page,limit,group_infolist,search} = this.state;
let newb_order;
if(order===value){
if(b_order==="desc"){
this.setState({
order:value,
b_order:"asc"
})
newb_order="asc";
}else{
this.setState({
order:value,
b_order:"desc"
})
newb_order="desc";
}
}else{
if(b_order==="desc"){
this.setState({
order:value,
b_order:"desc"
})
newb_order="desc";
}else{
this.setState({
order:value,
b_order:"asc"
})
newb_order="asc";
}
}
this.setState({
loadingstate:true,
order: value,
b_order: myyslorder
})
this.getcode_review_results(value,newb_order,page,limit,group_infolist,search)
this.getcode_review_results(value, myyslorder, page, limit, group_infolist, search)
}
groupgroup=(checkedValues)=>{
@ -668,7 +635,56 @@ class ShixunStudentWork extends Component {
DownloadType:false,
DownloadMessageval:undefined
})
};
//代码查重tbale 列表塞选数据
table1handleChange = (pagination, filters, sorter) => {
//"ascend" 升序
//"descend" 降序
if (JSON.stringify(sorter) === "{}") {
//没有选择
} else {
// console.log(sorter);
try {
//学生学号排序
if (sorter.columnKey === "stduynumber") {
var myyslorder = "";
if (sorter.order === "ascend") {
//升序
myyslorder = "asc";
} else if (sorter.order === "descend") {
//降序
myyslorder = "desc";
}
this.funorder("student_id", myyslorder);
}
} catch (e) {
}
try {
//相似度排序
if (sorter.columnKey === "classroom") {
var myyslorder = "";
if (sorter.order === "ascend") {
//升序
myyslorder = "asc";
} else if (sorter.order === "descend") {
//降序
myyslorder = "desc";
}
this.funorder("code_rate", myyslorder);
}
} catch (e) {
}
}
}
render() {
let {
data,
@ -708,6 +724,7 @@ class ShixunStudentWork extends Component {
title: '学号',
dataIndex: 'stduynumber',
key: 'stduynumber',
sorter: true,
render: (text, record) => (
<span>
<a style={{"color": '#9A9A9A', "text-align": "center"}}>{record.stduynumber}</a>
@ -718,6 +735,7 @@ class ShixunStudentWork extends Component {
title: '相似度',
key: 'classroom',
dataIndex: 'classroom',
sorter: true,
render: (text, record) => (
<span>
<a style={{"color": record.classroom>=90?'#FF6800':"#747A7F", "text-align": "center"}}>{isNaN(record.classroom)?"--":record.classroom}%</a>
@ -929,24 +947,7 @@ class ShixunStudentWork extends Component {
{data&&data.copy_reviews_count}</span>
个疑似抄袭作品（{data&&data.all_reviews_count}作品） </span>
<div className="fr color-grey-6 edu-menu-panel" style={{color: '#989898'}}>
<p>
<a data-remote="true" className={"color-grey-9 font-12"}>
{order === "code_rate" ? "相似度" : order === "student_id" ? "学号" : ""}
</a>
<i className="iconfont icon-xiajiantou ml5 font-12 color-grey-6"></i>
</p>
<ul className="edu-menu-list" style={{"width": "80px"}}>
<li onClick={(e) => this.funorder("code_rate")}>
<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>相似度</a>
</li>
<li onClick={(e) => this.funorder("student_id")}>
<a className={"color-grey-9 font-12"} style={{"text-align": "center "}}>学号</a>
</li>
</ul>
</div>
</div>
@ -968,6 +969,7 @@ class ShixunStudentWork extends Component {
</div>:<Table
dataSource={datalist}
columns={columns}
onChange={this.table1handleChange}
pagination={false}
/>}

74
public/react/src/modules/courses/shixunHomework/Trainingjobsetting.js
Unescape View File

@ -127,6 +127,7 @@ class Trainingjobsetting extends Component {
end_timebool:false,
late_timesbool:false,
work_efficiencys:false,
task_pass: false, //是否允许跳关
}
// console.log("获取到的值")
// console.log("Trainingjobsetting")
@ -272,6 +273,7 @@ class Trainingjobsetting extends Component {
publish_timebool:publish_timebools,
end_timebool:end_timebools,
late_timesbool:late_timess,
task_pass: result.data.task_pass,
rules:array,
rulest:arrays,
rulesdata:rulesdatas,
@ -701,33 +703,51 @@ class Trainingjobsetting extends Component {
// console.log(e.target.checked);
}
//数据表创建
//是否跳关设置
onChangedatasheet = (e, index) => {
var challenge_settings = this.state.challenge_settings;
var bool= false;
for (var i = 0; i < challenge_settings.length; i++) {
if (i === index) {
if (challenge_settings[i].checked === true) {
challenge_settings[i].checked = false
bool=false;
} else {
challenge_settings[i].checked = true
bool=true;
}
}
}
for (var i = 0; i < challenge_settings.length; i++) {
if(bool=== true){
if (i < index) {
challenge_settings[i].checked = true
}
}else{
if (i > index) {
challenge_settings[i].checked = false
}
}
let {task_pass} = this.state;
if (task_pass === true) {
// 可以跳关
for (var i = 0; i < challenge_settings.length; i++) {
if (i === index) {
if (challenge_settings[i].checked === true) {
challenge_settings[i].checked = false
} else {
challenge_settings[i].checked = true
}
}
}
} else {
//不能跳关
var bool= false;
//先判断如果是点击的关口 checked 根据点击进行切换
for (var i = 0; i < challenge_settings.length; i++) {
if (i === index) {
if (challenge_settings[i].checked === true) {
challenge_settings[i].checked = false
bool=false;
} else {
challenge_settings[i].checked = true
bool=true;
}
}
}
//小于被选中的checked 都被选中 如果是大于被选中的checked 就全部隐藏掉
for (var i = 0; i < challenge_settings.length; i++) {
if(bool=== true){
if (i < index) {
challenge_settings[i].checked = true
}
}else{
if (i > index) {
challenge_settings[i].checked = false
}
}
}
}
}
// console.log(e.target.checked)
// console.log(index)
this.setState({
@ -2085,7 +2105,7 @@ class Trainingjobsetting extends Component {
const dataformat = 'YYYY-MM-DD HH:mm';
let {flagPageEdit,testscripttiptype,publish_timebool,end_timebool,late_timesbool,work_efficiencys,flagPageEdits,flagPageEditstwo,flagPageEditsbox,whethertopay,handclass,flagPageEditsthrees, flagPageEditsfor,rules,rulest,unifiedsetting,group_settings, course_group,unit_e_tip, borreds,borredss,unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles} = this.state;
let {flagPageEdit, testscripttiptype, publish_timebool, end_timebool, late_timesbool, work_efficiencys, flagPageEdits, flagPageEditstwo, flagPageEditsbox, whethertopay, handclass, flagPageEditsthrees, flagPageEditsfor, rules, rulest, unifiedsetting, group_settings, course_group, unit_e_tip, borreds, borredss, unit_p_tip, end_time, late_time, score_open, publish_time, starttimetype, modalsType, modalsTopval, loadtype, modalSave, endtimetype, latetimetype, allowlate, latepenaltytype, jobsettingsdata, endOpen, mystyle, mystyles, task_pass} = this.state;
// console.log(publish_timebool);
// console.log(!flagPageEditstwo);
const radioStyle = {
@ -2511,7 +2531,8 @@ class Trainingjobsetting extends Component {
</span>
</div>
<p className="ml20 mt15 c_grey font-13 " style={{color:"#666666"}}> 关卡名称<span
className="color-grey-c font-14 ml10">(需要学生完成的任务请选中,暂不支持跳关选择)</span></p>
className="color-orange-tip font-14 ml10">{task_pass === false ? "(请选中需要学生完成的关卡，该实训不支持跳关学习)" : "(请选中需要学生完成的关卡，该实训支持跳关学习)"}</span>
</p>
<div className="ml40 mt15" >
{this.state.challenge_settings === undefined ? "" : this.state.challenge_settings.map((object, index) => {
return (
@ -2528,6 +2549,7 @@ class Trainingjobsetting extends Component {
value={object.challenge_score}
/>
<span className="ml10" style={{color:"#999999"}}>分</span>
<span className="ml40">{object.difficulty}</span>
</li>
)
})}

Write Preview
Loading…
Cancel
Save