From cd478119f70c2d1d8af926313ee22eccf7e49d22 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 09:29:42 +0800
Subject: [PATCH 1/3] =?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 | 126 +++++++++---------
1 file changed, 66 insertions(+), 60 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index 4c2d099b4..b74316875 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: "",
search: null,
day: 0,
hour: 0,
@@ -246,31 +246,33 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
-
+ }
+ title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+ >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+
)
},
- {
- 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 +381,7 @@ class Listofworksstudentone extends Component {
},
],
- orders: "update_time",
+ orders: "",
b_order:"desc",
allow_late:false,
checkedValuesine: undefined,
@@ -509,26 +511,28 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
-
+ }
+ title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+ >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+
)
},
- {
- 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 +800,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',
@@ -813,13 +817,15 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
-
+ }
+ title={record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+ >{record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+
)
},
@@ -1656,9 +1662,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 +2071,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 +2768,10 @@ class Listofworksstudentone extends Component {
-
- {orders === "update_time" ? "时间" : orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
+ {orders === "work_score" ? "成绩" : orders === "student_id" ? "学号" : ""}排序
From 53204a9a352e67ef21cd7b5764f6a8eedf8a46b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 09:45:37 +0800
Subject: [PATCH 2/3] =?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 | 70 ++++++++++++++-----
.../modules/courses/shixunHomework/style.css | 4 +-
2 files changed, 53 insertions(+), 21 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index b74316875..c526dcc39 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -167,7 +167,6 @@ class Listofworksstudentone extends Component {
key: 'stduynumber',
align: "center",
className:'font-14 maxnamewidth110',
- width:'110px',
render: (text, record) => (
{record.stduynumber === undefined ?
@@ -246,15 +245,24 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-
+ }>
+ {record.cost_time === null? "--":record.cost_time === undefined?"--":
+ {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+
+ }
+
)
},
@@ -436,7 +444,6 @@ class Listofworksstudentone extends Component {
key: 'stduynumber',
align: "center",
className:'font-14 maxnamewidth110',
- width:'110px',
render: (text, record) => (
{record.stduynumber === undefined ?
@@ -511,15 +518,33 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
-
+ }>
+ {record.cost_time === null? "--":record.cost_time === undefined?"--":
+ {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+
+ }
+
+ // {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time }
+ //
)
},
@@ -732,7 +757,6 @@ class Listofworksstudentone extends Component {
key: 'stduynumber',
align: "center",
className:'font-14 maxnamewidth110',
- width:'110px',
render: (text, record) => (
{record.stduynumber === undefined ?
@@ -817,17 +841,25 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
-
+ }>
+ {record.cost_time === null ? "--":record.cost_time === undefined ?"--":
+ {record.cost_time === null ? "--":record.cost_time === undefined ?"--":record.cost_time}
+
+ }
+
)
-
},
{
title: '完成情况',
diff --git a/public/react/src/modules/courses/shixunHomework/style.css b/public/react/src/modules/courses/shixunHomework/style.css
index f2b0c39ed..c2affa32c 100644
--- a/public/react/src/modules/courses/shixunHomework/style.css
+++ b/public/react/src/modules/courses/shixunHomework/style.css
@@ -38,14 +38,14 @@
.TopicDetailTable .bottomBody li:last-child{border-bottom: none;}
.maxnamewidth100{
- max-width: 100px;
+ max-width: 145px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
cursor: default;
}
.maxnamewidth110{
- max-width: 110px;
+ max-width: 145px;
overflow:hidden;
text-overflow:ellipsis;
white-space:nowrap;
From 2ed5275b5c827011d16cfd18c8e6cf38524bb372 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=9E=97?= <904079904@qq.com>
Date: Sat, 7 Sep 2019 10:15:29 +0800
Subject: [PATCH 3/3] =?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 | 210 +++++++++---------
1 file changed, 105 insertions(+), 105 deletions(-)
diff --git a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
index c526dcc39..0554d3dbf 100644
--- a/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
+++ b/public/react/src/modules/courses/shixunHomework/Listofworksstudentone.js
@@ -131,30 +131,30 @@ class Listofworksstudentone extends Component {
{record.name === undefined ?
--
:
record.name === "" ?
--
:
record.name === null ?
--
:
record.name === "--" ?
--
:
{record.name}
}
@@ -172,19 +172,19 @@ class Listofworksstudentone extends Component {
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
:
@@ -193,7 +193,7 @@ class Listofworksstudentone extends Component {
className="maxnamewidth110"
style={{
"color": '#9A9A9A',
- "text-align": "center"
+ textAlign: "center"
}}>{
record.stduynumber
}
@@ -214,7 +214,7 @@ class Listofworksstudentone extends Component {
{record.classroom === undefined ? "--" : record.classroom === "" ? "--" : record.classroom === null ? "--" : record.classroom}
),
@@ -229,10 +229,10 @@ class Listofworksstudentone extends Component {
{record.submitstate === undefined ? "--" : record.submitstate === "" ? "--" : record.submitstate === null ? "--" : record.submitstate}
@@ -247,15 +247,15 @@ class Listofworksstudentone extends Component {
render: (text, record) => (
{record.cost_time === null? "--":record.cost_time === undefined?"--":
(
- {record.completion+"/"+this.state.challenges_count}
+ {record.completion+"/"+this.state.challenges_count}
),
},
@@ -302,14 +302,14 @@ class Listofworksstudentone extends Component {
render: (text, record) => (
= 90 ? {"color": '#DD1717', "text-align": "center"} : {
- "color": '#747A7F',
- "text-align": "center"
+ color: '#FF6800',
+ textAlign: "center"
+ } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+ color: '#747A7F',
+ textAlign: "center"
}}>{record.levelscore}
)
@@ -330,15 +330,15 @@ class Listofworksstudentone extends Component {
)
:
= 90 ? {
- "color": '#DD1717',
- "text-align": "center"
- } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}
+ color: '#DD1717',
+ textAlign: "center"
+ } : {color: '#747A7F', textAlign: "center"}}>{record.efficiencyscore}
}
@@ -354,15 +354,15 @@ class Listofworksstudentone extends Component {
{
record.levelscore && record.levelscore === "--"?
- {record.levelscore}
+ {record.levelscore}
:
=90 ? {
- "color": '#DD1717',
- "text-align": "center"
+ color: '#DD1717',
+ textAlign: "center"
} : parseInt(record.levelscore) <= 60?{
- "color": '#FF6800',
- "text-align": "center",
- }: {"color": '#747A7F', "text-align": "center"}}>{record.levelscore}
+ color: '#FF6800',
+ textAlign: "center",
+ }: {color: '#747A7F', textAlign: "center"}}>{record.levelscore}
}
@@ -405,8 +405,8 @@ class Listofworksstudentone extends Component {
course_group: null,
publish_immediately: undefined,
end_immediately: undefined,
- mystyle: {"display": "block", "color": '#07111B', "text-align": "center"},
- mystyles: {"display": "none", "color": '#07111B', "text-align": "center"},
+ mystyle: {"display": "block", "color": '#07111B', textAlign: "center"},
+ mystyles: {"display": "none", "color": '#07111B', textAlign: "center"},
mystyle1: {"display": "block"},
mystyles1: {"display": "none"},
unlimited: 0,
@@ -423,7 +423,7 @@ class Listofworksstudentone extends Component {
align: 'center',
className:'font-14',
render: (text, record) => (
- {record.number}
+ {record.number}
)
},
@@ -435,7 +435,7 @@ class Listofworksstudentone extends Component {
className:'font-14 maxnamewidth100',
width:'100px',
render: (text, record) => (
- {record.name}
+ {record.name}
)
},
{
@@ -448,20 +448,20 @@ class Listofworksstudentone extends Component {
{record.stduynumber === undefined ?
--
: record.stduynumber === null ?
--
: record.stduynumber === "" ?
--
:
@@ -469,8 +469,8 @@ class Listofworksstudentone extends Component {
title={record.stduynumber}
className="maxnamewidth110"
style={{
- "color": '#9A9A9A',
- "text-align": "center"
+ color: '#9A9A9A',
+ textAlign: "center"
}}>{
record.stduynumber
}
@@ -489,7 +489,7 @@ class Listofworksstudentone extends Component {
className:'font-14',
render: (text, record) => (
- {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}}
+ {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}}
)
},
@@ -501,11 +501,11 @@ class Listofworksstudentone extends Component {
className:'font-14',
render: (text, record) => (
{record.submitstate}
)
@@ -520,15 +520,15 @@ class Listofworksstudentone extends Component {
render: (text, record) => (
{record.cost_time === null? "--":record.cost_time === undefined?"--":
{
record.stduynumber
}
@@ -802,7 +802,7 @@ class Listofworksstudentone extends Component {
className:'font-14',
render: (text, record) => (
- {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}}
+ {record.classroom === undefined ? -- : record.classroom === "" ? --: record.classroom === null ? -- : {record.classroom}}
)
},
@@ -814,11 +814,11 @@ class Listofworksstudentone extends Component {
className:'font-14',
render: (text, record) => (
{record.submitstate}
)
@@ -843,15 +843,15 @@ class Listofworksstudentone extends Component {
render: (text, record) => (
{record.cost_time === null ? "--":record.cost_time === undefined ?"--":
已通过{record.completion}关,共{this.state.challenges_count}关
}>
- {record.completion+"/"+this.state.challenges_count}
+ {record.completion+"/"+this.state.challenges_count}
@@ -888,14 +888,14 @@ class Listofworksstudentone extends Component {
render: (text, record) => (
= 90 ? {"color": '#DD1717', "text-align": "center"} : {
- "color": '#747A7F',
- "text-align": "center"
+ color: '#FF6800',
+ textAlign: "center"
+ } : parseInt(record.levelscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+ color: '#747A7F',
+ textAlign: "center"
}}>{record.levelscore}
)
@@ -934,15 +934,15 @@ class Listofworksstudentone extends Component {
)
:
= 90 ? {
- "color": '#DD1717',
- "text-align": "center"
- } : {"color": '#747A7F', "text-align": "center"}}>{record.efficiencyscore}
+ color: '#DD1717',
+ textAlign: "center"
+ } : {color: '#747A7F',textAlign: "center"}}>{record.efficiencyscore}
}
@@ -966,19 +966,19 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"?
{record.finalscore}
:
= 90 ? {"color": '#DD1717', "text-align": "center"} : {
- "color": '#747A7F',
- "text-align": "center"
+ color: '#FF6800',
+ textAlign: "center"
+ } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+ color: '#747A7F',
+ textAlign: "center"
}}>{record.finalscore}
}
@@ -994,19 +994,19 @@ class Listofworksstudentone extends Component {
record.finalscore&&record.finalscore==="--"?
{record.finalscore}
:
= 90 ? {"color": '#DD1717', "text-align": "center"} : {
- "color": '#747A7F',
- "text-align": "center"
+ color: '#FF6800',
+ textAlign: "center"
+ } : parseInt(record.finalscore) >= 90 ? {color: '#DD1717', textAlign: "center"} : {
+ color: '#747A7F',
+ textAlign: "center"
}}>{record.finalscore}
}