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

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

@@ -49,11 +49,13 @@ export default class CommonCalendar extends Component {
   getListData = (value) => {
     let clickDate = this.dateformat(value),
       { calendarData } = this.props,
-      listData
+      listData,
+      nowDay = Number(new Date().format('yyyyMMdd'));
     if (calendarData && calendarData.length >= 0) {
       for (let i = 0; i < calendarData.length; i++) {
         let date = calendarData[i].date
-        if (clickDate === date) {
+        let thisDate = Number(moment(date).format('YYYYMMDD'))
+        if (clickDate === date && thisDate<=nowDay) {
           switch (calendarData[i].status) {
             case 0:
               listData = [

uas-office-web/uas-mobile/src/components/private/kanban/KanBan.jsx

@@ -10,11 +10,7 @@ import { isObjEmpty } from '../../../utils/common/common.util'
 import { fetchGet } from '../../../utils/common/fetchRequest'
 import { saveChartState } from '../../../redux/actions/chartState'
 import { API } from '../../../configs/api.config'
-import { message } from 'antd'
-import {
-  FolderOpenOutlined,
-} from '@ant-design/icons'
-import './kanban.less'
+import { message, Empty } from 'antd'
 
 class KanBan extends Component {
 
@@ -79,14 +75,11 @@ class KanBan extends Component {
 
   getNoneElement = () => {
     return (
-      <div className="kanban-panel-nodata" key='nodata'>
-        <div className="nodata-box">
-          <FolderOpenOutlined
-            style={{ fontSize: '50px', color: '#DCDCDC' }}
-          />
-          <p>暂无数据，<span onClick={this.addChart} className="addchart">立即添加</span></p>
-        </div>
-      </div>
+      <Empty
+        key='empty-box'
+        image={Empty.PRESENTED_IMAGE_SIMPLE}
+        description={<span>暂无数据，<span style={{ color: '#47a3ff' }} onClick={this.addChart}>立即添加</span></span>}
+      />
     )
   }
 

uas-office-web/uas-mobile/src/components/private/kanban/kanban.less

@@ -1,28 +0,0 @@
-.kanban-panel-nodata {
-  background: #fff;
-  width: 100%;
-  min-height: 190px;
-  padding: 8px;
-  position: relative;
-
-  .nodata-box {
-    position: absolute;
-    top: 44px;
-    left: 50%;
-    transform: translate(-50%);
-
-    .anticon-folder-open {
-      display: block;
-      text-align: center;
-      margin-bottom: 6px;
-    }
-
-    p {
-      color: #C0C0C0;
-
-      .addchart {
-        color: #47a3ff;
-      }
-    }
-  }
-}

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

@@ -36,7 +36,7 @@ class ProfileCard extends Component {
     let { companyName, imgUrl, userName, departName, jobName } = this.props.userState
 
     return (
-      <div className="mine-info" style={{ padding: '15px 10px 0px 15px' }}>
+      <div className="mine-info" style={{ padding: '15px 12px 0px' }}>
         <div className="profile-layout">
           <div className="profile-info">
             <div className="company">{companyName}</div>

uas-office-web/uas-mobile/src/components/private/tasktodo/TaskTodoItem.jsx

@@ -7,6 +7,7 @@ import React, { Component } from 'react'
 import { connect } from 'react-redux'
 import { isObjEmpty } from '../../../utils/common/common.util'
 import TaskTodoRow from './TaskTodoRow'
+import { Empty } from 'antd'
 
 class TaskTodoItem extends Component {
 
@@ -31,6 +32,10 @@ class TaskTodoItem extends Component {
       rowList.forEach((item, index) => {
         rowItems.push(<TaskTodoRow rowObj={item} key={index}/>)
       })
+    } else if (rowList != undefined && rowList.length == 0) {
+      rowItems.push(
+        this.getNoneElement(),
+      )
     }
 
     return (
@@ -41,6 +46,12 @@ class TaskTodoItem extends Component {
       </div>
     )
   }
+
+  getNoneElement = () => {
+    return (
+      <Empty key='empty-box' image={Empty.PRESENTED_IMAGE_SIMPLE}/>
+    )
+  }
 }
 
 let mapStateToProps = (state) => ({})

uas-office-web/uas-mobile/src/components/private/tasktodo/task-todo-item.less

@@ -5,6 +5,7 @@
   align-items: center;
   margin-top: 6px;
   min-height: 45px;
+  padding: 5px 0px;
 
   .task-des-item {
     display: flex;

uas-office-web/uas-mobile/src/pages/private/taskTodo/TaskTodo.jsx

@@ -20,7 +20,7 @@ class TaskTodo extends Component {
     super()
 
     this.state = {
-      data: [],
+      data: undefined,
       searchValue: '',
       refreshing: false,
       height: document.documentElement.clientHeight,