Commit 03cc210b authored by wxk's avatar wxk

新增币种充提统计页

parent 1c4a69e3
...@@ -17,9 +17,12 @@ ...@@ -17,9 +17,12 @@
<el-menu-item index="BTY">BTY</el-menu-item> <el-menu-item index="BTY">BTY</el-menu-item>
<el-menu-item index="YCC">YCC</el-menu-item> <el-menu-item index="YCC">YCC</el-menu-item>
</el-submenu> </el-submenu>
<el-menu-item index="account"> <el-menu-item index="/monitor/account">
<span slot="title">银行账户</span> <span slot="title">银行账户</span>
</el-menu-item> </el-menu-item>
<el-menu-item index="/monitor/coinRecharge">
<span slot="title">币种充提统计</span>
</el-menu-item>
</el-menu> </el-menu>
</div> </div>
</template> </template>
...@@ -34,22 +37,22 @@ ...@@ -34,22 +37,22 @@
} }
}, },
created() { created() {
this.active = this.$route.params.name || 'account'; this.active = this.$route.params.name || this.$route.path;
}, },
methods: { methods: {
navClick(index) { navClick(index) {
this.active = index; this.active = index;
if(index != 'account'){ if(index != '/monitor/account' && index != '/monitor/coinRecharge'){
this.$router.push(`/monitor/${index}`); this.$router.push(`/monitor/${index}`);
Bus.$emit('refresh'); Bus.$emit('refresh');
}else{ }else {
this.$router.push('/monitor/account'); this.$router.push(index);
} }
} }
}, },
watch: { watch: {
$route() { $route() {
this.active = this.$route.params.name || 'account'; this.active = this.$route.params.name || this.$route.path;
}, },
}, },
} }
......
...@@ -15,6 +15,8 @@ const Api = { ...@@ -15,6 +15,8 @@ const Api = {
Records: originUrl + "/records", //充提记录 Records: originUrl + "/records", //充提记录
Ticket: originUrl + '/ticket', //查询交易对行情 Ticket: originUrl + '/ticket', //查询交易对行情
Excle: originUrl + '/recordsExcle',//导出充提记录 Excle: originUrl + '/recordsExcle',//导出充提记录
GetCountCoin: originUrl + '/countCoin',//币种充提统计查询
countCoinExcle: originUrl + '/countCoinExcle',//币种充提统计导出
} }
export default Api; export default Api;
...@@ -24,37 +24,40 @@ export default new Router({ ...@@ -24,37 +24,40 @@ export default new Router({
children: children:
[ [
{ {
path: '/monitor/account', path: '/monitor/account',
component: function(resolve){ component: function(resolve){
require(['../views/account.vue'],resolve); require(['../views/account.vue'],resolve);
},
}, },
{ },{
path:"/monitor/:name", path: '/monitor/coinRecharge',
component: function(resolve){ component: function(resolve){
require(['../views/RobotContainer.vue'],resolve); require(['../views/coinRecharge.vue'],resolve);
}, },
children: [ },{
{ path:"/monitor/:name",
path: '/', component: function(resolve){
component: function(resolve){ require(['../views/RobotContainer.vue'],resolve);
require(['../views/overview.vue'],resolve); },
}, children: [
{
path: '/',
component: function(resolve){
require(['../views/overview.vue'],resolve);
}, },
{ },
path: 'RobotDetail', {
component: function(resolve){ path: 'RobotDetail',
require(['../views/RobotDetails.vue'],resolve); component: function(resolve){
}, require(['../views/RobotDetails.vue'],resolve);
}, },
},
] {
path: 'account',
redirect:'/monitor/account',
}
]
} }
] ]
}, },
{
path: '*',
redirect:'/monitor/account',
}
] ]
}) })
...@@ -793,9 +793,11 @@ ...@@ -793,9 +793,11 @@
//交易记录分页 //交易记录分页
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
this.currentPage = 1;
this.getTransaction(); this.getTransaction();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.currentPage = val;
this.getTransaction({page: val + ''}); this.getTransaction({page: val + ''});
}, },
/*充提记录筛选*/ /*充提记录筛选*/
...@@ -839,6 +841,7 @@ ...@@ -839,6 +841,7 @@
//分页 //分页
handleSizeChange1(val) { handleSizeChange1(val) {
this.pageSize1 = val; this.pageSize1 = val;
this.currentPage1 = 1;
this.getRecords(); this.getRecords();
}, },
handleCurrentChange1(val) { handleCurrentChange1(val) {
......
...@@ -431,9 +431,11 @@ ...@@ -431,9 +431,11 @@
//分页 //分页
handleSizeChange(val) { handleSizeChange(val) {
this.pageSize = val; this.pageSize = val;
this.currentPage = 1;
this.getRecords(); this.getRecords();
}, },
handleCurrentChange(val) { handleCurrentChange(val) {
this.currentPage = val;
this.getRecords(val+''); this.getRecords(val+'');
}, },
}, },
......
This diff is collapsed.
...@@ -742,7 +742,7 @@ ...@@ -742,7 +742,7 @@
/*select组件样式覆盖*/ /*select组件样式覆盖*/
.overview { .overview {
.select-bar-content { .select-bar-content {
padding: 2px 0 0 65px; /*padding: 2px 0 0 65px;*/
.el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner { .el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner {
border-radius: 3px; border-radius: 3px;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment