Commit cf2faf5f authored by wxk's avatar wxk

add

parent 70d1debe
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
</div> </div>
<el-row :gutter="20" class="operation-area"> <el-row :gutter="20" class="operation-area">
<el-col :span="16"> <el-col :span="16">
<div class="dashboard" :class="[robotDetailInfo.status]"> <div class="dashboard" :class="[robotDetailInfo.status || 'normal']">
<div class="chart-box"> <div class="chart-box">
<p class="title">今日盈亏</p> <p class="title">今日盈亏</p>
<p v-show="robotDetailInfo.today_profit>0" class="data gain">+{{(robotDetailInfo.today_profit*100).toFixed(2)}}%</p> <p v-show="robotDetailInfo.today_profit>0" class="data gain">+{{(robotDetailInfo.today_profit*100).toFixed(2)}}%</p>
...@@ -232,6 +232,136 @@ ...@@ -232,6 +232,136 @@
</div> </div>
</el-col> </el-col>
</el-row> </el-row>
<!--交易记录-->
<div class="record-box">
<div class="title-box clearfix">
<span class="title">交易记录</span>
<div class="select-bar fr clearfix">
<div class="select-bar-content fl">
<span class="title">类型</span>
<el-checkbox-button :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedOptions" @change="handleCheckedChange">
<el-checkbox-button v-for="option in options" :label="option" :key="option">{{option}}</el-checkbox-button>
</el-checkbox-group>
</div>
<div class="select-bar-content status-select fl">
<span class="title">状态</span>
<el-checkbox-button :indeterminate="isIndeterminate1" v-model="checkAll1" @change="handleCheckAllChange1">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedStates" @change="handleCheckedChange1">
<el-checkbox-button v-for="state in states" :label="state" :key="state">{{state}}</el-checkbox-button>
</el-checkbox-group>
</div>
</div>
<el-date-picker
class="fr"
v-model="value6"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div>
<el-table
:data="list"
stripe
style="width: 100%">
<el-table-column
label="日期"
width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.time }}</span>
</template>
</el-table-column>
<el-table-column
label="姓名"
width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.fee }}</span>
</template>
</el-table-column>
<el-table-column
label="地址">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.sum }}</span>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:page-sizes="[10, 20, 30]"
:page-size="10"
layout="total, sizes, prev, pager, next"
:total="400">
</el-pagination>
</div>
<!--充提记录-->
<div class="record-box">
<div class="title-box clearfix">
<span class="title">充提记录</span>
<div class="select-bar fr clearfix">
<div class="select-bar-content fl">
<span class="title">类型</span>
<el-checkbox-button :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedOptions1" @change="handleCheckedChange">
<el-checkbox-button v-for="option in options1" :label="option" :key="option">{{option}}</el-checkbox-button>
</el-checkbox-group>
</div>
<div class="select-bar-content status-select fl small">
<span class="title">状态</span>
<el-checkbox-button :indeterminate="isIndeterminate1" v-model="checkAll1" @change="handleCheckAllChange1">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedStates1" @change="handleCheckedChange1">
<el-checkbox-button v-for="state in states1" :label="state" :key="state">{{state}}</el-checkbox-button>
</el-checkbox-group>
</div>
</div>
<el-date-picker
class="fr"
v-model="value6"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
start-placeholder="开始日期"
end-placeholder="结束日期">
</el-date-picker>
</div>
<el-table
:data="list"
stripe
style="width: 100%">
<el-table-column
label="日期"
width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.time }}</span>
</template>
</el-table-column>
<el-table-column
label="姓名"
width="180">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.fee }}</span>
</template>
</el-table-column>
<el-table-column
label="地址">
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.sum }}</span>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage4"
:page-sizes="[10, 20, 30]"
:page-size="10"
layout="total, sizes, prev, pager, next"
:total="400">
</el-pagination>
</div>
</div> </div>
</template> </template>
...@@ -252,6 +382,61 @@ ...@@ -252,6 +382,61 @@
innerVisible1: false,//提现确认弹框 innerVisible1: false,//提现确认弹框
recharge_list_value: '',//充值时候选择的账户 recharge_list_value: '',//充值时候选择的账户
account_symbol: '',//币种 account_symbol: '',//币种
value6: '', //时间筛选值
/*交易记录参数*/
isIndeterminate: true,
checkAll: false,
checkedOptions: [],
options: ["买入", "卖出"],
checkedStates: [],
states: ["挂单中", "完全成交", "已撤单", "部分成交"],
list: [{
id: "123", //单号
platform: "zhaobi", //交易所
account: "b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2",
coin: "DCR", //目标币种
base: "USDT", //基础币种
opt: "0", //操作 0为买入 1为卖出
price: 1.20000000, //单价
amount: 123.00000000, //数量
fee: 0.10000000, //手续费
sum: 124.00000000, //总价
status: "0", //状态0挂单中 1完全成交2撤单3部分成交
time: "2018-06-28 14:12:59"
},{
id: "123", //单号
platform: "zhaobi", //交易所
account: "b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2",
coin: "DCR", //目标币种
base: "USDT", //基础币种
opt: "0", //操作 0为买入 1为卖出
price: 1.20000000, //单价
amount: 123.00000000, //数量
fee: 0.10000000, //手续费
sum: 124.00000000, //总价
status: "0", //状态0挂单中 1完全成交2撤单3部分成交
time: "2018-06-28 14:12:59"
},{
id: "123", //单号
platform: "zhaobi", //交易所
account: "b15a4f6c5c1163b5f80715c9bd87d5118ec4b5668cb29f148eeceec61ddeadc2",
coin: "DCR", //目标币种
base: "USDT", //基础币种
opt: "0", //操作 0为买入 1为卖出
price: 1.20000000, //单价
amount: 123.00000000, //数量
fee: 0.10000000, //手续费
sum: 124.00000000, //总价
status: "0", //状态0挂单中 1完全成交2撤单3部分成交
time: "2018-06-28 14:12:59"
}],
/*充提记录参数*/
isIndeterminate1: true,
checkAll1: false,
checkedOptions1: [],
options1: ["充币", "提币"],
checkedStates1: [],
states1: ["失败", "成功"],
} }
}, },
props: ['robotDetailInfo','robotBankList'], props: ['robotDetailInfo','robotBankList'],
...@@ -351,7 +536,27 @@ ...@@ -351,7 +536,27 @@
clickWithdraw(symbol) { clickWithdraw(symbol) {
this.account_symbol = symbol; this.account_symbol = symbol;
this.dialogFormVisible1 = true; this.dialogFormVisible1 = true;
},
//交易记录筛选
handleCheckAllChange(val) {
this.checkedOptions = val ? this.options : [];
this.isIndeterminate = false;
},
handleCheckedChange(value) {
let checkedCount = value.length;
this.checkAll = checkedCount === this.options.length;
this.isIndeterminate = checkedCount > 0 && checkedCount < this.options.length;
},
handleCheckAllChange1(val) {
this.checkedStates = val ? this.states : [];
this.isIndeterminate1 = false;
},
handleCheckedChange1(value) {
let checkedCount = value.length;
this.checkAll1 = checkedCount === this.states.length;
this.isIndeterminate1 = checkedCount > 0 && checkedCount < this.states.length;
} }
}, },
watch: { watch: {
robotBankList(val) { robotBankList(val) {
...@@ -361,6 +566,9 @@ ...@@ -361,6 +566,9 @@
robotDetailInfo() { robotDetailInfo() {
this.getWalletInfo(); this.getWalletInfo();
}, },
value6(val) {
console.log(val[0])
}
} }
} }
</script> </script>
...@@ -566,4 +774,84 @@ ...@@ -566,4 +774,84 @@
color: red; color: red;
margin-top: 30px; margin-top: 30px;
} }
.record-box {
background:rgba(255,255,255,1);
border-radius:4px;
border:1px solid rgba(119,146,167,1);
padding: 20px;
margin: 20px 0 20px 0;
}
.title-box {
margin-bottom: 20px;
&>.title {
display: inline-block;
margin-bottom: 20px;
line-height: 40px;
font-size:18px;
color:rgba(51,51,51,1);
}
}
.select-bar-content {
width: 255px;
margin: 0 0 20px 20px;
background-color: #fff;
border-radius:4px;
border:1px solid rgba(224,224,224,1);
height: 40px;
line-height: 40px;
.title {
display: inline-block;
width: 40px;
text-align: center;
position: relative;
left: -40px;
font-size: 12px;
color:rgba(119,146,167,1);
}
}
</style>
<style>
/*select组件样式覆盖*/
.record-box {
.select-bar-content {
padding: 0 0 0 40px;
.el-checkbox-button {
margin: 0 12px 0 0;
border-radius: 3px;
}
.el-checkbox-button.is-focus .el-checkbox-button__inner {
border-color: #dcdfe6;
}
&>.el-checkbox-button {
margin-left: -40px;
position: relative;
top: -2px;
}
.el-checkbox-group {
margin-top: -41px;
.el-checkbox-button:first-child {
margin-left: 72px;
}
}
}
.select-bar-content.status-select {
width: 400px;
&.small {
width: 255px;
}
}
.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
width: 370px;
}
.el-date-editor .el-range-input, .el-date-editor .el-range-separator {
margin-right: 5px;
}
.el-pagination {
display: inline-block;
position: relative;
margin: 20px 0 0 50%;
transform: translateX(-50%);
}
}
</style> </style>
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