diff --git a/public/react/src/modules/courses/signin/component/Detailss.js b/public/react/src/modules/courses/signin/component/Detailss.js new file mode 100644 index 000000000..471d88851 --- /dev/null +++ b/public/react/src/modules/courses/signin/component/Detailss.js @@ -0,0 +1,120 @@ +import React,{ Component } from "react"; +import '../css/signincdi.css'; +import { Progress } from 'antd'; +import axios from 'axios'; + +//条目 +class Detailss extends Component{ + //条目组件 + constructor(props){ + super(props); + + this.state={ + + } + } + + componentDidMount() { + + } + + componentDidUpdate = (prevProps) => { + + + } + + + + render(){ + const isAdmin =this.props.isAdmin(); + return( + +
+
+

+ 2020-03-10第五次签到 +

+ +
+
+ 签到人数： +
+
+ +
+
+ 已签到22 / 应签到55 +
+
+ + +
+
+ + +
+ 签到发起人： +
+
+ 胡一菲 +
+ +
+ 签到方式： +
+
+ 二维码签到 +
+ +
+ 开始结束时间： +
+
+ 2010-03-10 10:00-11:00 +
+
+ +
+ { + isAdmin===true? +
+
截止
+
删除
+
+ : + ( + this.props.defaultActiveKey==="1"? +
+ +
+ 签到 +
+
+ : +
+ {/*
*/} + {/* 正常签到*/} + {/*
*/} + + {/*
*/} + {/* 请假*/} + {/*
*/} + +
+ 旷课 +
+
+ ) + + } +
+ +
+
+
+ + + ) + } +} +export default Detailss; diff --git a/public/react/src/modules/courses/signin/component/Teacherentry.js b/public/react/src/modules/courses/signin/component/Teacherentry.js index 074845bc0..408e718d3 100644 --- a/public/react/src/modules/courses/signin/component/Teacherentry.js +++ b/public/react/src/modules/courses/signin/component/Teacherentry.js @@ -101,7 +101,7 @@ class Teacherentry extends Component { : item.edit_auth === true ?
-
编辑
+
this.props.qiandaoxiangq(true)}>编辑
this.props.thisdelete(item.id)}>删除
: diff --git a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js index e2f51d4e1..44675bb14 100644 --- a/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js +++ b/public/react/src/modules/courses/signin/component/teachercomponent/Teaccomponent.js @@ -140,6 +140,7 @@ class Teaccomponent extends Component{ mydatas.map((object, index) => { return ( this.props.qiandaoxiangq(b)} thisdelete={(id)=>this.thisdelete(id)} thisEnd={(id)=>this.thisEnd(id)} item={object} key={index} diff --git a/public/react/src/modules/courses/signin/css/signincdi.css b/public/react/src/modules/courses/signin/css/signincdi.css index 08ebe7f0a..e01aea699 100644 --- a/public/react/src/modules/courses/signin/css/signincdi.css +++ b/public/react/src/modules/courses/signin/css/signincdi.css @@ -147,11 +147,17 @@ } .posiivsicon{ - padding: 22px 0px !important; - font-size: 16px; + padding: 22px 0px !important; + font-size: 16px; + font-family: Microsoft YaHei; + font-weight: bold; + color: #1890ff; + } +.posiivsiconmyss{ + font-size: 14px; font-family: Microsoft YaHei; font-weight: bold; - color: #1890ff; + color: #999999; } .xiaoshou{ cursor:pointer !important; @@ -324,3 +330,10 @@ .color-reds{ color:rgba(245,108,108,1) !important; } + +.fh{ + font-size:16px; + font-family:Microsoft YaHei; + font-weight:400; + color:rgba(153,153,153,1); +} diff --git a/public/react/src/modules/courses/signin/mymain/Signinmain.js b/public/react/src/modules/courses/signin/mymain/Signinmain.js index 4b1d3052c..6912508ba 100644 --- a/public/react/src/modules/courses/signin/mymain/Signinmain.js +++ b/public/react/src/modules/courses/signin/mymain/Signinmain.js @@ -2,7 +2,7 @@ import React,{ Component } from "react"; import '../css/signincdi.css'; import { Tabs } from 'antd'; import Teachers_signin from '../teacher/Teachers_signin'; -import Students_signin from '../student/Students_signin'; +import Students_signin from '../student/Signindetails'; import axios from 'axios'; const { TabPane } = Tabs; diff --git a/public/react/src/modules/courses/signin/student/Signindetails.js b/public/react/src/modules/courses/signin/student/Signindetails.js new file mode 100644 index 000000000..32ad0bac3 --- /dev/null +++ b/public/react/src/modules/courses/signin/student/Signindetails.js @@ -0,0 +1,52 @@ +import React,{ Component } from "react"; +import '../css/signincdi.css'; +import Detailss from '../component/Detailss'; +//在线学习 +class Signindetails extends Component{ + constructor(props){ + super(props); + + this.state={ + + } + } + + componentDidMount() { + + } + + componentDidUpdate = (prevProps) => { + console.log("componentDidUpdate"); + + + } + + callback=(key)=> { + console.log(key); + } + + + + render(){ + return( + +
+
+

this.props.qiandaoxiangq(false)}> + +

返回

+

+ +
+ +
+ + ) + } +} +export default Signindetails; diff --git a/public/react/src/modules/courses/signin/student/Students_signin.js b/public/react/src/modules/courses/signin/student/Students_signin.js deleted file mode 100644 index 1a5c1082b..000000000 --- a/public/react/src/modules/courses/signin/student/Students_signin.js +++ /dev/null @@ -1,53 +0,0 @@ -import React,{ Component } from "react"; -import '../css/signincdi.css'; -import { Tabs } from 'antd'; -const { TabPane } = Tabs; -//在线学习 -class Teachers_signin extends Component{ - constructor(props){ - super(props); - - this.state={ - - } - } - - componentDidMount() { - - } - - componentDidUpdate = (prevProps) => { - console.log("componentDidUpdate"); - - - } - - callback=(key)=> { - console.log(key); - } - - - - render(){ - return( - -
-
-
- - - Content of Tab Pane 1 - - - Content of Tab Pane 2 - - -
- -
-
- - ) - } -} -export default Teachers_signin; 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 49e810be4..b978b8813 100644 --- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js +++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js @@ -1,11 +1,13 @@ import React,{ Component } from "react"; import '../css/signincdi.css'; import { Tabs,Pagination} from 'antd'; +import {queryString} from 'educoder'; import Teaccomponent from '../component/teachercomponent/Teaccomponent'; import Createsignmodel from '../model/Createsignmodel'; import Studentssignmodels from "../model/Studentssignmodel"; import Qrcodesignin from "../model/Qrcodesignin"; import Signinstatistics from "../Signinstatistics/Signinstatistics"; +import Signindetails from '../student/Signindetails'; import axios from 'axios'; const { TabPane } = Tabs; @@ -29,6 +31,8 @@ class Students_signin extends Component{ Studentssigntypedata:null, Qrcodesignintype:false, Qrcodesignintypedata:null, + switchs:false, + } } @@ -39,6 +43,11 @@ class Students_signin extends Component{ limit:5 } this.gogetdatas(data); + + // const query = this.props.location.search; + // const parsed = queryString.parse(query); + // console.log("parsed"); + // console.log(parsed); } componentDidUpdate = (prevProps) => { @@ -167,13 +176,24 @@ class Students_signin extends Component{ } + qiandaoxiangq=(bool)=>{ + this.setState({ + switchs:bool + }) + // if(bool){ + // var currenturl = window.location.href; + // var newUrl = (currenturl.split("?"))[0]; + // window.history.pushState('','',newUrl+'?type='+2); + // } + } + render(){ let {page,per_page,count,defaultActiveKey,limit,attendances_count,datas,absence_count,leave_count,normal_count, - Studentssigntype,Studentssigntypedata,Qrcodesignintype,Qrcodesignintypedata, + Studentssigntype,Studentssigntypedata,Qrcodesignintype,Qrcodesignintypedata,switchs } =this.state; const isAdmin =this.props.isAdmin(); @@ -205,92 +225,105 @@ class Students_signin extends Component{ getsetdatas={()=>this.getsetdatas()} GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)} /> + { + switchs===false? +
+
+ + +

共{attendances_count}个签到正在进行

+ this.qiandaoxiangq(b)} + Gotomodes={(d,b)=>this.Gotomodes(d,b)} + GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)} + getsetdatas={()=>this.getsetdatas()} + datas={datas} + defaultActiveKey={defaultActiveKey} + {...this.state} + {...this.props} -
-
- - -

共{attendances_count}个签到正在进行

- this.Gotomodes(d,b)} - GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)} - getsetdatas={()=>this.getsetdatas()} - datas={datas} - defaultActiveKey={defaultActiveKey} - {...this.state} - {...this.props} - - > - - - -
- -
- - -
-

已完成{attendances_count}次签到

- { - isAdmin===false? -
-

旷课：{absence_count}

-

请假：{leave_count}

-

正常签到：{normal_count}

+ > -
- : - "" - } -
- - - - this.Gotomodes(d,b)} - GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)} - getsetdatas={()=>this.getsetdatas()} - datas={datas} - defaultActiveKey={defaultActiveKey} - {...this.state} - {...this.props} - > - - -
- -
- - { - isAdmin===true? - - + +
+ + +
+

已完成{attendances_count}次签到

+ { + isAdmin===false? +
+

旷课：{absence_count}

+

请假：{leave_count}

+

正常签到：{normal_count}

+ +
+ : + "" + } +
+ + + + this.qiandaoxiangq(b)} + Gotomodes={(d,b)=>this.Gotomodes(d,b)} + GotomQrcodesodesy={(d,b)=>this.GotomQrcodesodesy(d,b)} + getsetdatas={()=>this.getsetdatas()} + datas={datas} + defaultActiveKey={defaultActiveKey} {...this.state} - /> + {...this.props} + > + + +
+ +
- : - "" - } - - - { - isAdmin? -
- -

this.Createsign()}>创建签到

-
- :"" - } -
- -
+ { + isAdmin===true? + + + + : + "" + } + + + { + isAdmin? +
+ +

this.Createsign()}>创建签到

+
+ :"" + } +
+ + + : + // 签到详情 + this.qiandaoxiangq(b)} + > + + } + )