Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
R
robot-monitor
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
JIRA
JIRA
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
汪晓凯
robot-monitor
Commits
59e9a8d6
Commit
59e9a8d6
authored
Jul 26, 2018
by
wxk
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
充提记录增加币种筛选功能
parent
aec032a0
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
32 additions
and
6 deletions
+32
-6
RobotDetails.vue
src/views/RobotDetails.vue
+30
-4
overview.vue
src/views/overview.vue
+2
-2
No files found.
src/views/RobotDetails.vue
View file @
59e9a8d6
...
@@ -256,13 +256,20 @@
...
@@ -256,13 +256,20 @@
<el-checkbox-button
v-for=
"(option,index) in options1"
:label=
"index+''"
:key=
"option"
>
{{
option
}}
</el-checkbox-button>
<el-checkbox-button
v-for=
"(option,index) in options1"
:label=
"index+''"
:key=
"option"
>
{{
option
}}
</el-checkbox-button>
</el-checkbox-group>
</el-checkbox-group>
</div>
</div>
<div
class=
"select-bar-content
status-select fl smal
l"
>
<div
class=
"select-bar-content
f
l"
>
<span
class=
"title"
>
状态
</span>
<span
class=
"title"
>
状态
</span>
<el-checkbox-button
:indeterminate=
"isIndeterminate3"
v-model=
"checkAll3"
@
change=
"handleCheckAllChange3"
>
全部
</el-checkbox-button>
<el-checkbox-button
:indeterminate=
"isIndeterminate3"
v-model=
"checkAll3"
@
change=
"handleCheckAllChange3"
>
全部
</el-checkbox-button>
<el-checkbox-group
v-model=
"checkedStates1"
@
change=
"handleCheckedChange3"
>
<el-checkbox-group
v-model=
"checkedStates1"
@
change=
"handleCheckedChange3"
>
<el-checkbox-button
v-for=
"(state,index) in states1"
:label=
"index+''"
:key=
"state"
>
{{
state
}}
</el-checkbox-button>
<el-checkbox-button
v-for=
"(state,index) in states1"
:label=
"index+''"
:key=
"state"
>
{{
state
}}
</el-checkbox-button>
</el-checkbox-group>
</el-checkbox-group>
</div>
</div>
<div
class=
"select-bar-content fl"
>
<span
class=
"title"
>
币种
</span>
<el-checkbox-button
:indeterminate=
"isIndeterminate4"
v-model=
"checkAll4"
@
change=
"handleCheckAllChange4"
>
全部
</el-checkbox-button>
<el-checkbox-group
v-model=
"checkedCoins"
@
change=
"handleCheckedChange4"
>
<el-checkbox-button
v-for=
"coin in coins"
:label=
"coin"
:key=
"coin"
>
{{
coin
}}
</el-checkbox-button>
</el-checkbox-group>
</div>
</div>
</div>
<el-date-picker
<el-date-picker
class=
"fr"
class=
"fr"
...
@@ -509,6 +516,10 @@
...
@@ -509,6 +516,10 @@
checkAll3
:
false
,
checkAll3
:
false
,
checkedStates1
:
[],
checkedStates1
:
[],
states1
:
[
"成功"
,
"失败"
],
states1
:
[
"成功"
,
"失败"
],
isIndeterminate4
:
true
,
//币种筛选
checkAll4
:
false
,
checkedCoins
:
[],
coins
:
[],
Loading
:
false
,
//充提币后数据加载标志
Loading
:
false
,
//充提币后数据加载标志
transactionLoading
:
false
,
//充提记录查询加载
transactionLoading
:
false
,
//充提记录查询加载
recordsLoading
:
false
,
//交易记录查询加载
recordsLoading
:
false
,
//交易记录查询加载
...
@@ -520,7 +531,7 @@
...
@@ -520,7 +531,7 @@
methods
:
{
methods
:
{
//页面初始化
//页面初始化
init
()
{
init
()
{
// this.robotDetailInfo = JSON.parse(sessionStorage.getItem('robotDetailInfo'))
;
this
.
coins
=
[
this
.
robotDetailInfo
.
coin
,
this
.
robotDetailInfo
.
base
]
;
this
.
getWalletInfo
();
this
.
getWalletInfo
();
this
.
getTransaction
();
this
.
getTransaction
();
this
.
getRecords
();
this
.
getRecords
();
...
@@ -716,9 +727,10 @@
...
@@ -716,9 +727,10 @@
//查询充提记录
//查询充提记录
getRecords
(
params
)
{
getRecords
(
params
)
{
this
.
recordsLoading
=
true
;
this
.
recordsLoading
=
true
;
const
Coin
=
this
.
checkedCoins
?
this
.
checkedCoins
:
this
.
coins
;
const
baseParams
=
{
const
baseParams
=
{
account
:
this
.
robotDetailInfo
.
account
,
account
:
this
.
robotDetailInfo
.
account
,
coin
:
[
this
.
robotDetailInfo
.
coin
,
this
.
robotDetailInfo
.
base
]
,
coin
:
Coin
,
page
:
"1"
,
page
:
"1"
,
size
:
this
.
pageSize1
+
''
,
size
:
this
.
pageSize1
+
''
,
opt
:
this
.
checkedOptions1
,
opt
:
this
.
checkedOptions1
,
...
@@ -766,7 +778,8 @@
...
@@ -766,7 +778,8 @@
handleCurrentChange
(
val
)
{
handleCurrentChange
(
val
)
{
this
.
getTransaction
({
page
:
val
+
''
});
this
.
getTransaction
({
page
:
val
+
''
});
},
},
//充提记录筛选
/*充提记录筛选*/
//类型筛选
handleCheckAllChange2
(
val
)
{
handleCheckAllChange2
(
val
)
{
this
.
checkedOptions1
=
val
?
[
'0'
,
'1'
]
:
[];
this
.
checkedOptions1
=
val
?
[
'0'
,
'1'
]
:
[];
// console.log(this.checkedOptions1);
// console.log(this.checkedOptions1);
...
@@ -779,6 +792,7 @@
...
@@ -779,6 +792,7 @@
this
.
isIndeterminate2
=
checkedCount
>
0
&&
checkedCount
<
this
.
options1
.
length
;
this
.
isIndeterminate2
=
checkedCount
>
0
&&
checkedCount
<
this
.
options1
.
length
;
this
.
getRecords
();
this
.
getRecords
();
},
},
//状态筛选
handleCheckAllChange3
(
val
)
{
handleCheckAllChange3
(
val
)
{
this
.
checkedStates1
=
val
?
[
'0'
,
'1'
]
:
[];
this
.
checkedStates1
=
val
?
[
'0'
,
'1'
]
:
[];
this
.
isIndeterminate3
=
false
;
this
.
isIndeterminate3
=
false
;
...
@@ -790,6 +804,18 @@
...
@@ -790,6 +804,18 @@
this
.
isIndeterminate3
=
checkedCount
>
0
&&
checkedCount
<
this
.
states1
.
length
;
this
.
isIndeterminate3
=
checkedCount
>
0
&&
checkedCount
<
this
.
states1
.
length
;
this
.
getRecords
();
this
.
getRecords
();
},
},
//币种筛选
handleCheckAllChange4
(
val
)
{
this
.
checkedCoins
=
val
?
this
.
coins
:
[];
this
.
isIndeterminate4
=
false
;
this
.
getRecords
();
},
handleCheckedChange4
(
value
)
{
let
checkedCount
=
value
.
length
;
this
.
checkAll4
=
checkedCount
===
this
.
coins
.
length
;
this
.
isIndeterminate4
=
checkedCount
>
0
&&
checkedCount
<
this
.
coins
.
length
;
this
.
getRecords
();
},
//分页
//分页
handleSizeChange1
(
val
)
{
handleSizeChange1
(
val
)
{
this
.
pageSize1
=
val
+
''
;
this
.
pageSize1
=
val
+
''
;
...
...
src/views/overview.vue
View file @
59e9a8d6
...
@@ -111,14 +111,14 @@
...
@@ -111,14 +111,14 @@
<div
class=
"coin"
>
<div
class=
"coin"
>
<span>
{{
item
.
coin
}}
余额
</span>
<span>
{{
item
.
coin
}}
余额
</span>
<div
class=
"sum"
>
<div
class=
"sum"
>
<span>
{{
item
.
base
_amount
}}
</span>
<span>
{{
item
.
coin
_amount
}}
</span>
<span>
{{
item
.
coin
}}
</span>
<span>
{{
item
.
coin
}}
</span>
</div>
</div>
</div>
</div>
<div
class=
"base"
>
<div
class=
"base"
>
<span>
{{
item
.
base
}}
余额
</span>
<span>
{{
item
.
base
}}
余额
</span>
<div
class=
"sum"
>
<div
class=
"sum"
>
<span>
{{
item
.
coin
_amount
}}
</span>
<span>
{{
item
.
base
_amount
}}
</span>
<span>
{{
item
.
base
}}
</span>
<span>
{{
item
.
base
}}
</span>
</div>
</div>
</div>
</div>
...
...
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