From cc9f8eea5dcd523eae678ce50542da596a77e1ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=A8=E6=A0=91=E6=98=8E?= <775174143@qq.com>
Date: Fri, 13 Mar 2020 12:30:25 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=99=E5=B8=88=E7=AB=AF=E5=9B=BE=E6=A0=87?=
 =?UTF-8?q?=E8=AF=A6=E6=83=85=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Signinstatistics/Signinstatistics.js      | 238 ++++++++++++++++++
 .../courses/signin/css/Signinstatistics.css   |   4 +
 .../courses/signin/model/Createsignmodel.js   |  79 +++---
 .../courses/signin/model/Qrcodesignin.js      |  74 ++++++
 .../courses/signin/model/Studentssignmodel.js |  76 ++++++
 .../courses/signin/teacher/Teachers_signin.js |  46 +++-
 6 files changed, 475 insertions(+), 42 deletions(-)
 create mode 100644 public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
 create mode 100644 public/react/src/modules/courses/signin/css/Signinstatistics.css
 create mode 100644 public/react/src/modules/courses/signin/model/Qrcodesignin.js
 create mode 100644 public/react/src/modules/courses/signin/model/Studentssignmodel.js

diff --git a/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
new file mode 100644
index 000000000..d4aeb1d34
--- /dev/null
+++ b/public/react/src/modules/courses/signin/Signinstatistics/Signinstatistics.js
@@ -0,0 +1,238 @@
+import React,{ Component } from "react";
+import { Row, Col,Card } from 'antd';
+import {
+  G2,
+  Chart,
+  Geom,
+  Axis,
+  Tooltip,
+  Coord,
+  Label,
+  Legend,
+  View,
+  Guide,
+  Shape,
+  Facet,
+  Util
+} from "bizcharts";
+class Signinstatistics extends Component {
+  constructor(props) {
+    super(props)
+  }
+
+  render() {
+    const data = [
+      {
+        month: "Jan",
+        city: "Tokyo",
+        temperature: 7
+      },
+      {
+        month: "Jan",
+        city: "London",
+        temperature: 3.9
+      },
+      {
+        month: "Feb",
+        city: "Tokyo",
+        temperature: 6.9
+      },
+      {
+        month: "Feb",
+        city: "London",
+        temperature: 4.2
+      },
+      {
+        month: "Mar",
+        city: "Tokyo",
+        temperature: 9.5
+      },
+      {
+        month: "Mar",
+        city: "London",
+        temperature: 5.7
+      },
+      {
+        month: "Apr",
+        city: "Tokyo",
+        temperature: 14.5
+      },
+      {
+        month: "Apr",
+        city: "London",
+        temperature: 8.5
+      },
+      {
+        month: "May",
+        city: "Tokyo",
+        temperature: 18.4
+      },
+      {
+        month: "May",
+        city: "London",
+        temperature: 11.9
+      },
+      {
+        month: "Jun",
+        city: "Tokyo",
+        temperature: 21.5
+      },
+      {
+        month: "Jun",
+        city: "London",
+        temperature: 15.2
+      },
+      {
+        month: "Jul",
+        city: "Tokyo",
+        temperature: 25.2
+      },
+      {
+        month: "Jul",
+        city: "London",
+        temperature: 17
+      },
+      {
+        month: "Aug",
+        city: "Tokyo",
+        temperature: 26.5
+      },
+      {
+        month: "Aug",
+        city: "London",
+        temperature: 16.6
+      },
+      {
+        month: "Sep",
+        city: "Tokyo",
+        temperature: 23.3
+      },
+      {
+        month: "Sep",
+        city: "London",
+        temperature: 14.2
+      },
+      {
+        month: "Oct",
+        city: "Tokyo",
+        temperature: 18.3
+      },
+      {
+        month: "Oct",
+        city: "London",
+        temperature: 10.3
+      },
+      {
+        month: "Nov",
+        city: "Tokyo",
+        temperature: 13.9
+      },
+      {
+        month: "Nov",
+        city: "London",
+        temperature: 6.6
+      },
+      {
+        month: "Dec",
+        city: "Tokyo",
+        temperature: 9.6
+      },
+      {
+        month: "Dec",
+        city: "London",
+        temperature: 4.8
+      }
+    ];
+    const cols = {
+      month: {
+        range: [0, 1]
+      }
+    };
+    return(
+      <React.Fragment>
+
+      <Row gutter={[{ xs: 8, sm: 16, md: 24, lg: 32 }, 20]}>
+        <Col className="gutter-row" span={6}>
+          <div className="gutter-box">
+            <div className={"gutterrowbox"}>
+              <Card style={{ width: 300 }}>
+                <p>Card content</p>
+                <p>Card content</p>
+                <p>Card content</p>
+              </Card>
+            </div>
+          </div>
+        </Col>
+
+        <Col className="gutter-row" span={6}>
+          <div className="gutter-box">
+            <div className={"gutterrowbox"}>
+
+            </div>
+          </div>
+        </Col>
+
+        <Col className="gutter-row" span={6}>
+          <div className="gutter-box">
+            <div className={"gutterrowbox"}>
+
+            </div>
+          </div>
+        </Col>
+
+        <Col className="gutter-row" span={6}>
+          <div className="gutter-box">
+            <div className={"gutterrowbox"}>
+
+            </div>
+          </div>
+        </Col>
+      </Row>
+        <div>
+          <Chart height={400} data={data} scale={cols} forceFit>
+            <Legend />
+            <Axis name="month" />
+            <Axis
+              name="temperature"
+              label={{
+                formatter: val => `${val}°C`
+              }}
+            />
+            <Tooltip
+              crosshairs={{
+                type: "y"
+              }}
+            />
+            <Geom
+              type="line"
+              position="month*temperature"
+              size={2}
+              color={"city"}
+              shape={"smooth"}
+            />
+            <Geom
+              type="point"
+              position="month*temperature"
+              size={4}
+              shape={"circle"}
+              color={"city"}
+              style={{
+                stroke: "#fff",
+                lineWidth: 1
+              }}
+            />
+          </Chart>
+        </div>
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+
+
+export default Signinstatistics;
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/css/Signinstatistics.css b/public/react/src/modules/courses/signin/css/Signinstatistics.css
new file mode 100644
index 000000000..25760394f
--- /dev/null
+++ b/public/react/src/modules/courses/signin/css/Signinstatistics.css
@@ -0,0 +1,4 @@
+.gutterrowbox{
+    width:209px;
+    height:150px;
+}
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/model/Createsignmodel.js b/public/react/src/modules/courses/signin/model/Createsignmodel.js
index adc0d09b0..0e640ecaf 100644
--- a/public/react/src/modules/courses/signin/model/Createsignmodel.js
+++ b/public/react/src/modules/courses/signin/model/Createsignmodel.js
@@ -1,5 +1,5 @@
 import React from 'react'
-import { Modal , Form, Input, Radio,DatePicker, TimePicker,Select} from 'antd';
+import { Modal , Form, Input, Radio,DatePicker, TimePicker,Select,Button} from 'antd';
 
 const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
 
@@ -7,31 +7,6 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
     constructor(props){
       super(props);
       this.state = {
-        index:1,
-        addGroup:true,
-        navid:undefined,
-        sandiantype:undefined,
-        twosandiantype:undefined,
-        addCheckboxGroup:[],
-        Navmodalname:"",
-        Navmodalnametype:false,
-        Navmodaltypename:"",
-        setnavid:"",
-        NavmodalValue:"",
-        ModalsType:false,
-        Modalstopval:"",
-        loadtype:false,
-        selectnavid:false,
-        newselectnavid:undefined,
-        positiontype:undefined,
-        toopvisible:false,
-        toopvisibleindex:undefined,
-        toopvisibleindexs:undefined,
-        sandiantypes:undefined,
-        antIcon:false,
-        chapterupdate:false,
-
-        successFunc:undefined
       }
     }
 
@@ -44,6 +19,21 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
         wrapperCol: { span: 19},
       };
 
+      const leftbuton={
+        "width":"130px",
+        "height":"40px",
+        "border":"1px solid rgba(76,172,255,1)",
+        "border-radius":"4px",
+      }
+
+      const rightbuton={
+        "width":"130px",
+        "height":"40px",
+        "background":"#4CACFF",
+       "border-radius":"4px",
+      }
+      const format = 'HH:mm';
+
       return (
         <Modal
           visible={visible}
@@ -55,13 +45,13 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
           <Form {...formItemLayout}>
 
             <Form.Item label="签到名称：">
-              {getFieldDecorator('title', {
+              {getFieldDecorator('name', {
                 rules: [{ required: true, message: 'Please input the title of collection!' }],
               })(<Input />)}
             </Form.Item>
 
             <Form.Item label="签到班级：">
-              {getFieldDecorator('select-multiple')(
+              {getFieldDecorator('group_ids')(
                 <Select mode="multiple" placeholder="Please select favourite colors">
                   <Option value="red">Red</Option>
                   <Option value="green">Green</Option>
@@ -71,7 +61,7 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
             </Form.Item>
 
             <Form.Item label="签到方式：" >
-              {getFieldDecorator('modifier', {
+              {getFieldDecorator('mode', {
                 rules: [{ required: true, message: 'Please input the title of collection!' }],
               })(
                 <Radio.Group onChange={setRadio}>
@@ -84,11 +74,13 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
                 style={{color:"#E6A23C",
                 height:"15px",
                 lineHeight: "15px"}}>学生点击签到按钮即可完成签到</div>:""}
+
               {Radiolist==="NUMBER"?<div
                 style={{color:"#E6A23C",
                   height:"15px",
                   lineHeight: "15px"}}
               >学生需要输入签到码才能完成签到</div>:""}
+
               {Radiolist==="QRCODE"?<div
                 style={{color:"#E6A23C",
                   height:"15px",
@@ -97,23 +89,40 @@ const CollectionCreateForm = Form.create({ name: 'form_in_modal' })(
             </Form.Item>
 
             <Form.Item label="签到日期：">
-              {getFieldDecorator('date-picker',  {
+              {getFieldDecorator('attendance_date',  {
                 rules: [{ type: 'object', required: true, message: 'Please select time!' }],
-              })(<DatePicker />)}
+              })(<DatePicker style={{width:"413px"}} />)}
             </Form.Item>
 
             <Form.Item label="开始时间：">
-              {getFieldDecorator('time-picker',  {
+              {getFieldDecorator('start_time',  {
                 rules: [{ type: 'object', required: true, message: 'Please select time!' }],
-              })(<TimePicker />)}
+              })(<TimePicker style={{width:"413px"}} format={format} />)}
             </Form.Item>
 
             <Form.Item label="结束时间：">
-              {getFieldDecorator('time-picker',  {
+              {getFieldDecorator('end_time',  {
                 rules: [{ type: 'object', required: true, message: 'Please select time!' }],
-              })(<TimePicker />)}
+              })(<TimePicker style={{width:"413px"}} format={format} />)}
             </Form.Item>
 
+
+              <div className={"mt20 marginauto clearfix edu-txt-center"}>
+                <a>
+                  <Button type="primary" ghost style={leftbuton}>
+                    取消
+                  </Button>
+                </a>
+
+                <a>
+                  <Button type="primary" className={"ml20"} style={rightbuton}>
+                    确定
+                  </Button>
+                </a>
+
+              </div>
+
+
           </Form>
         </Modal>
       );
diff --git a/public/react/src/modules/courses/signin/model/Qrcodesignin.js b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
new file mode 100644
index 000000000..aa028cb17
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Qrcodesignin.js
@@ -0,0 +1,74 @@
+import React,{ Component } from "react";
+
+import { Modal , Button} from 'antd';
+
+class Qrcodesignin extends Component {
+  constructor(props) {
+    super(props)
+  }
+
+  render() {
+
+    const leftbuton={
+      "width":"130px",
+      "height":"40px",
+      "border":"1px solid rgba(76,172,255,1)",
+      "border-radius":"4px",
+    }
+
+    const rightbuton={
+      "width":"130px",
+      "height":"40px",
+      "background":"#4CACFF",
+      "border-radius":"4px",
+    }
+    return(
+      <React.Fragment>
+        {this.props.Qrcodesignintype?<Modal
+          title="二维码签到"
+          visible={this.props.Qrcodesignintype}
+          closable={false}
+          footer={null}
+        >
+
+          <div>
+            <div className={" marginauto clearfix edu-txt-center"}>
+              <a><img alt="example" src="https://zos.alipayobjects.com/rmsportal/jkjgkEfvpUPVyRjUImniVslZfWPnJuuZ.png" style={{"width": "100%"}} /></a>
+            </div>
+
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>请打开小程序在课堂的签到模块扫码签到</a>
+            </div>
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>
+                <Button type="primary" ghost style={leftbuton}>
+                  取消
+                </Button>
+              </a>
+
+              <a>
+                <Button type="primary" className={"ml20"} style={rightbuton}>
+                  确定
+                </Button>
+              </a>
+
+            </div>
+
+
+          </div>
+        </Modal>:""}
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+
+
+export default Qrcodesignin
\ No newline at end of file
diff --git a/public/react/src/modules/courses/signin/model/Studentssignmodel.js b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
new file mode 100644
index 000000000..b09f865f5
--- /dev/null
+++ b/public/react/src/modules/courses/signin/model/Studentssignmodel.js
@@ -0,0 +1,76 @@
+import React,{ Component } from "react";
+
+import { Modal , Form, Input,Button} from 'antd';
+
+class Studentssignmodel extends Component {
+  constructor(props) {
+    super(props)
+  }
+
+  render() {
+    const { getFieldDecorator } =  this.props.form;
+    const formItemLayout = {
+      wrapperCol: { span: 25},
+    };
+
+    const leftbuton={
+      "width":"130px",
+      "height":"40px",
+      "border":"1px solid rgba(76,172,255,1)",
+      "border-radius":"4px",
+    }
+
+    const rightbuton={
+      "width":"130px",
+      "height":"40px",
+      "background":"#4CACFF",
+      "border-radius":"4px",
+    }
+    return(
+      <React.Fragment>
+        {this.props.Studentssigntype?<Modal
+          title="签到码签到"
+          visible={this.props.Studentssigntype}
+          closable={false}
+          footer={null}
+        >
+
+          <Form {...formItemLayout}>
+
+            <Form.Item>
+              {getFieldDecorator('name', {
+                rules: [{ required: true, message: 'Please input the title of collection!' }],
+              })(<Input placeholder="请输入签到码"/>)}
+            </Form.Item>
+
+            <div className={"mt20 marginauto clearfix edu-txt-center"}>
+              <a>
+                <Button type="primary" ghost style={leftbuton}>
+                  取消
+                </Button>
+              </a>
+
+              <a>
+                <Button type="primary" className={"ml20"} style={rightbuton}>
+                  确定
+                </Button>
+              </a>
+
+            </div>
+
+
+          </Form>
+        </Modal>:""}
+      </React.Fragment>
+
+    )
+  }
+
+}
+
+
+
+
+const Studentssignmodels = Form.create({ name: 'Studentssignmodel' })(Studentssignmodel);
+
+export default Studentssignmodels
\ No newline at end of file
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 527fda152..101816a9d 100644
--- a/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
+++ b/public/react/src/modules/courses/signin/teacher/Teachers_signin.js
@@ -2,8 +2,10 @@ import React,{ Component } from "react";
 import '../css/signincdi.css';
 import { Tabs,Pagination} from 'antd';
 import  Teaccomponent from '../component/teachercomponent/Teaccomponent';
-import Histeacomponent from '../component/teachercomponent/Histeacomponent';
 import Createsignmodel from '../model/Createsignmodel';
+import Studentssignmodels from "../model/Studentssignmodel";
+import Qrcodesignin from "../model/Qrcodesignin";
+import Signinstatistics from "../Signinstatistics/Signinstatistics";
 const { TabPane } = Tabs;
 //在线学习
 class Students_signin extends Component{
@@ -40,6 +42,21 @@ class Students_signin extends Component{
 		 visible:true
 	 })
 	}
+
+
+	Studentsbottom=()=>{
+		this.setState({
+			Studentssigntype:true
+		})
+	}
+
+	Qrcodesignintypefun=()=>{
+		this.setState({
+			Qrcodesignintype:true
+		})
+	}
+
+
 	paginationonChange = (pageNumber) => {
 		this.setState({
 			page: pageNumber,
@@ -52,11 +69,23 @@ class Students_signin extends Component{
 		let {page,per_page,count,defaultActiveKey} =this.state
 		return(
 			<React.Fragment>
-				<Createsignmodel
-					{...this.state}
-					{...this.props}
-				/>
+
 				<div className="">
+					{/*创建实训*/}
+					<Createsignmodel
+						{...this.state}
+						{...this.props}
+					/>
+					{/*签到*/}
+					<Studentssignmodels
+						{...this.state}
+						{...this.props}
+					/>
+					{/*二维码*/}
+					<Qrcodesignin
+						{...this.state}
+						{...this.props}
+					/>
 
 					<div className="clearfix   yslmaxheigthk" >
 						<div className="ws100s" style={{
@@ -83,12 +112,15 @@ class Students_signin extends Component{
 									</div>
 								</TabPane>
 								<TabPane tab="签到统计" key="3">
-									Content of Tab Pane 3
+								   <Signinstatistics
+										 {...this.props}
+										 {...this.state}
+									 />
 								</TabPane>
 							</Tabs>
 							<div className="positiondivs sortinxdirection xiaoshou">
 								<i className="iconfont icon-bianji5  posiivsicon"></i>
-								<p className="posiivs xiaoshou" onClick={()=>this.Createsign()}>创建签到</p>
+								<p className="posiivs xiaoshou" onClick={()=>this.Qrcodesignintypefun()}>创建签到</p>
 							</div>
 						</div>