Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
bbb44ba8
Commit
bbb44ba8
authored
Sep 02, 2018
by
afc163
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Improve details
parent
2f57afd1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
18 deletions
+45
-18
src/components/NumberInfo/index.js
src/components/NumberInfo/index.js
+13
-2
src/locales/en-US.js
src/locales/en-US.js
+4
-4
src/pages/Dashboard/Analysis.js
src/pages/Dashboard/Analysis.js
+13
-3
src/pages/Dashboard/Analysis.less
src/pages/Dashboard/Analysis.less
+15
-9
No files found.
src/components/NumberInfo/index.js
View file @
bbb44ba8
...
...
@@ -10,8 +10,19 @@ const NumberInfo = ({ theme, title, subTitle, total, subTotal, status, suffix, g
})}
{...
rest
}
>
{
title
&&
<
div
className
=
{
styles
.
numberInfoTitle
}
>
{
title
}
<
/div>
}
{
subTitle
&&
<
div
className
=
{
styles
.
numberInfoSubTitle
}
>
{
subTitle
}
<
/div>
}
{
title
&&
(
<
div
className
=
{
styles
.
numberInfoTitle
}
title
=
{
typeof
title
===
'
string
'
?
title
:
''
}
>
{
title
}
<
/div
>
)}
{
subTitle
&&
(
<
div
className
=
{
styles
.
numberInfoSubTitle
}
title
=
{
typeof
subTitle
===
'
string
'
?
subTitle
:
''
}
>
{
subTitle
}
<
/div
>
)}
<
div
className
=
{
styles
.
numberInfoValue
}
style
=
{
gap
?
{
marginTop
:
gap
}
:
null
}
>
<
span
>
{
total
}
...
...
src/locales/en-US.js
View file @
bbb44ba8
...
...
@@ -38,19 +38,19 @@ export default {
'
app.home.introduce
'
:
'
introduce
'
,
'
app.analysis.test
'
:
'
Gongzhuan No.{no} shop
'
,
'
app.analysis.introduce
'
:
'
Introduce
'
,
'
app.analysis.total-sales
'
:
'
total s
ales
'
,
'
app.analysis.total-sales
'
:
'
Total S
ales
'
,
'
app.analysis.day-sales
'
:
'
Day Sales
'
,
'
app.analysis.visits
'
:
'
Visits
'
,
'
app.analysis.visits-trend
'
:
'
Visits Trend
'
,
'
app.analysis.visits-ranking
'
:
'
Visits Ranking
'
,
'
app.analysis.day-visits
'
:
'
Day Visits
'
,
'
app.analysis.week
'
:
'
week r
atio
'
,
'
app.analysis.day
'
:
'
day r
atio
'
,
'
app.analysis.week
'
:
'
Week R
atio
'
,
'
app.analysis.day
'
:
'
Day R
atio
'
,
'
app.analysis.payments
'
:
'
Payments
'
,
'
app.analysis.conversion-rate
'
:
'
Conversion Rate
'
,
'
app.analysis.operational-effect
'
:
'
Operational Effect
'
,
'
app.analysis.sales-trend
'
:
'
Stores Sales Trend
'
,
'
app.analysis.sales-ranking
'
:
'
sales r
anking
'
,
'
app.analysis.sales-ranking
'
:
'
Sales R
anking
'
,
'
app.analysis.all-year
'
:
'
All Year
'
,
'
app.analysis.all-month
'
:
'
All Month
'
,
'
app.analysis.all-week
'
:
'
All Week
'
,
...
...
src/pages/Dashboard/Analysis.js
View file @
bbb44ba8
...
...
@@ -456,9 +456,19 @@ class Analysis extends Component {
<
ul
className
=
{
styles
.
rankingList
}
>
{
this
.
rankingListData
.
map
((
item
,
i
)
=>
(
<
li
key
=
{
item
.
title
}
>
<
span
className
=
{
i
<
3
?
styles
.
active
:
''
}
>
{
i
+
1
}
<
/span
>
<
span
>
{
item
.
title
}
<
/span
>
<
span
>
{
numeral
(
item
.
total
).
format
(
'
0,0
'
)}
<
/span
>
<
span
className
=
{
`
${
styles
.
rankingItemNumber
}
${
i
<
3
?
styles
.
active
:
''
}
`
}
>
{
i
+
1
}
<
/span
>
<
span
className
=
{
styles
.
rankingItemTitle
}
title
=
{
item
.
title
}
>
{
item
.
title
}
<
/span
>
<
span
className
=
{
styles
.
rankingItemValue
}
>
{
numeral
(
item
.
total
).
format
(
'
0,0
'
)}
<
/span
>
<
/li
>
))}
<
/ul
>
...
...
src/pages/Dashboard/Analysis.less
View file @
bbb44ba8
...
...
@@ -20,30 +20,36 @@
li {
.clearfix();
margin-top: 16px;
display: flex;
align-items: center;
span {
color: @text-color;
font-size: 14px;
line-height: 22px;
}
span:first-child
{
.rankingItemNumber
{
background-color: @background-color-base;
border-radius: 20px;
display: inline-block;
font-size: 12px;
font-weight: 600;
margin-right:
24
px;
margin-right:
16
px;
height: 20px;
line-height: 20px;
width: 20px;
text-align: center;
margin-top: 1.5px;
&.active {
background-color: #314659;
color: #fff;
}
}
span.active {
//background-color: @primary-color;
background-color: #314659;
color: #fff;
}
span:last-child {
float: right;
.rankingItemTitle {
flex: 1;
white-space: nowrap;
text-overflow: ellipsis;
overflow: hidden;
margin-right: 8px;
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment