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
417cb1b1
Commit
417cb1b1
authored
5 years ago
by
liang ce
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
图表footer修改
parent
156a5264
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
136 additions
and
26 deletions
+136
-26
Home.vue
src/components/common/Home.vue
+1
-1
SystemReconciliation.vue
...mponents/pages/PaymentManagement/SystemReconciliation.vue
+135
-25
No files found.
src/components/common/Home.vue
View file @
417cb1b1
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
<router-view/>
<router-view/>
</a-layout-content>
</a-layout-content>
<a-layout-footer
style=
"text-align: center"
>
<a-layout-footer
style=
"text-align: center"
>
mingwork后台管理系统
design by mingwork
</a-layout-footer>
</a-layout-footer>
</a-layout>
</a-layout>
</
template
>
</
template
>
...
...
This diff is collapsed.
Click to expand it.
src/components/pages/PaymentManagement/SystemReconciliation.vue
View file @
417cb1b1
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
</div>
</div>
<div
style=
"width: 100%;scroll;position: relative;"
>
<div
style=
"width: 100%;scroll;position: relative;"
>
<div
id=
"subsidyList"
:style=
"
{width: '100%', height: '300px'}">
</div>
<div
id=
"subsidyList"
:style=
"
{width: '100%', height: '300px'}">
</div>
<a-select
placeholder=
"津贴类型"
v-model=
"sceneType"
style=
"width: 120px;position: absolute;right:
5px
;top: 0;"
@
change=
"changeSceneType"
>
<a-select
placeholder=
"津贴类型"
v-model=
"sceneType"
style=
"width: 120px;position: absolute;right:
10%
;top: 0;"
@
change=
"changeSceneType"
>
<a-select-option
value=
"MEAL"
>
餐补
</a-select-option>
<a-select-option
value=
"MEAL"
>
餐补
</a-select-option>
<a-select-option
value=
"TRAVEL"
>
交通补贴
</a-select-option>
<a-select-option
value=
"TRAVEL"
>
交通补贴
</a-select-option>
</a-select>
</a-select>
...
@@ -53,6 +53,11 @@ export default {
...
@@ -53,6 +53,11 @@ export default {
},
},
mounted
()
{
mounted
()
{
// this.drawLine()
// this.drawLine()
window
.
addEventListener
(
'resize'
,
()
=>
{
this
.
$echarts
.
init
(
document
.
getElementById
(
'subsidyList'
)).
resize
()
this
.
$echarts
.
init
(
document
.
getElementById
(
'rechargeLine'
)).
resize
()
this
.
$echarts
.
init
(
document
.
getElementById
(
'consumeLine'
)).
resize
()
})
},
},
methods
:
{
methods
:
{
init
()
{
init
()
{
...
@@ -70,25 +75,58 @@ export default {
...
@@ -70,25 +75,58 @@ export default {
// 绘制图表
// 绘制图表
let
xAxisData
=
[]
let
xAxisData
=
[]
let
data
=
[]
let
data
=
[]
let
dataAmount
=
0
this
.
SubsidyListDataList
.
map
(
item
=>
{
this
.
SubsidyListDataList
.
map
(
item
=>
{
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
data
.
push
(
item
.
subsidyTotalAmount
)
data
.
push
(
item
.
subsidyTotalAmount
?
item
.
subsidyTotalAmount
:
0
)
dataAmount
=
dataAmount
+
item
.
subsidyTotalAmount
})
})
let
unit
=
this
.
month
===
undefined
?
'月'
:
'日'
let
color
=
this
.
sceneType
===
'MEAL'
?
[
'#3F9EFE'
]
:
[
`#FF4A7A`
]
myChart
.
setOption
({
myChart
.
setOption
({
title
:
{
text
:
'发放津贴金额'
},
color
:
color
,
title
:
{
text
:
'发放津贴金额'
,
textStyle
:
{
fontSize
:
14
,
fontWeight
:
'normal'
}
},
tooltip
:
{
tooltip
:
{
trigger
:
'axis'
,
trigger
:
'axis'
,
axisPointer
:
{
axisPointer
:
{
type
:
'shadow'
type
:
'shadow'
},
formatter
:
function
(
params
)
{
var
res
=
`<div><p>时间:
${
params
[
0
].
name
}${
unit
}
</p></div>`
for
(
var
i
=
0
;
i
<
params
.
length
;
i
++
)
{
res
+=
'<p>'
+
params
[
i
].
seriesName
+
':¥ '
+
params
[
i
].
data
.
toFixed
(
2
)
+
'</p>'
}
return
res
}
}
},
},
legend
:
{
legend
:
{
data
:
[
`
${
this
.
sceneType
===
'MEAL'
?
'餐补'
:
'交通补贴'
}
`
]
data
:
[
`
${
this
.
sceneType
===
'MEAL'
?
'餐补'
:
'交通补贴'
}
`
],
formatter
:
function
(
name
)
{
return
`
${
name
}
${
dataAmount
}
元`
},
itemGap
:
40
},
},
xAxis
:
{
xAxis
:
[
data
:
xAxisData
{
name
:
`(
${
this
.
month
===
undefined
?
'月'
:
'日'
}
)`
,
// 给X轴加单位
// nameLocation: 'middle',
type
:
'category'
,
data
:
xAxisData
,
axisTick
:
{
show
:
false
}
}
],
yAxis
:
{
name
:
'(元)'
,
type
:
'value'
},
},
yAxis
:
{},
series
:
[{
series
:
[{
name
:
`
${
this
.
sceneType
===
'MEAL'
?
'餐补'
:
'交通补贴'
}
`
,
name
:
`
${
this
.
sceneType
===
'MEAL'
?
'餐补'
:
'交通补贴'
}
`
,
type
:
'bar'
,
type
:
'bar'
,
...
@@ -103,29 +141,62 @@ export default {
...
@@ -103,29 +141,62 @@ export default {
let
xAxisData
=
[]
let
xAxisData
=
[]
let
data1
=
[]
let
data1
=
[]
let
data2
=
[]
let
data2
=
[]
let
data1Amount
=
0
let
data2Amount
=
0
this
.
RechargeDataList
.
map
(
item
=>
{
this
.
RechargeDataList
.
map
(
item
=>
{
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
data1
.
push
(
item
.
externalRechargeAmount
?
item
.
externalRechargeAmount
:
0
)
data1
.
push
(
item
.
externalRechargeAmount
?
item
.
externalRechargeAmount
:
0
)
data1Amount
+=
item
.
externalRechargeAmount
data2
.
push
(
item
.
internalRechargeAmount
?
item
.
internalRechargeAmount
:
0
)
data2
.
push
(
item
.
internalRechargeAmount
?
item
.
internalRechargeAmount
:
0
)
data2Amount
+=
item
.
internalRechargeAmount
})
})
let
unit
=
this
.
month
===
undefined
?
'月'
:
'日'
myChart
.
setOption
({
myChart
.
setOption
({
color
:
[
'#3F9EFE'
,
'#FF4A7A'
],
title
:
{
text
:
'充值金额'
},
title
:
{
text
:
'充值金额'
},
legend
:
{
legend
:
{
data
:
[
'支付宝充值'
,
'现金充值'
]
data
:
[
'支付宝充值'
,
'现金充值'
],
formatter
:
function
(
name
)
{
if
(
name
===
'支付宝充值'
)
{
return
`
${
name
}
${
data1Amount
}
元`
}
else
{
return
`
${
name
}
${
data2Amount
}
元`
}
},
itemGap
:
40
},
},
grid
:
{
grid
:
{
left
:
'10%'
left
:
'10%'
,
right
:
'10%'
},
},
tooltip
:
{
tooltip
:
{
trigger
:
'axis'
,
trigger
:
'axis'
,
axisPointer
:
{
axisPointer
:
{
type
:
'shadow'
type
:
'shadow'
},
formatter
:
function
(
params
)
{
var
res
=
`<div><p>时间:
${
params
[
0
].
name
}${
unit
}
</p></div>`
for
(
var
i
=
0
;
i
<
params
.
length
;
i
++
)
{
res
+=
'<p>'
+
params
[
i
].
seriesName
+
':¥ '
+
params
[
i
].
data
.
toFixed
(
2
)
+
'</p>'
}
return
res
}
}
},
},
xAxis
:
{
xAxis
:
[
data
:
xAxisData
{
name
:
`(
${
unit
}
)`
,
// 给X轴加单位
// nameLocation: 'middle',
type
:
'category'
,
data
:
xAxisData
,
axisTick
:
{
show
:
false
}
}
],
yAxis
:
{
name
:
'(元)'
,
type
:
'value'
},
},
yAxis
:
{},
series
:
[{
series
:
[{
name
:
'支付宝充值'
,
name
:
'支付宝充值'
,
type
:
'bar'
,
type
:
'bar'
,
...
@@ -145,30 +216,72 @@ export default {
...
@@ -145,30 +216,72 @@ export default {
let
data1
=
[]
let
data1
=
[]
let
data2
=
[]
let
data2
=
[]
let
data3
=
[]
let
data3
=
[]
this
.
ConsumeDataList
.
map
(
item
=>
{
let
data1Amount
=
0
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
let
data2Amount
=
0
data1
.
push
(
item
.
internalConsumeRealityAmount
?
item
.
internalConsumeRealityAmount
:
0
)
let
data3Amount
=
0
data2
.
push
(
item
.
internalConsumeSubsidyAmount
?
item
.
internalConsumeSubsidyAmount
:
0
)
data3
.
push
(
item
.
externalConsumeRealityAmount
?
item
.
externalConsumeRealityAmount
:
0
)
})
// internalConsumeRealityAmount 员工现金
// internalConsumeRealityAmount 员工现金
// internalConsumeSubsidyAmount 津贴
// internalConsumeSubsidyAmount 津贴
// externalConsumeRealityAmount 访客消费
// externalConsumeRealityAmount 访客消费
// .toFixed(2) + '元'
let
unit
=
this
.
month
===
undefined
?
'月'
:
'日'
this
.
ConsumeDataList
.
map
(
item
=>
{
xAxisData
.
push
(
parseInt
(
item
.
abscissaKey
))
data1
.
push
(
item
.
internalConsumeRealityAmount
?
item
.
internalConsumeRealityAmount
:
0.00
)
data1Amount
=
data1Amount
+
item
.
internalConsumeRealityAmount
data2
.
push
(
item
.
internalConsumeSubsidyAmount
?
item
.
internalConsumeSubsidyAmount
:
0.00
)
data2Amount
=
data1Amount
+
item
.
internalConsumeSubsidyAmount
data3
.
push
(
item
.
externalConsumeRealityAmount
?
item
.
externalConsumeRealityAmount
:
0.00
)
data3Amount
=
data1Amount
+
item
.
externalConsumeRealityAmount
})
myChart
.
setOption
({
myChart
.
setOption
({
color
:
[
'#B87EE5'
,
'#0066CC'
,
'#EB597B'
],
title
:
{
text
:
'消费金额'
},
title
:
{
text
:
'消费金额'
},
legend
:
{
data
:
[
`员工现金消费`
,
`员工津贴消费`
,
`访客消费`
],
formatter
:
function
(
name
)
{
if
(
name
===
'员工现金消费'
)
{
return
`
${
name
}
${
data1Amount
}
元`
}
else
if
(
name
===
'员工津贴消费'
)
{
return
`
${
name
}
${
data2Amount
}
元`
}
else
{
return
`
${
name
}
${
data3Amount
}
元`
}
},
itemGap
:
40
},
grid
:
{
left
:
'10%'
,
right
:
'10%'
},
tooltip
:
{
tooltip
:
{
trigger
:
'axis'
,
trigger
:
'axis'
,
axisPointer
:
{
axisPointer
:
{
type
:
'shadow'
type
:
'shadow'
},
formatter
:
function
(
params
)
{
var
res
=
`<div><p>时间:
${
params
[
0
].
name
}${
unit
}
</p></div>`
for
(
var
i
=
0
;
i
<
params
.
length
;
i
++
)
{
res
+=
'<p>'
+
params
[
i
].
seriesName
+
':¥ '
+
params
[
i
].
data
.
toFixed
(
2
)
+
'</p>'
}
return
res
}
}
},
},
xAxis
:
{
xAxis
:
{
data
:
xAxisData
name
:
`(
${
this
.
month
===
undefined
?
'月'
:
'日'
}
)`
,
// 给X轴加单位
// nameLocation: 'middle',
type
:
'category'
,
data
:
xAxisData
,
axisTick
:
{
show
:
false
}
},
},
legend
:
{
yAxis
:
{
data
:
[
'员工现金消费'
,
'员工津贴消费'
,
'访客消费'
]
name
:
'(元)'
,
type
:
'value'
// axisLabel: {
// formatter: '{value}元'
// }
},
},
yAxis
:
{},
series
:
[{
series
:
[{
name
:
'员工现金消费'
,
name
:
'员工现金消费'
,
type
:
'bar'
,
type
:
'bar'
,
...
@@ -184,9 +297,6 @@ export default {
...
@@ -184,9 +297,6 @@ export default {
}]
}]
})
})
},
},
// handleChange (value) {
// console.log(`selected ${value}`)
// },
changeSceneType
(
value
)
{
changeSceneType
(
value
)
{
this
.
sceneType
=
value
this
.
sceneType
=
value
this
.
getStatisticsSubsidyData
()
this
.
getStatisticsSubsidyData
()
...
...
This diff is collapsed.
Click to expand it.
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