Merge branch 'dev' of ssh://10.10.100.21/source/uas-office-integration into dev

uas-office-web/uas-mobile/src/components/private/profile/ProfileCard.jsx

@@ -30,10 +30,11 @@ export default class ProfileCard extends Component {
     let mineInfo = {
       companyName: '深圳市英唐智能控制股份有限公司',
       userName: '胡俊森',
-      post: '管理员',
+      userPost: '管理员',
       imgUrl: '',
+      companyId: '',
     }
-    let { companyName, userName, post, imgUrl } = mineInfo
+    let { companyName, userName, userPost, imgUrl } = mineInfo
 
     return (
       <div className="mine-info" style={{ padding: '15px 10px 0px 15px' }}>
@@ -41,7 +42,7 @@ export default class ProfileCard extends Component {
           <div className="profile-info">
             <div className="company">{companyName}</div>
             <div className="name func-font-family">{userName}</div>
-            <div className="post">{post}</div>
+            <div className="post">{userPost}</div>
           </div>
           {
             imgUrl

uas-office-web/uas-mobile/src/components/private/profile/ProfileCard.less

@@ -23,6 +23,7 @@
       color: #808080;
       overflow: hidden;
       text-overflow: ellipsis;
+      min-width: 120px;
     }
 
     .name {

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

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

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

@@ -28,21 +28,22 @@ export default class ClockRecord extends Component {
     return (
       <div className='punch-clock-record'>
         <div className="clock-record-left">
-          <div className="clock-record-on-time">{onTime.onTime}</div>
+          <div className="clock-record-on-time">{onTime.time}</div>
           <div className="clock-record-trans"></div>
-          <div className="clock-record-off-time">{offTime.offTime}</div>
+          <div className="clock-record-off-time">{offTime.time}</div>
         </div>
         <div className="clock-record-right">
           <div
-            className={!onTime.isPunch || onTime.type == '迟到打卡' ? 'punch-clock-on-time punch-clock-box punch-clock-box-delay' : 'punch-clock-on-time punch-clock-box punch-clock-box-normal'}>
+            className={onTime.type == '未打卡' || onTime.type == '迟到打卡' ? 'punch-clock-on-time punch-clock-box punch-clock-box-delay' : 'punch-clock-on-time punch-clock-box punch-clock-box-normal'}>
             <div className="on-work">上班{onTime.auto ? '·自动' : ''}</div>
-            <div className="on-work-time">{onTime.isPunch ? onTime.type + '(' + onTime.punchTime + ')' : '未打卡'}</div>
+            <div
+              className="on-work-time">{onTime.type == '未打卡' ? '未打卡' : onTime.type + '(' + onTime.punchTime + ')'}</div>
           </div>
           <div
-            className={offTime.isPunch ? 'punch-clock-on-time punch-clock-box punch-clock-box-normal' : 'punch-clock-on-time punch-clock-box punch-clock-box-delay'}>
+            className={offTime.type == '未打卡' ? 'punch-clock-on-time punch-clock-box punch-clock-box-delay' : 'punch-clock-on-time punch-clock-box punch-clock-box-normal'}>
             <div className="off-work">下班{offTime.auto ? '·自动' : ''}</div>
             <div
-              className="off-work-time">{offTime.isPunch ? offTime.type + '(' + offTime.punchTime + ')' : '未打卡'}</div>
+              className="off-work-time">{offTime.type == '未打卡' ? '未打卡' : offTime.type + '(' + offTime.punchTime + ')'}</div>
           </div>
         </div>
       </div>

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

@@ -26,7 +26,7 @@ export default class PunchClock extends Component {
   }
 
   render () {
-    let { companyClass, clockRecord } = this.props.punchClockData
+    let { companyRule, clockRecord } = this.props.punchClockData
 
     return (
       isEmptyObject(this.props.punchClockData)
@@ -34,7 +34,7 @@ export default class PunchClock extends Component {
         ''
         :
         <div className='punch-clock'>
-          <ClockDesc companyClass={companyClass}/>
+          <ClockDesc companyRule={companyRule}/>
           <ClockRecord clockRecord={clockRecord}/>
         </div>
     )

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

@@ -18,20 +18,18 @@ class SchedulePage extends Component {
 
     this.state = {
       punchClockData: {
-        companyClass: '优软班次',
+        companyRule: '优软班次',
         clockRecord: {
           onTime: {
-            onTime: '8:30',
+            time: '8:30',
             punchTime: '08:45',
             auto: false,
-            isPunch: true,
             type: '迟到打卡',
           },
           offTime: {
-            offTime: '18:00',
+            time: '18:00',
             punchTime: '19:00',
             auto: true,
-            isPunch: false,
             type: '正常打卡',
           },
         },
@@ -40,11 +38,26 @@ class SchedulePage extends Component {
         time: '9:30-10:30',
         meetingName: '部门例会',
         meetingFrom: '会议',
+        id: '',
       }, {
         time: '14:00-16:30',
         meetingName: '深爱半导体（业务办理）',
         meetingFrom: '外勤',
+        id: '',
       }],
+
+      calendarData: [{
+        date: '2020-11-12',
+        state: 0,//正常 无
+      },
+        {
+          date: '2020-11-13',
+          state: 1,//迟到 red
+        },
+        {
+          date: '2020-11-14',
+          state: 2,//有事项 gray
+        }],
     }
   }
 
@@ -62,22 +75,7 @@ class SchedulePage extends Component {
   }
 
   render () {
-    let { punchClockData, noticeMatterData } = 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
+    let { punchClockData, noticeMatterData, calendarData } = this.state
 
     return (
       <div className='schedule-root'>
@@ -94,21 +92,19 @@ class SchedulePage extends Component {
       return false
     }
     let testData1 = {
-      companyClass: '测试班次',
+      companyRule: '测试班次',
       clockRecord: {
         onTime: {
-          onTime: '9:30',
+          time: '9:30',
           punchTime: '08:45',
           auto: false,
-          isPunch: true,
           type: '正常打卡',
         },
         offTime: {
-          offTime: '19:00',
+          time: '19:00',
           punchTime: '19:00',
-          auto: true,
-          isPunch: true,
-          type: '正常打卡',
+          auto: false,
+          type: '未打卡',
         },
       },
     }