Skip to content

R
robot-monitor
Commit df998225 authored by wxk's avatar wxk
Browse files
Options

账户信息添加标准和占比，交易记录/充提记录位置互换

parent 06d8d283
Hide whitespace changes
Inline Side-by-side
Showing with 93 additions and 77 deletions
src/views/RobotDetails.vue
View file @ df998225
......@@ -86,6 +86,14 @@
<span class="type-name">总量</span>
<span>{{coinInfo.amount}}</span>
</p>
<p class="item">
<span class="type-name">标准</span>
<span>{{robotDetailInfo.coin_normal}}</span>
</p>
<p class="item">
<span class="type-name">比例</span>
<span>{{robotDetailInfo.coin_percent*100+'%'}}（总量/标准）</span>
</p>
</div>
<div class="handle-content" v-loading="Loading" element-loading-text="正在刷新数据">
<div class="handle">
......@@ -105,6 +113,14 @@
<span class="type-name">总量</span>
<span>{{baseInfo.amount}}</span>
</p>
<p class="item">
<span class="type-name">标准</span>
<span>{{robotDetailInfo.base_normal}}</span>
</p>
<p class="item">
<span class="type-name">比例</span>
<span>{{robotDetailInfo.base_percent*100+'%'}}（总量/标准）</span>
</p>
</div>
<!-- 充币弹框 -->
<el-dialog
......@@ -233,31 +249,31 @@
</div>
</el-col>
</el-row>
<!--交易记录-->
<div class="record-box">
<!--充提记录-->
<div class="record-box" v-loading="Loading" element-loading-text="正在刷新数据">
<div class="title-box clearfix">
<span class="title">交易记录</span>
<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, index) in options" :label="index+''" :key="option">{{option}}</el-checkbox-button>
<el-checkbox-button :indeterminate="isIndeterminate2" v-model="checkAll2" @change="handleCheckAllChange2">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedOptions1" @change="handleCheckedChange2">
<el-checkbox-button v-for="(option,index) in options1" :label="index+''" :key="option">{{option}}</el-checkbox-button>
</el-checkbox-group>
</div>
<!-- <div class="select-bar-content status-select fl">
<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="checkedStates" @change="handleCheckedChange1">
<el-checkbox-button v-for="(state,index) in states" :label="index+''" :key="state">{{state}}</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-button v-for="(state,index) in states1" :label="index+''" :key="state">{{state}}</el-checkbox-button>
</el-checkbox-group>
</div>-->
</div>
</div>
<el-date-picker
class="fr"
v-model="transactionTime"
:default-time="['00:00:00', '23:59:59']"
:clearable="false"
v-model="transactionTime1"
:default-time="['00:00:00', '23:59:59']"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
......@@ -266,39 +282,45 @@
</el-date-picker>
</div>
<el-table
v-loading="transactionLoading"
:data="list"
v-loading="recordsLoading"
:data="list1"
stripe
style="width: 100%">
<el-table-column
label="时间"
label="日期"
width="180">
<template slot-scope="scope">
<span>{{ scope.row.time }}</span>
</template>
</el-table-column>
<el-table-column
label="币种">
<template slot-scope="scope">
<span>{{ scope.row.coin }}</span>
</template>
</el-table-column>
<el-table-column
label="类型">
<template slot-scope="scope">
<span>{{ scope.row.opt }}</span>
</template>
</el-table-column>
<el-table-column
label="成交价">
label="充提前数量">
<template slot-scope="scope">
<span>{{ scope.row.price }}</span>
<span>{{ scope.row.beforeRecharge }}</span>
</template>
</el-table-column>
<el-table-column
label="成交数量">
label="充提数量">
<template slot-scope="scope">
<span>{{ scope.row.amount }}</span>
<span>{{ scope.row.transfer_amount }}</span>
</template>
</el-table-column>
<el-table-column
label="成交金额">
label="充提后后数量">
<template slot-scope="scope">
<span>{{ scope.row.sum }}</span>
<span>{{ scope.row.afterRecharge }}</span>
</template>
</el-table-column>
<el-table-column
......@@ -308,49 +330,55 @@
</template>
</el-table-column>
<el-table-column
label="操作用户">
<template slot-scope="scope">
<span>{{ scope.row.user }}</span>
</template>
</el-table-column>
<el-table-column
label="状态">
<template slot-scope="scope">
<el-tag
type="success"
disable-transitions>成功</el-tag>
:type="scope.row.status === '成功' ? 'success' : 'danger'"
disable-transitions>{{scope.row.status}}</el-tag>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currentPage1"
:page-sizes="[10, 20, 30]"
:page-size="10"
:page-size="pageSize1"
layout="total, prev, pager, next, sizes"
:total="total">
:total="total1">
</el-pagination>
</div>
<!--充提记录-->
<div class="record-box" v-loading="Loading" element-loading-text="正在刷新数据">
<!--交易记录-->
<div class="record-box">
<div class="title-box clearfix">
<span class="title">充提记录</span>
<span class="title">交易记录</span>
<div class="select-bar fr clearfix">
<div class="select-bar-content fl">
<span class="title">类型</span>
<el-checkbox-button :indeterminate="isIndeterminate2" v-model="checkAll2" @change="handleCheckAllChange2">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedOptions1" @change="handleCheckedChange2">
<el-checkbox-button v-for="(option,index) in options1" :label="index+''" :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="isIndeterminate3" v-model="checkAll3" @change="handleCheckAllChange3">全部</el-checkbox-button>
<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 :indeterminate="isIndeterminate" v-model="checkAll" @change="handleCheckAllChange">全部</el-checkbox-button>
<el-checkbox-group v-model="checkedOptions" @change="handleCheckedChange">
<el-checkbox-button v-for="(option, index) in options" :label="index+''" :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,index) in states" :label="index+''" :key="state">{{state}}</el-checkbox-button>
</el-checkbox-group>
</div>-->
</div>
<el-date-picker
class="fr"
:clearable="false"
v-model="transactionTime1"
v-model="transactionTime"
:default-time="['00:00:00', '23:59:59']"
:clearable="false"
value-format="yyyy-MM-dd HH:mm:ss"
type="datetimerange"
range-separator="至"
......@@ -359,45 +387,39 @@
</el-date-picker>
</div>
<el-table
v-loading="recordsLoading"
:data="list1"
v-loading="transactionLoading"
:data="list"
stripe
style="width: 100%">
<el-table-column
label="日期"
label="时间"
width="180">
<template slot-scope="scope">
<span>{{ scope.row.time }}</span>
</template>
</el-table-column>
<el-table-column
label="币种">
<template slot-scope="scope">
<span>{{ scope.row.coin }}</span>
</template>
</el-table-column>
<el-table-column
label="类型">
<template slot-scope="scope">
<span>{{ scope.row.opt }}</span>
</template>
</el-table-column>
<el-table-column
label="充提前数量">
label="成交价">
<template slot-scope="scope">
<span>{{ scope.row.beforeRecharge }}</span>
<span>{{ scope.row.price }}</span>
</template>
</el-table-column>
<el-table-column
label="充提数量">
label="成交数量">
<template slot-scope="scope">
<span>{{ scope.row.transfer_amount }}</span>
<span>{{ scope.row.amount }}</span>
</template>
</el-table-column>
<el-table-column
label="充提后后数量">
label="成交金额">
<template slot-scope="scope">
<span>{{ scope.row.afterRecharge }}</span>
<span>{{ scope.row.sum }}</span>
</template>
</el-table-column>
<el-table-column
......@@ -407,28 +429,22 @@
</template>
</el-table-column>
<el-table-column
label="操作用户">
<template slot-scope="scope">
<span>{{ scope.row.user }}</span>
</template>
</el-table-column>
<el-table-column
label="状态">
<template slot-scope="scope">
<el-tag
:type="scope.row.status === '成功' ? 'success' : 'danger'"
disable-transitions>{{scope.row.status}}</el-tag>
type="success"
disable-transitions>成功</el-tag>
</template>
</el-table-column>
</el-table>
<el-pagination
@size-change="handleSizeChange1"
@current-change="handleCurrentChange1"
:current-page="currentPage1"
@size-change="handleSizeChange"
@current-change="handleCurrentChange"
:current-page="currentPage"
:page-sizes="[10, 20, 30]"
:page-size="pageSize1"
:page-size="10"
layout="total, prev, pager, next, sizes"
:total="total1">
:total="total">
</el-pagination>
</div>
</div>
......@@ -906,11 +922,11 @@
height: 140px;
border-radius:4px;
border:1px solid rgba(119,146,167,1);
padding: 19px 0 0 20px;
padding: 10px 0 0 20px;
.handle {
height: 25px;
position: relative;
margin-bottom: 14px;
margin-bottom: 4px;
}
.coin-name {
font-size:18px;
......@@ -939,10 +955,10 @@
margin-bottom: 10px;
}
.item {
line-height: 20px;
font-size:14px;
line-height: 18px;
font-size:13px;
color:rgba(51,51,51,1);
margin-bottom: 4px;
/*margin-bottom: 4px;*/
.type-name {
display: inline-block;
width: 35px;
......
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