From f1d262847ff1692a416453190e7ea93338b704d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 22:00:36 +0800
Subject: [PATCH 1/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/signin/student/Signedinlist.js | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/public/react/src/modules/courses/signin/student/Signedinlist.js b/public/react/src/modules/courses/signin/student/Signedinlist.js
index 16e4c3865..5885e8a67 100644
--- a/public/react/src/modules/courses/signin/student/Signedinlist.js
+++ b/public/react/src/modules/courses/signin/student/Signedinlist.js
@@ -14,7 +14,7 @@ class Signedinlist extends Component {
limit:5,
page:1,
loading:false,
- attendanceslist:[{id:undefined,name:"全部分班"}],
+ attendanceslist:[],
data:null,
group_ids:[],
members_count:0,
@@ -42,9 +42,9 @@ class Signedinlist extends Component {
componentDidUpdate(prevProps, prevState) {
if(prevProps.headdata!=this.props.headdata){
- let {attendanceslist}=this.state;
if(this.props.headdata){
- let listattendanceslist=attendanceslist;
+ let listattendanceslist=[];
+ listattendanceslist.push({id:undefined,name:"全部分班"})
if(this.props.headdata.course_groups){
if(this.props.headdata.course_groups.length>0){
@@ -54,7 +54,7 @@ class Signedinlist extends Component {
}
}
this.setState({
- listattendanceslist:listattendanceslist,
+ attendanceslist:listattendanceslist,
data:this.props.headdata,
course_members_count:this.props.headdata.normal_count,
attendance_count:this.props.headdata.all_count
@@ -126,7 +126,7 @@ class Signedinlist extends Component {
let url=`/weapps/attendances/${this.props&&this.props.switattendance_id}.json`;
axios.get(url).then((response) => {
if(response.data){
-
+ listattendanceslist.push({id:undefined,name:"全部分班"})
if(response.data.course_groups.length>0){
response.data.course_groups.map((item,key)=>{
listattendanceslist.push(item)
@@ -149,7 +149,7 @@ class Signedinlist extends Component {
})
}
this.setState({
- listattendanceslist:listattendanceslist,
+ attendanceslist:listattendanceslist,
data:response.data
})
From 47ea9d4c3164663f0baf1fb4d403b9f894f1c6cc 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, 14 Mar 2020 22:05:01 +0800
Subject: [PATCH 2/5] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/signin/component/Detailss.js | 21 +++++++------------
1 file changed, 7 insertions(+), 14 deletions(-)
diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index 73aefaa00..0ef4fbea5 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -140,6 +140,13 @@ class Detailss extends Component {
<p className="h40s font-16" style={{
color: "#909399"
}}>签到码：</p>
+ <div style={{
+ overflow: 'hidden',
+ height: "1px",
+ width: "1px"
+ }}>
+ <input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
+ </div>
</div>
:
item && item.mode === "QRCODE" ?
@@ -174,20 +181,6 @@ class Detailss extends Component {
</div>
</div>
- {
- defaultActiveKey === "1" ?
- item && item.mode === "NUMBER" ?
- <div style={{
- overflow: 'hidden',
- height: "1px",
- width: "1px"
- }}>
- <input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
- </div>
- :""
- :
- ""
- }
</div>
</React.Fragment>
From 1c3b0473a9064b78329a03e76102d3844ba903e6 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, 14 Mar 2020 22:09:51 +0800
Subject: [PATCH 3/5] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/courses/signin/component/Detailss.js | 14 ++++++++++++++
1 file changed, 14 insertions(+)
diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index 0ef4fbea5..c53bba4ff 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -181,6 +181,20 @@ class Detailss extends Component {
</div>
</div>
+ {
+ defaultActiveKey === "1" ?
+ item && item.mode === "NUMBER" ?
+ <div style={{
+ overflow: 'hidden',
+ height: "1px",
+ width: "1px"
+ }}>
+ <input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
+ </div>
+ :""
+ :
+ ""
+ }
</div>
</React.Fragment>
From b8e9816b2f700448877c15967e026bbc8abf921e 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, 14 Mar 2020 22:13:37 +0800
Subject: [PATCH 4/5] =?UTF-8?q?=E7=AD=BE=E5=88=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../courses/signin/component/Detailss.js | 20 +++++--------------
1 file changed, 5 insertions(+), 15 deletions(-)
diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js
index c53bba4ff..f109db317 100644
--- a/public/react/src/modules/courses/signin/component/Detailss.js
+++ b/public/react/src/modules/courses/signin/component/Detailss.js
@@ -120,6 +120,7 @@ class Detailss extends Component {
defaultActiveKey === "1" ?
<div className="ws25s" style={{
position: "relative",
+ overflow: 'hidden',
}}>
{
item && item.mode === "NUMBER" ?
@@ -143,7 +144,9 @@ class Detailss extends Component {
<div style={{
overflow: 'hidden',
height: "1px",
- width: "1px"
+ width: "1px",
+ position: "absolute",
+ right: "-200px",
}}>
<input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
</div>
@@ -181,20 +184,7 @@ class Detailss extends Component {
</div>
</div>
- {
- defaultActiveKey === "1" ?
- item && item.mode === "NUMBER" ?
- <div style={{
- overflow: 'hidden',
- height: "1px",
- width: "1px"
- }}>
- <input id={"file_path" + 1} className="file_path_input" value={item&&item.code}/>
- </div>
- :""
- :
- ""
- }
+
</div>
</React.Fragment>
From f8cf7228a72f04bf8afaac41b65697a15157dd07 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Sat, 14 Mar 2020 22:33:24 +0800
Subject: [PATCH 5/5] =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../react/src/modules/courses/signin/css/Signinstatistics.css | 1 +
.../src/modules/courses/signin/teacher/Teachers_signin.js | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
index 060793bc6..388f0ad28 100644
--- a/public/react/src/modules/courses/signin/css/Signinstatistics.css
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -103,6 +103,7 @@
text-align: right;
margin-right: 20px;
line-height: 32px;
+ height: 32px;
}
#form_in_modal_group_ids .ant-select-selection{
diff --git a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
index ae2507887..bce0a4237 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -353,10 +353,10 @@ class Students_signin extends Component{
{
isAdmin===true?
<TabPane tab="签到统计" key="3">
- <Signinstatistics
+ {defaultActiveKey&&defaultActiveKey==="3"?<Signinstatistics
{...this.props}
{...this.state}
- />
+ />:""}
</TabPane>
:
""