From 0c1b0e6c55ec65b8e42898d47a5fb4a2e4117862 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Sep 2019 16:04:15 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shixunHomework/Listofworksstudentone.js | 102 +++++++++---------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 4c2d099b4..ef78db6b8 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -67,7 +67,7 @@ class Listofworksstudentone extends Component {
pages: 1,
limit: 20,
loadingstate: true,
- order: "update_time",
+ order: "work_score",
search: null,
day: 0,
hour: 0,
@@ -256,21 +256,21 @@ class Listofworksstudentone extends Component {
)
},
- {
- title: '更新时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: "center",
- className:'font-14',
- render: (text, record) => (
-
- {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
-
- ),
- },
+ // {
+ // title: '更新时间',
+ // dataIndex: 'updatetime',
+ // key: 'updatetime',
+ // align: "center",
+ // className:'font-14',
+ // render: (text, record) => (
+ //
+ // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
+ //
+ // ),
+ // },
{
title: '完成情况',
dataIndex: 'completion',
@@ -379,7 +379,7 @@ class Listofworksstudentone extends Component {
},
],
- orders: "update_time",
+ orders: "work_score",
b_order:"desc",
allow_late:false,
checkedValuesine: undefined,
@@ -519,16 +519,16 @@ class Listofworksstudentone extends Component {
)
},
- {
- title: '更新时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className:'font-14',
- render: (text, record) => (
- {record.updatetime}
- ),
- },
+ // {
+ // title: '更新时间',
+ // dataIndex: 'updatetime',
+ // key: 'updatetime',
+ // align: 'center',
+ // className:'font-14',
+ // render: (text, record) => (
+ // {record.updatetime}
+ // ),
+ // },
{
title: '完成情况',
dataIndex: 'completion',
@@ -796,16 +796,16 @@ class Listofworksstudentone extends Component {
)
},
- {
- title: '更新时间',
- dataIndex: 'updatetime',
- key: 'updatetime',
- align: 'center',
- className:'font-14',
- render: (text, record) => (
- {record.updatetime}
- ),
- },
+ // {
+ // title: '更新时间',
+ // dataIndex: 'updatetime',
+ // key: 'updatetime',
+ // align: 'center',
+ // className:'font-14',
+ // render: (text, record) => (
+ // {record.updatetime}
+ // ),
+ // },
{
title: '实战耗时',
dataIndex: 'cost_time',
@@ -1656,9 +1656,9 @@ 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";
- }
+ // if (ordervlue === "update_time") {
+ // order = "desc";
+ // }
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
@@ -2065,15 +2065,15 @@ class Listofworksstudentone extends Component {
}
//排序
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 === "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") {
// 成绩
@@ -2762,10 +2762,10 @@ class Listofworksstudentone extends Component {
-
- {orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
+ {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
From 547f63ad851189c462b4e85cd5271fa88fbf356e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Fri, 6 Sep 2019 16:05:44 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../shixunHomework/Listofworksstudentone.js | 102 +++++++++---------
1 file changed, 51 insertions(+), 51 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index ef78db6b8..4c2d099b4 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -67,7 +67,7 @@ class Listofworksstudentone extends Component {
pages: 1,
limit: 20,
loadingstate: true,
- order: "work_score",
+ order: "update_time",
search: null,
day: 0,
hour: 0,
@@ -256,21 +256,21 @@ class Listofworksstudentone extends Component {
)
},
- // {
- // title: '更新时间',
- // dataIndex: 'updatetime',
- // key: 'updatetime',
- // align: "center",
- // className:'font-14',
- // render: (text, record) => (
- //
- // {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
- //
- // ),
- // },
+ {
+ title: '更新时间',
+ dataIndex: 'updatetime',
+ key: 'updatetime',
+ align: "center",
+ className:'font-14',
+ render: (text, record) => (
+
+ {record.updatetime === undefined ? "--" : record.updatetime === "" ? "--" : record.updatetime}
+
+ ),
+ },
{
title: '完成情况',
dataIndex: 'completion',
@@ -379,7 +379,7 @@ class Listofworksstudentone extends Component {
},
],
- orders: "work_score",
+ orders: "update_time",
b_order:"desc",
allow_late:false,
checkedValuesine: undefined,
@@ -519,16 +519,16 @@ class Listofworksstudentone extends Component {
)
},
- // {
- // title: '更新时间',
- // dataIndex: 'updatetime',
- // key: 'updatetime',
- // align: 'center',
- // className:'font-14',
- // render: (text, record) => (
- // {record.updatetime}
- // ),
- // },
+ {
+ title: '更新时间',
+ dataIndex: 'updatetime',
+ key: 'updatetime',
+ align: 'center',
+ className:'font-14',
+ render: (text, record) => (
+ {record.updatetime}
+ ),
+ },
{
title: '完成情况',
dataIndex: 'completion',
@@ -796,16 +796,16 @@ class Listofworksstudentone extends Component {
)
},
- // {
- // title: '更新时间',
- // dataIndex: 'updatetime',
- // key: 'updatetime',
- // align: 'center',
- // className:'font-14',
- // render: (text, record) => (
- // {record.updatetime}
- // ),
- // },
+ {
+ title: '更新时间',
+ dataIndex: 'updatetime',
+ key: 'updatetime',
+ align: 'center',
+ className:'font-14',
+ render: (text, record) => (
+ {record.updatetime}
+ ),
+ },
{
title: '实战耗时',
dataIndex: 'cost_time',
@@ -1656,9 +1656,9 @@ 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";
- // }
+ if (ordervlue === "update_time") {
+ order = "desc";
+ }
var checkedValuesines = checkedValuesine;
var checkedValuesineinfos = checkedValuesineinfo;
var searchtexts = searchtext
@@ -2065,15 +2065,15 @@ class Listofworksstudentone extends Component {
}
//排序
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 === "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") {
// 成绩
@@ -2762,10 +2762,10 @@ class Listofworksstudentone extends Component {