From: Hongyuan Ma <CS_MaleicAcid@163.com>
Date: Mon, 28 May 2018 02:14:34 +0000 (+0800)
Subject: adjust rate-bar color
X-Git-Url: http://git.postgresql.org/gitweb/static/%7B%7Bpguslink%28?a=commitdiff_plain;h=151dbd50e9cd5159a8d00b79f418b719f561b950;p=pgperffarm.git

adjust rate-bar color
---

diff --git a/front-end/src/page/Status/index.jsx b/front-end/src/page/Status/index.jsx
index bef7003..52ade47 100644
--- a/front-end/src/page/Status/index.jsx
+++ b/front-end/src/page/Status/index.jsx
@@ -22,7 +22,7 @@ class Status extends React.Component {
                 {
                     'alias': 'a_name',
                     'email': 'a_name@mail.com',
-                    'clients': [2,4,6],
+                    'clients': [2],
                     'mark': [140000,1,1],
                 }, {
                     'alias': 'b_name',
@@ -75,7 +75,7 @@ class Status extends React.Component {
                     <td>
                         <div>
                             <p>..</p>
-                            <RateBar style={{float: 'right', zIndex: 999}} std={this.state.std} curMark={this.state.curMark1}/>
+                            <RateBar style={{float: 'right', zIndex: 999}} std={this.state.std} curMark={this.state.curMark2}/>
                         </div>
                         {/*<div style={{float: 'left'}}> <p>{machine.mark}</p></div>*/}
                     </td>
@@ -96,8 +96,6 @@ class Status extends React.Component {
 
                 <ResultFilter isLoading={this.state.isLoading} onIsLoadingChange={this.handleIsLoading}/>
 
-                <p>...!!{this.state.isLoading}</p>
-
                 <TableList tableHeads={['alias', 'email', 'clients', 'mark', 'date']}>
                     {listBody}
                 </TableList>
diff --git a/front-end/src/service/status-service.jsx b/front-end/src/service/status-service.jsx
index d99f2c8..625ce66 100644
--- a/front-end/src/service/status-service.jsx
+++ b/front-end/src/service/status-service.jsx
@@ -1,6 +1,6 @@
-import Util    from 'util/util.jsx'
+import PGUtil    from 'util/util.jsx'
 
-const _util       = new Util();
+const _util       = new PGUtil();
 
 class Status{
     // get status list
diff --git a/front-end/src/util/rate-bar/index.jsx b/front-end/src/util/rate-bar/index.jsx
index c319086..d5a19cb 100644
--- a/front-end/src/util/rate-bar/index.jsx
+++ b/front-end/src/util/rate-bar/index.jsx
@@ -7,7 +7,6 @@ import 'echarts/lib/component/grid'
 import 'echarts/lib/chart/bar'
 
 import 'echarts/lib/component/title';
-import lineChart from './lineChart';
 
 // import { pieOption, barOption, lineOption, scatterOption, mapOption, radarOption, candlestickOption } from './optionConfig/options'
 // const BarReact = asyncComponent(() => import(/* webpackChunkName: "BarReact" */'./EchartsDemo/BarReact')) // bar component
@@ -29,6 +28,10 @@ class RateBar extends React.Component {
 
         // init echarts
         let myChart = echarts.init(this.refs.waterall);
+        let colorList = [
+            '#C33531','#EFE42A','#64BD3D','#EE9201','#29AAE3',
+            '#B74AE5','#0AAF9F','#E89589'
+        ];
         let option = {
             tooltip : {
                 trigger: 'axis',
@@ -63,6 +66,11 @@ class RateBar extends React.Component {
             },
             series: [
                 {
+                    itemStyle:{
+                        normal:{
+                            color:'#0050b3'
+                        }
+                    },
                     name: 'std',
                     type: 'bar',
                     stack: 'current',
@@ -75,6 +83,11 @@ class RateBar extends React.Component {
                     data: [std]
                 },
                 {
+                    itemStyle:{
+                        normal:{
+                            color:'#13c2c2'
+                        }
+                    },
                     name: 'curMark',
                     type: 'bar',
                     stack: 'current',
@@ -90,9 +103,8 @@ class RateBar extends React.Component {
         };
 
         myChart.setOption(option);
-
-
     }
+
     render() {
         return (
             <div ref="waterall" className="rate-bar" style={{ width: 240, height: 30 }}></div>