Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mingPayPc
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
fengzhaoyu
mingPayPc
Commits
c99d1fed
Commit
c99d1fed
authored
Nov 27, 2019
by
fengzhaoyu
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ISV' of
http://gitlab.roboming.com/Simon/mingPay-web
into ISV
parents
4ecd4865
a5b57749
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
6 deletions
+6
-6
SystemReconciliation.vue
...mponents/pages/PaymentManagement/SystemReconciliation.vue
+6
-6
No files found.
src/components/pages/PaymentManagement/SystemReconciliation.vue
View file @
c99d1fed
...
...
@@ -90,7 +90,7 @@ export default {
fontSize
:
14
,
fontWeight
:
'normal'
},
left
:
'5%'
,
left
:
'5%'
},
tooltip
:
{
trigger
:
'axis'
,
...
...
@@ -143,9 +143,9 @@ export default {
this
.
RechargeDataList
.
map
(
item
=>
{
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
data1
.
push
(
item
.
externalRechargeAmount
?
item
.
externalRechargeAmount
:
0
)
data1Amount
=
(
data1Amount
*
100
+
item
.
externalRechargeAmount
*
100
)
/
100
data1Amount
=
(
data1Amount
*
100
+
item
.
externalRechargeAmount
*
100
)
/
100
data2
.
push
(
item
.
internalRechargeAmount
?
item
.
internalRechargeAmount
:
0
)
data2Amount
=
(
item
.
internalRechargeAmount
*
100
+
data2Amount
*
100
)
/
100
data2Amount
=
(
item
.
internalRechargeAmount
*
100
+
data2Amount
*
100
)
/
100
})
let
unit
=
this
.
month
===
undefined
?
'月'
:
'日'
myChart
.
setOption
({
...
...
@@ -156,7 +156,7 @@ export default {
fontSize
:
14
,
fontWeight
:
'normal'
},
left
:
'5%'
,
left
:
'5%'
},
legend
:
{
data
:
[
'支付宝充值'
,
'现金充值'
],
...
...
@@ -241,7 +241,7 @@ export default {
fontSize
:
14
,
fontWeight
:
'normal'
},
left
:
'5%'
,
left
:
'5%'
},
legend
:
{
data
:
[
`员工现金消费`
,
`员工津贴消费`
,
`访客消费`
],
...
...
@@ -277,7 +277,7 @@ export default {
name
:
`(
${
this
.
month
===
undefined
?
'月'
:
'日'
}
)`
,
// 给X轴加单位
// nameLocation: 'middle',
type
:
'category'
,
data
:
xAxisData
,
data
:
xAxisData
},
yAxis
:
{
name
:
'(元)'
,
...
...
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