diff --git a/src/components/Charts/Radar/index.js b/src/components/Charts/Radar/index.js
index 1da52c3813c1a8770ad788c0a06d7d45606a3466..b3c1afcfe2bc13f05ecddd2c7efeccaae0a9508a 100644
--- a/src/components/Charts/Radar/index.js
+++ b/src/components/Charts/Radar/index.js
@@ -53,9 +53,11 @@ class Radar extends PureComponent {
hasLegend = true,
fit = true,
tickCount = 4,
- margin = [16, 30, 16, 30] } = this.props;
+ margin = [24, 30, 16, 30] } = this.props;
- const colors = ['#1890FF', '#FACC14', '#2FC25B'];
+ const colors = [
+ '#1890FF', '#FACC14', '#2FC25B', '#8543E0', '#F04864', '#13C2C2', '#fa8c16', '#a0d911',
+ ];
if (!data || (data && data.length < 1)) {
return;
@@ -87,16 +89,40 @@ class Radar extends PureComponent {
chart.axis('label', {
line: null,
+ labelOffset: 8,
+ labels: {
+ label: {
+ fill: 'rgba(0, 0, 0, .65)',
+ },
+ },
+ grid: {
+ line: {
+ stroke: '#e9e9e9',
+ lineWidth: 1,
+ lineDash: [0, 0],
+ },
+ },
});
chart.axis('value', {
grid: {
type: 'polygon',
+ line: {
+ stroke: '#e9e9e9',
+ lineWidth: 1,
+ lineDash: [0, 0],
+ },
+ },
+ labels: {
+ label: {
+ fill: 'rgba(0, 0, 0, .65)',
+ },
},
});
chart.line().position('label*value').color('name', colors);
- chart.point().position('label*value').color('name', colors).shape('circle');
+ chart.point().position('label*value').color('name', colors).shape('circle')
+ .size(3);
chart.render();
@@ -129,7 +155,7 @@ class Radar extends PureComponent {
return (
- { title &&
{title}
}
+ {title &&
{title}
}
{
hasLegend && (
@@ -147,9 +173,6 @@ class Radar extends PureComponent {
{item.name}
{item.value}
- {
- i !== (legendData.length - 1) &&
- }
))
diff --git a/src/components/Charts/Radar/index.less b/src/components/Charts/Radar/index.less
index 1978111f4561b4306665d657109425c3bf0602d3..a3e85eeb44f4f5f87e1d510a559902f4d33d3020 100644
--- a/src/components/Charts/Radar/index.less
+++ b/src/components/Charts/Radar/index.less
@@ -7,33 +7,37 @@
.legendItem {
position: relative;
text-align: center;
- p {
- cursor: pointer;
- }
+ cursor: pointer;
+ color: @text-color-secondary;
+ line-height: 22px;
h6 {
color: @heading-color;
padding-left: 16px;
font-size: 24px;
line-height: 32px;
- margin-top: 2px;
+ margin-top: 4px;
}
- .split {
+ &:after {
background-color: @border-color-split;
position: absolute;
top: 8px;
right: 0;
height: 40px;
width: 1px;
+ content: '';
}
}
+ > :last-child .legendItem:after {
+ display: none;
+ }
.dot {
- border-radius: 8px;
+ border-radius: 6px;
display: inline-block;
- margin-right: 8px;
+ margin-right: 6px;
position: relative;
top: -1px;
- height: 8px;
- width: 8px;
+ height: 6px;
+ width: 6px;
}
}
}
diff --git a/src/routes/Dashboard/Workplace.js b/src/routes/Dashboard/Workplace.js
index d18c7248393a8900db881f47d656f903a348b94e..935a3a58d4abe2e077cf903b60629bf6b257695f 100644
--- a/src/routes/Dashboard/Workplace.js
+++ b/src/routes/Dashboard/Workplace.js
@@ -189,9 +189,13 @@ export default class Workplace extends PureComponent {
}
title={
-
- {item.user.name} 在 xx 新建了项目 xxxx
-
+
+ {item.user.name}
+
+
+ 在 xx 新建了项目 xxxx
+
+
}
description={
@@ -222,21 +226,15 @@ export default class Workplace extends PureComponent {
- {
-
- }
+
@@ -246,8 +244,8 @@ export default class Workplace extends PureComponent {
members.map(item => (
-
- {item.title}
+
+ {item.title}
))
diff --git a/src/routes/Dashboard/Workplace.less b/src/routes/Dashboard/Workplace.less
index 50a0ce458441c800e4aefc613df81dea1f38162a..0174a3170b30a92b4673c8fc150171d6ad4014c5 100644
--- a/src/routes/Dashboard/Workplace.less
+++ b/src/routes/Dashboard/Workplace.less
@@ -2,11 +2,12 @@
@import "../../utils/utils.less";
.activitiesList {
- padding: 0 24px 24px 24px;
- :global {
- .ant-list-item-meta-title:hover {
- color: @text-color;
- }
+ padding: 0 24px 8px 24px;
+ .username {
+ color: @text-color;
+ }
+ .operation {
+ font-weight: normal;
}
}
@@ -80,28 +81,21 @@
}
.members {
- margin-bottom: 35px;
a {
display: block;
- margin-bottom: 24px;
+ margin: 12px 0;
line-height: 24px;
height: 24px;
.textOverflow();
- img {
- border-radius: 24px;
- display: inline;
- position: relative;
- top: -2px;
- width: 24px;
- height: 24px;
- margin-right: 12px;
- vertical-align: middle;
- }
- span {
+ .member {
font-size: @font-size-base;
color: @text-color;
line-height: 24px;
max-width: 100px;
+ vertical-align: top;
+ margin-left: 12px;
+ transition: all .3s;
+ display: inline-block;
.textOverflow();
}
&:hover {