diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js index ad180265b85761f1ac27ef92a1be4103f38dc471..28252d38450fe2027c9f27d09831a184529bcf13 100644 --- a/src/components/Charts/Pie/index.js +++ b/src/components/Charts/Pie/index.js @@ -192,7 +192,7 @@ class Pie extends Component { return (
- { title &&

{title}

} + {title &&

{title}

}
{ diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less index bbfcc56da23b87c28588ef75ab9568f2cfb8538f..a9182749b18d988651ba14d47196b6a765b37707 100644 --- a/src/components/Charts/Pie/index.less +++ b/src/components/Charts/Pie/index.less @@ -44,6 +44,9 @@ position: absolute; right: 0; } + .title { + margin-bottom: 16px; + } .total { opacity: 0; position: absolute; @@ -58,6 +61,7 @@ line-height: 22px; height: 22px; margin-bottom: 8px; + font-weight: normal; } & > p { color: @heading-color; diff --git a/src/routes/Dashboard/Analysis.js b/src/routes/Dashboard/Analysis.js index 7b7c5cfd007b1908ccc5df3f5d68c327144c0725..13473943c103875dc0a852e92f858fe711a101f6 100644 --- a/src/routes/Dashboard/Analysis.js +++ b/src/routes/Dashboard/Analysis.js @@ -386,7 +386,7 @@ export default class Analysis extends Component { )} style={{ marginTop: 24 }} > -
+
now.y + pre, 0))} data={salesPieData} valueFormat={val => yuan(val)} - height={314} + height={260} />
diff --git a/src/routes/Dashboard/Analysis.less b/src/routes/Dashboard/Analysis.less index 9ccdd3a969803fae03d930d8547a67588710a9ff..92b28a58990f1c6c2db91497c5e6754f53489d39 100644 --- a/src/routes/Dashboard/Analysis.less +++ b/src/routes/Dashboard/Analysis.less @@ -104,9 +104,6 @@ .ant-tabs-bar { border-bottom: none; } - .ant-tabs-ink-bar { - top: 1px; - } .ant-tabs-nav-container-scrolling { padding-left: 40px; padding-right: 40px; @@ -141,10 +138,8 @@ margin-top: 16px; } - .salesCard { - .salesBar { - padding: 16px; - } + .salesCard .salesBar { + padding: 16px; } }