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

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

@@ -7,7 +7,7 @@ import {
     Coord,
     Label
 } from "bizcharts";
-import { message, Spin } from 'antd'
+import { message, Spin, Icon } from 'antd'
 import DataSet from "@antv/data-set";
 import './useStatus.css';
 import { fetchPost, fetchGet } from '../../utils/fetchRequest';
@@ -21,6 +21,9 @@ let DAILYCOUNT = [];
 let columnWidth = 300;
 let mBaseUrl = window.location.origin + '/office';
 
+const IconFont = Icon.createFromIconfontCN({
+    scriptUrl: '//at.alicdn.com/t/font_1029568_7tx8nc4c0ts.js',
+});
 
 export default class Basic extends Component {
     constructor() {
@@ -66,7 +69,7 @@ export default class Basic extends Component {
                 DAILYCOUNT = dataSource.DAILYCOUNT;
                 dataLength = DURATIONLIST.length;
                 if (dataLength > 0) {
-                    columnWidth = dataLength * 45;
+                    columnWidth = dataLength * 38;
                 } else {
                     columnWidth = 300
                 }
@@ -110,7 +113,6 @@ export default class Basic extends Component {
                 return a.DURATION - b.DURATION;
             }
         });
-
         return (
             <div className="useStatusRoot" >
                 <Spin size="large"
@@ -118,29 +120,30 @@ export default class Basic extends Component {
                     tip='数据请求中...'>
                 </Spin>
                 <div style={{ display: loading ? 'none' : 'flex' }} className='content'>
-                    <div className='branch'>{DEPART}</div>
-                    <div className='useNum'>使用人数{USERCOUNT}人</div>
+                    <div className='branch'><IconFont type="icon-bumenguanli" />  {DEPART}</div>
+                    <div className="numBox">
+                        <div className='useNum'>使用人数{USERCOUNT}人</div>
+                        <div className="iconBox"><IconFont type="icon-xitongyunweibumen" /></div>
+                    </div>
                     <div className='lineCharts'>
-                        <div className='useAnaly'>成员使用分析</div>
-                        <Chart padding={['12%', '10%', '12%', '8%']} height={200} data={DAILYCOUNT} scale={cols} forceFit>
+                        <Chart padding={['15%', '12%', '15%', '8%']} height={200} data={DAILYCOUNT} scale={cols} forceFit>
                             <Axis
                                 name="DATE_TIME"
                                 label={{
                                     offset: 18,
                                     textStyle: {
                                         fontSize: '14',
-                                        fill: '#959595'
+                                        fill: '#000'
                                     }
                                 }} />
                             <Axis
                                 name="EMCOUNT"
                                 position="right"
-                                grid={null}
                                 label={{
                                     offset: 10,
                                     textStyle: {
                                         fontSize: '14',
-                                        fill: '#959595'
+                                        fill: '#000'
                                     }
                                 }}
                             />

uas-office-web/wxuasapproval/src/pages/useStatus/useStatus.css

@@ -15,35 +15,39 @@
     overflow-x: hidden;
 }
 .useStatusRoot .content .branch{
-    padding:4%;
-    padding-bottom: 0;
+    padding:2% 4% 2% 4%;
     color:#000;
     font-size:20px;
     background:#fff;
-    text-align:center;
+    border-bottom:1px solid #8e8a8c;
 }
 .useStatusRoot .content .lineCharts{
     background:#fff;
-    margin:3% 0 0 0;
+    width:92%;
+    margin-left:4%;
+    border-radius: 3%;
 }
 .useStatusRoot .content .columnCharts{
     background:#fff;
     margin:3% 0 0 0;
 }
-.useStatusRoot .content .useNum{
-    background:#fff;
+.useStatusRoot .content .numBox .useNum{
+    float:left;
+    background: #f5f5f5;
     font-size:16px;
-    padding-left:4%;
-    color:#000;
+    color:#4682B4;
+    padding:3% 0 3% 4%;
 }
-.useStatusRoot .content .lineCharts .useAnaly{
-    margin:0 !important;
-    padding:4%;
-    padding-bottom:0%;
-    font-size:14px;
+.useStatusRoot .content .numBox .iconBox{
+    float:right;
+    background: #f5f5f5;
+    font-size:16px;
+    padding:3% 4% 3% 0;
 }
 .useStatusRoot .content .columnCharts .useTime{
     margin:0 !important;
     padding:4%;
     font-size:14px;
+    border-top:1px solid #8e8a8c;
+    color:#4682B4;
 }

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

@@ -94,7 +94,7 @@ export default class Basic extends Component {
                 MODELLIST = dataSource.MODELLIST;
                 dataLength = MODELLIST.length;
                 if (dataLength > 0) {
-                    columnWidth = dataLength * 45;
+                    columnWidth = dataLength * 38;
                 } else {
                     columnWidth = 300
                 }

uas-office-web/wxuasapproval/src/pages/workSummary/workSummary.css

@@ -60,6 +60,8 @@
 }
 .workSummaryRoot .content .columnCharts .useTime{
     margin:0 !important;
-    padding:4% 4% 0 5%;
+    padding:4%;
     font-size: 14px;
+    color:#4682B4;
+    border-top:1px solid #8e8a8c;
 }