uas手机版

我的日程数据、样式调整

uas-office-web/uas-mobile/src/components/common/calendar/CommonCalendar.jsx

@@ -12,20 +12,7 @@ export default class CommonCalendar extends Component {
   constructor () {
     super()
 
-    this.state = {
-      testDate: [{
-        date: '2020-11-12',
-        state: 0,//正常 无
-      },
-        {
-          date: '2020-11-13',
-          state: 1,//迟到 red
-        },
-        {
-          date: '2020-11-14',
-          state: 2,//有事项 gray
-        }],
-    }
+    this.state = {}
   }
 
   componentDidMount () {
@@ -37,7 +24,6 @@ export default class CommonCalendar extends Component {
   }
 
   render () {
-
     return (
       <div className='calendar-box'>
         <div className="site-calendar-demo-card">
@@ -61,11 +47,12 @@ export default class CommonCalendar extends Component {
 
   getListData = (value) => {
     let clickDate = this.dateformat(value),
+      { calendarData } = this.props,
       listData
-    for (let i = 0; i < this.state.testDate.length; i++) {
-      let date = this.state.testDate[i].date
+    for (let i = 0; i < calendarData.length; i++) {
+      let date = calendarData[i].date
       if (clickDate === date) {
-        switch (this.state.testDate[i].state) {
+        switch (calendarData[i].state) {
           case 0:
             listData = [
               { color: 'no' },

uas-office-web/uas-mobile/src/components/private/noticematter/NoticeMatter.jsx

@@ -26,7 +26,7 @@ export default class NoticeMatter extends Component {
   }
 
   render () {
-    let testData = [{
+    let noticeMatterData = [{
       time: '9:30-10:30',
       meetingName: '部门例会',
       meetingFrom: '会议',
@@ -37,9 +37,9 @@ export default class NoticeMatter extends Component {
     }]
 
     let MeetingList = []
-    testData.forEach((item, index) => {
+    noticeMatterData.forEach((item, index) => {
       MeetingList.push(
-        <Step key={index} status="finish" title={item.time}
+        <Step className="step-icon" key={index} status="finish" title={item.time}
               description={item.meetingName + '来自(' + item.meetingFrom + ')'} onClick={this.onCancelClick}/>,
       )
     })

uas-office-web/uas-mobile/src/components/private/noticematter/notice-matter.less

@@ -1,4 +1,17 @@
 .notice-matter {
   background: #fff;
   padding: 15px;
+
+  .step-icon {
+    position: relative;
+
+    &:after {
+      content: ">";
+      color: #cbcbcf;
+      font-size: 24px;
+      position: absolute;
+      top: 0px;
+      right: 10px;
+    }
+  }
 }

uas-office-web/uas-mobile/src/components/private/punchclock/ClockDesc.jsx

@@ -27,15 +27,12 @@ export default class ClockDesc extends Component {
   }
 
   render () {
-    let punchInfo = {
-      companyClass: '优软班次',
-    }
-    let { companyClass } = punchInfo
+    let { companyClass } = this.props
 
     return (
       <div className='punch-clock-desc'>
         <Item>
-          上下班打开<Brief>打卡规则：{companyClass}</Brief>
+          上下班打卡<Brief>打卡规则：{companyClass}</Brief>
         </Item>
       </div>
     )

uas-office-web/uas-mobile/src/components/private/punchclock/ClockRecord.jsx

@@ -23,24 +23,8 @@ export default class ClockRecord extends Component {
   }
 
   render () {
-    let testData = {
-      onTime: {
-        onTime: '8:30',
-        punchTime: '08:45',
-        auto: false,
-        isPunch: true,
-        type: '迟到打卡',
-      },
-      offTime: {
-        offTime: '18:00',
-        punchTime: '19:00',
-        auto: true,
-        isPunch: false,
-        type: '正常打卡',
-      },
-
-    }
-    let { onTime, offTime } = testData
+    let { clockRecord } = this.props
+    let { onTime, offTime } = clockRecord
     return (
       <div className='punch-clock-record'>
         <div className="clock-record-left">

uas-office-web/uas-mobile/src/components/private/punchclock/PunchClock.jsx

@@ -7,6 +7,7 @@ import React, { Component } from 'react'
 import './punch-clock.less'
 import ClockDesc from './ClockDesc'
 import ClockRecord from './ClockRecord'
+import { isEmptyObject } from '../../../utils/common.util'
 
 export default class PunchClock extends Component {
 
@@ -25,12 +26,37 @@ export default class PunchClock extends Component {
   }
 
   render () {
+    let punchClockData = {
+      companyClass: '优软班次',
+      clockRecord: {
+        onTime: {
+          onTime: '8:30',
+          punchTime: '08:45',
+          auto: false,
+          isPunch: true,
+          type: '迟到打卡',
+        },
+        offTime: {
+          offTime: '18:00',
+          punchTime: '19:00',
+          auto: true,
+          isPunch: false,
+          type: '正常打卡',
+        },
+      },
+    }
+
+    let { companyClass, clockRecord } = punchClockData
 
     return (
-      <div className='punch-clock'>
-        <ClockDesc/>
-        <ClockRecord/>
-      </div>
+      isEmptyObject(punchClockData)
+        ?
+        ''
+        :
+        <div className='punch-clock'>
+          <ClockDesc companyClass={companyClass}/>
+          <ClockRecord clockRecord={clockRecord}/>
+        </div>
     )
   }
 

uas-office-web/uas-mobile/src/pages/private/schedulePage/SchedulePage.jsx

@@ -28,11 +28,26 @@ class SchedulePage extends Component {
   }
 
   render () {
-    const { tabBarHidden } = this.state
+    let { tabBarHidden } = this.state
+    let scheduleData = {
+      calendarData: [{
+        date: '2020-11-12',
+        state: 0,//正常 无
+      },
+        {
+          date: '2020-11-13',
+          state: 1,//迟到 red
+        },
+        {
+          date: '2020-11-14',
+          state: 2,//有事项 gray
+        }],
+    }
+    let { calendarData } = scheduleData
 
     return (
       <div className='schedule-root'>
-        <CommonCalendar/>
+        <CommonCalendar calendarData={calendarData}/>
         <PunchClock/>
         <NoticeMatter/>
       </div>