diff --git a/src/components/Charts/ChartCard/index.js b/src/components/Charts/ChartCard/index.js
index 2a486d681f3ba59ab7fcb46003afaf4cca3c5379..fd4426738336abac0d222451cf664f7e55c226af 100644
--- a/src/components/Charts/ChartCard/index.js
+++ b/src/components/Charts/ChartCard/index.js
@@ -14,7 +14,7 @@ const ChartCard = ({
{
// eslint-disable-next-line
- total &&
diff --git a/src/components/Charts/ChartCard/index.less b/src/components/Charts/ChartCard/index.less
index 2d60257baab990e8c00c8a3ce530bcc42aa378c5..986cc7d6ffd22aa2104acae8488f9f0de032dd3d 100644
--- a/src/components/Charts/ChartCard/index.less
+++ b/src/components/Charts/ChartCard/index.less
@@ -26,6 +26,7 @@
.textOverflow();
color: @heading-color;
margin-top: 4px;
+ margin-bottom: 0;
font-size: 30px;
line-height: 38px;
height: 38px;
diff --git a/src/components/Charts/Field/index.js b/src/components/Charts/Field/index.js
index ed525c563e90128c03805327648036c1dd4d382e..0f9ace22e466b51926d4e7b369aea0b7edbbc2ff 100644
--- a/src/components/Charts/Field/index.js
+++ b/src/components/Charts/Field/index.js
@@ -3,10 +3,10 @@ import React from 'react';
import styles from './index.less';
const Field = ({ label, value, ...rest }) => (
-
+
{label}
{value}
-
+
);
export default Field;
diff --git a/src/components/Charts/Field/index.less b/src/components/Charts/Field/index.less
index 8242dcc9d2358dcdfb6ec0f2447b14d2736e32af..2848f9db38c77772d203891d76109a93d470cb47 100644
--- a/src/components/Charts/Field/index.less
+++ b/src/components/Charts/Field/index.less
@@ -4,6 +4,7 @@
white-space: nowrap;
overflow: hidden;
text-overflow: ellipsis;
+ margin: 0;
span {
font-size: @font-size-base;
line-height: 22px;
diff --git a/src/components/Charts/Pie/index.js b/src/components/Charts/Pie/index.js
index 770a94ad6398ec511dadb24c61c5ad7089b7e23b..76395f4596afaa409c495d258b9634d2e2bba163 100644
--- a/src/components/Charts/Pie/index.js
+++ b/src/components/Charts/Pie/index.js
@@ -219,7 +219,7 @@ class Pie extends Component {
{subTitle &&
{subTitle}
}
{
// eslint-disable-next-line
- total &&
+ total &&
}
)
diff --git a/src/components/Charts/Pie/index.less b/src/components/Charts/Pie/index.less
index 176566ea2f0c731279765bea5563b53a5cb803c3..9478739835d09f54a3dadaa0715257c911c6aece 100644
--- a/src/components/Charts/Pie/index.less
+++ b/src/components/Charts/Pie/index.less
@@ -15,6 +15,8 @@
top: 50%;
transform: translateY(-50%);
margin: 0 20px;
+ list-style: none;
+ padding: 0;
li {
cursor: pointer;
margin-bottom: 16px;
diff --git a/src/components/Charts/Radar/index.less b/src/components/Charts/Radar/index.less
index 0e9827241f2eeb3d30d3709cb5c4a09ce8e9de7b..378db9c4f8fb0b20d10bbb4083048aedea2379c6 100644
--- a/src/components/Charts/Radar/index.less
+++ b/src/components/Charts/Radar/index.less
@@ -9,12 +9,16 @@
cursor: pointer;
color: @text-color-secondary;
line-height: 22px;
+ p {
+ margin: 0;
+ }
h6 {
color: @heading-color;
padding-left: 16px;
font-size: 24px;
line-height: 32px;
margin-top: 4px;
+ margin-bottom: 0;
}
&:after {
background-color: @border-color-split;
diff --git a/src/components/StandardTable/index.js b/src/components/StandardTable/index.js
index 05179521159880bc1a174434ac4f074f8dad4a5e..f98e9399c97fba76f289c67de7a23bab7f2e437d 100644
--- a/src/components/StandardTable/index.js
+++ b/src/components/StandardTable/index.js
@@ -60,9 +60,9 @@ class StandardTable extends PureComponent {
dataIndex: 'callNo',
sorter: true,
render: val => (
-
+
{val} 万
-
+
),
},
{
@@ -99,11 +99,11 @@ class StandardTable extends PureComponent {
{
title: '操作',
render: () => (
-
+
),
},
];
@@ -127,11 +127,11 @@ class StandardTable extends PureComponent {
+
)}
type="info"
showIcon
diff --git a/src/index.less b/src/index.less
index 5da336e8c149c062b986f0a3aef8b9c0f4a02f0e..bd58c5d5642c3c6145497427a3fc9c4d870fd47a 100644
--- a/src/index.less
+++ b/src/index.less
@@ -1,5 +1,3 @@
-@import '~antd/lib/style/v2-compatible-reset.less';
-
html, body, :global(#root) {
height: 100%;
}
diff --git a/src/layouts/BasicLayout.less b/src/layouts/BasicLayout.less
index d59a45d9e2455ceaa8e7e4f4d8e32f50f4ba38ea..6ab937a8236cbfbdaaacfd9abdafe2118ea3d590 100644
--- a/src/layouts/BasicLayout.less
+++ b/src/layouts/BasicLayout.less
@@ -25,7 +25,7 @@
display: inline-block;
vertical-align: middle;
font-size: 20px;
- margin-left: 12px;
+ margin: 0 0 0 12px;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-weight: 600;
}
diff --git a/src/layouts/UserLayout.js b/src/layouts/UserLayout.js
index 87aff28919480621e22a4b6d8a077434e8d4c0b3..923983d0da6ceba852d159f70204a1003d678c70 100644
--- a/src/layouts/UserLayout.js
+++ b/src/layouts/UserLayout.js
@@ -50,7 +50,7 @@ class UserLayout extends React.PureComponent {
Ant Design
-
Ant Design 是西湖区最具影响力的 Web 设计规范
+
Ant Design 是西湖区最具影响力的 Web 设计规范
{
getRouteData('UserLayout').map(item =>
diff --git a/src/routes/Dashboard/Analysis.less b/src/routes/Dashboard/Analysis.less
index 6ad7c2a0f30c31c2661048a2023f60184f299c72..cdd326e6627bcf4f541be099ab93a68188fbde79 100644
--- a/src/routes/Dashboard/Analysis.less
+++ b/src/routes/Dashboard/Analysis.less
@@ -14,7 +14,9 @@
}
.rankingList {
- margin-top: 25px;
+ margin: 25px 0 0;
+ padding: 0;
+ list-style: none;
li {
.clearfix();
margin-top: 16px;
diff --git a/src/routes/Dashboard/Workplace.js b/src/routes/Dashboard/Workplace.js
index aab68e909354ee1d7bc372be0dce004a70827da7..40e2c90449f99670350d39e9c6430cae512c86b0 100644
--- a/src/routes/Dashboard/Workplace.js
+++ b/src/routes/Dashboard/Workplace.js
@@ -142,8 +142,8 @@ export default class Workplace extends PureComponent {
-
{content}
+
{content}
{owner} 发布在
{href}
{moment(updatedAt).format('YYYY-MM-DD hh:mm')}
diff --git a/src/routes/Profile/AdvancedProfile.js b/src/routes/Profile/AdvancedProfile.js
index 9cb95f84ced4a9ae0e07e3a97edbc7a6ac652aeb..7848a7ccf95e3d4bbb9897df5a6b14457cc1effe 100644
--- a/src/routes/Profile/AdvancedProfile.js
+++ b/src/routes/Profile/AdvancedProfile.js
@@ -92,7 +92,7 @@ const popoverContent = (
未响应} />
-
耗时:2小时25分钟
+
耗时:2小时25分钟
);
diff --git a/src/routes/User/Register.js b/src/routes/User/Register.js
index fbbfbecf0437e4413f4f88596b5d9a77d65baa99..94ebc8889cf619adb2a1cab74db57f038590eb60 100644
--- a/src/routes/User/Register.js
+++ b/src/routes/User/Register.js
@@ -9,9 +9,9 @@ const { Option } = Select;
const InputGroup = Input.Group;
const passwordStatusMap = {
- ok:
强度:强
,
- pass:
强度:中
,
- pool:
强度:太短
,
+ ok:
强度:强
,
+ pass:
强度:中
,
+ pool:
强度:太短
,
};
const passwordProgressMap = {
@@ -163,7 +163,7 @@ export default class Register extends Component {
{passwordStatusMap[this.getPasswordStatus()]}
{this.renderPasswordProgress()}
-
请至少输入 6 个字符。请不要使用容易被猜到的密码。
+
请至少输入 6 个字符。请不要使用容易被猜到的密码。
}
overlayStyle={{ width: 240 }}