Merge remote-tracking branch 'origin/master'

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

@@ -110,14 +110,9 @@ export default class Basic extends Component {
                 return a.DURATION - b.DURATION;
             }
         });
-        const scale = {
-            sales: {
-                tickInterval: 100,
-            }
-        };
 
         return (
-            <div className="useStatusRoot">
+            <div className="useStatusRoot" >
                 <Spin size="large"
                     style={{ display: loading ? 'flex' : 'none' }}
                     tip='数据请求中...'>
@@ -155,16 +150,17 @@ export default class Basic extends Component {
                                 }}
                             />
                             <Geom
+                                color={['EMCOUNT', ['#4682B4']]}
                                 tooltip={['DATE_TIME*EMCOUNT', (text, num) => {
                                     return {
                                         name: '使用人数',
                                         value: num
                                     };
                                 }]}
-                                color="l (270) 0:rgba(100,149,237,1) .5:rgba(135,206,250, 1) 1:rgba(0,191,255, 1)"
                                 shape="smooth" type="line" position="DATE_TIME*EMCOUNT" size={2}
                             />
                             <Geom
+                                color={['EMCOUNT', ['#4682B4']]}
                                 type="point"
                                 position="DATE_TIME*EMCOUNT"
                                 size={4}
@@ -198,6 +194,7 @@ export default class Basic extends Component {
                             />
                             <Axis grid={null} name="DURATION" label={null} />
                             <Geom
+                                color={['EMNAME', ['#4682B4']]}
                                 type="interval" position="EMNAME*DURATION" >
                                 <Label
                                     offset={5}

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

@@ -158,8 +158,9 @@ export default class Basic extends Component {
                                 }}
                             />
                             <Axis grid={null} name="DURATION" label={null} />
-                            <Tooltip  />
+                            <Tooltip />
                             <Geom
+                                color={['MODELNAME', ['#4682B4']]}
                                 tooltip={['MODELNAME*DURATION', (text, num) => {
                                     return {
                                         name: '使用时间',