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

uas-office-web/uas-mobile/src/components/common/bizgoblin/PieChart.jsx

@@ -26,6 +26,10 @@ export default class PieChart extends Component {
     const pixelRatio = window.devicePixelRatio * 2 //像素清晰度
     let { data, map } = this.props.data
     let { title } = this.props
+    var keyArr = []
+    for (let i in data[0]) {
+      keyArr.push(i)
+    }
     const defs = [{
       dataKey: 'percent',
       formatter: val => `${val * 100}%`,
@@ -38,7 +42,7 @@ export default class PieChart extends Component {
           <Geom
             geom="interval"
             position="a*percent"
-            color={['name', ['#1890FF', '#13C2C2', '#2FC25B', '#FACC14', '#F04864', '#8543E0']]}
+            color={[keyArr[0]]}
             adjust="stack"
             style={{
               lineWidth: 1,

uas-office-web/uas-mobile/src/components/common/bizgoblin/TableChart.jsx

@@ -34,6 +34,8 @@ export default class TableChart extends Component {
           bordered={true}
           columns={columns}
           dataSource={data}
+          size="small"
+          scroll={{ x: true }}
         />
       </div>
     )

uas-office-web/uas-mobile/src/components/common/mainHeader/MainHeader.jsx

@@ -66,6 +66,8 @@ class MainHeader extends Component {
       this.props.history.push('/subscribeList')
     } else if (funcObj.name === '我的日程') {
       this.props.history.push('/schedulePage')
+    } else if (funcObj.name === '我的待办') {
+      this.props.history.push('/taskTodo')
     }
   }
 

uas-office-web/uas-mobile/src/configs/antd.config.less

@@ -38,3 +38,8 @@
   line-height: @com-button-height !important;
   font-size: @com-button-fontsize !important;
 }
+
+/********************图表的title***********************/
+.ant-table-title {
+  padding: 8px 8px !important;
+}

uas-office-web/uas-mobile/src/configs/router.config.js

@@ -41,6 +41,10 @@ const SubscribeList = PageLoadable(
 const SubscribeManage = PageLoadable(
   import(/* webpackChunkName:'subscribe' */'@/pages/private/subscribe/SubscribeManage'))
 
+/**************************************************待办**************************************************/
+const TaskTodo = PageLoadable(
+  import(/* webpackChunkName:'tasktodo' */'@/pages/private/taskTodo/TaskTodo'))
+
 /**************************************************应用**************************************************/
 const OftenFuncManage = PageLoadable(
   import(/* webpackChunkName:'subscribe' */'@/pages/private/oftenFunc/OftenFuncManage'))
@@ -101,6 +105,10 @@ class Routes extends React.Component {
           {/*订阅管理*/}
           <Route path='/subscribeManage' component={SubscribeManage}/>
 
+          {/***************************************待办******************************************/}
+          {/*待办列表*/}
+          <Route path='/taskTodo' component={TaskTodo}/>
+
           {/***************************************应用*******************************************/}
           {/*常用应用管理*/}
           <Route path='/oftenFuncManage' component={OftenFuncManage}/>

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

@@ -0,0 +1,37 @@
+/**
+ * Created by hujs on 2020/12/02
+ * Desc: 待办列表
+ */
+
+import React, { Component } from 'react'
+import { connect } from 'react-redux'
+import CurrencyList from '../../../pages/common/currencyList/CurrencyList'
+
+class TaskTodo extends Component {
+
+  constructor () {
+    super()
+
+    this.state = {}
+  }
+
+  componentDidMount () {
+
+  }
+
+  componentWillUnmount () {
+
+  }
+
+  render () {
+    return (
+      <div>
+        待办
+      </div>
+    )
+  }
+}
+
+let mapStateToProps = (state) => ({})
+
+export default connect(mapStateToProps)(TaskTodo)