Commit e0cffb45 authored by baixian's avatar baixian

bug修改

parent 5efedba0
......@@ -152,7 +152,7 @@ class StaticBox extends React.Component {
<Geom
type="line"
position="month*count"
color={['name', ['#FFB879']]}
color={['name', ['rgba(255, 184, 121,0.3)']]}
size={3}
shape="smooth"
/>
......
......@@ -67,44 +67,36 @@ class StaticBox extends React.Component {
return (
<div className={pageStyle.container}>
<div className={pageStyle.StaticBox}>
<Row>
<Col
lg={14}
md={24}
xs={24}
sm={24}
className={pageStyle.searchBox}
>
<span className={pageStyle.searchname}>日期</span>
<RangePicker
onChange={this.onChange}
ranges={{
' 最近7天': [moment().subtract(6, 'days'), moment()],
' 最近三十天 ': [moment().subtract(29, 'days'), moment()],
}}
disabledDate={this.disabledDate}
allowClear={false}
style={{ marginRight: '42px' }}
defaultValue={[yesterday, today]}
/>
{/* <div className={`${pageStyle.chartitem} ${pageStyle.payitem}`}> */}
{/* <div className={pageStyle.dot} /> */}
{/* <div className={pageStyle.chartitemname}>付费人数</div> */}
{/* </div> */}
{/* <div className={`${pageStyle.chartitem} ${pageStyle.visititem}`}> */}
{/* <div className={pageStyle.dot} /> */}
{/* <div className={pageStyle.chartitemname}>访问人数</div> */}
{/* </div> */}
</Col>
</Row>
<div className={pageStyle.chartBox}>
<Row>
<Col
lg={14}
md={24}
xs={24}
sm={24}
className={pageStyle.searchBox}
>
<span className={pageStyle.searchname}>日期</span>
<RangePicker
onChange={this.onChange}
ranges={{
' 最近7天': [moment().subtract(6, 'days'), moment()],
' 最近三十天 ': [moment().subtract(29, 'days'), moment()],
}}
disabledDate={this.disabledDate}
allowClear={false}
style={{ marginRight: '42px' }}
defaultValue={[yesterday, today]}
/>
</Col>
</Row>
{dataChart.length > 0 ?
<Chart height={350} data={dataChart} padding="auto" scale={dataCols} forceFit>
<Legend
textStyle={{ fontSize: '15', fill: '#5c5c5c', textBaseline: 'middle' }}
marker="circle"
offsetY={-45}
position="top-right"
position="top-center"
items={[
{
value: 'visitor_count',
......@@ -116,6 +108,7 @@ class StaticBox extends React.Component {
]}
/>
<Axis name="month" />
<Axis name="count" />
<Tooltip
g2-tooltip={{
backgroundColor: '#000',
......@@ -123,15 +116,15 @@ class StaticBox extends React.Component {
color: '#FFFFFF',
}}
crosshairs={{
type: 'y',
type: 'area',
fill: '#000',
stroke: '#000',
}}
/>
<Geom
type="line"
type="area"
position="month*count"
color={['name', ['#FFB879']]}
color={['name', ['rgba(255, 184, 121,0.3)']]}
size={3}
shape="smooth"
/>
......
......@@ -4,6 +4,13 @@
.StaticBox {
padding: 27px 20px;
margin-bottom: 10px;
position: relative;
.searchBox {
position: absolute;
z-index: 1;
left: 0;
top: 0;
}
}
.searchname {
color: #000000;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment