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

uas-office-web/wxuasapproval/src/pages/useStatus/UseStatus.jsx

@@ -62,6 +62,12 @@ export default class Basic extends Component {
             // "Content-Type": "application/json; charset=UTF-8"
         }).then((response) => {
             if (response.success) {
+                if(response.data.length==0){
+                    message.error('获取数据失败');
+                    this.setState({
+                        loading: false,
+                    })
+                }
                 let dataSource = response.data[0];
                 DEPART = dataSource.DEPART;
                 USERCOUNT = dataSource.USERCOUNT;

uas-office-web/wxuasapproval/src/pages/workSummary/WorkSummary.jsx

@@ -31,6 +31,7 @@ export default class Basic extends Component {
         }
     }
     componentWillMount() {
+        document.title = '个人一周小结';
         let messobj = this.getUrlData();
         if (!isObjEmpty(messobj)) {
             try {
@@ -149,7 +150,7 @@ export default class Basic extends Component {
                         </List>
                     </div>
                     <div className='columnCharts'>
-                        <div className='useTime'>各模块使用情况（分钟）</div>
+                        <div className='useTime'>各模块使用情况</div>
                         <Chart
                             padding={['auto', '20%', 'auto', 'auto']} height={columnWidth} data={dv} forceFit>
                             <Coord transpose />