Skip to content

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

账户监控ok

parent 5e417df5
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 194 additions and 138 deletions
config/index.js
View file @ d0c365e5
...@@ -11,8 +11,8 @@ module.exports = { ...@@ -11,8 +11,8 @@ module.exports = {
assetsPublicPath: '/', assetsPublicPath: '/',
proxyTable: { proxyTable: {
'/': { '/': {
// target: 'http://47.91.221.203:46657', // target: 'http://47.91.221.203:46657', //
target: 'http://193.112.106.35:46657', // 接口的域名 // target: 'http://193.112.106.35:46657', // 接口的域名
// secure: false, // 如果是https接口，需要配置这个参数 // secure: false, // 如果是https接口，需要配置这个参数
changeOrigin: true, // 如果接口跨域，需要进行这个参数配置 changeOrigin: true, // 如果接口跨域，需要进行这个参数配置
pathRewrite: { pathRewrite: {
......
src/assets/css/common.css 0 → 100644
View file @ d0c365e5
.icon-CNY3,.icon-BTC3,.icon-ETC3,.icon-ETH3,.icon-USDT3,.icon-ZEC3,.icon-LTC3,.icon-BCC3,.icon-BTY3,.icon-YCC3,.icon-BTS3,.icon-SC3,.icon-BTCS3,.icon-DCR3 {
font-size: 30px;
position: relative;
top: 5px;
}
.icon-CNY3{
}
.icon-BTC3{
color:#e6ac00;
}
.icon-BTY3{
color: #e14f55;
}
.icon-ETH3{
color: #ec712e;
}
.icon-ETC3{
color: #3dabcb;
}
.icon-SC3{
color: #7fb131;
}
.icon-ZEC3{
color: #47ad50;
}
.icon-BTS3{
color: #6353b3;
}
.icon-LTC3{
color: #366bb2;
}
.icon-BCC3{
color: #09afd8;
}
.icon-DCR3{
color: #0ea48a;
}
.icon-YCC3{
color: #0276f7;
}
.icon-USDT3{
color: #ccd72f;
font-size: 25px!important;
}
.icon-SC3{
padding-right: 10px;
}
.el-pagination {
display: inline-block;
position: relative;
margin: 20px 0 0 50%;
transform: translateX(-50%);
}
src/assets/font/iconfont.css
View file @ d0c365e5
This diff is collapsed.
src/assets/font/iconfont.js
View file @ d0c365e5
This source diff could not be displayed because it is too large. You can view the blob instead.
src/assets/font/iconfont.svg
View file @ d0c365e5
This diff is collapsed.
src/main.js
View file @ d0c365e5
...@@ -4,6 +4,7 @@ import Vue from 'vue' ...@@ -4,6 +4,7 @@ import Vue from 'vue'
import App from './App' import App from './App'
import router from './router' import router from './router'
import './assets/css/base.css' import './assets/css/base.css'
import './assets/css/common.css'
import 'element-ui/lib/theme-chalk/index.css' import 'element-ui/lib/theme-chalk/index.css'
import ElementUI from 'element-ui'; import ElementUI from 'element-ui';
import './assets/font/iconfont.css' import './assets/font/iconfont.css'
......
src/views/RobotDetails.vue
View file @ d0c365e5
...@@ -280,12 +280,15 @@ ...@@ -280,12 +280,15 @@
end-placeholder="结束日期"> end-placeholder="结束日期">
</el-date-picker> </el-date-picker>
</div> </div>
<!--<div class="count-box"> <div class="count-box">
<span class="title">总计</span> <span class="fl title">总计: </span>
<span>充币总量: </span> <ul class="fl">
<span>提币总量: </span> <li class="fl" v-for="(value,key) in recordsCountList">
<span class="button">导出</span> <span>{{key}}: </span>
</div>--> <span>{{value}}</span>
</li>
</ul>
</div>
<el-table <el-table
v-loading="recordsLoading" v-loading="recordsLoading"
:data="list1" :data="list1"
...@@ -498,6 +501,7 @@ ...@@ -498,6 +501,7 @@
currentPage1: 1, //分页(当前页数) currentPage1: 1, //分页(当前页数)
total1: 0, //记录总条数 total1: 0, //记录总条数
list1: [],//表格数据 list1: [],//表格数据
recordsCountList: [],//充提记录统计
isIndeterminate2: true, isIndeterminate2: true,
checkAll2: false, checkAll2: false,
checkedOptions1: [], checkedOptions1: [],
...@@ -728,6 +732,7 @@ ...@@ -728,6 +732,7 @@
this.recordsLoading = false; this.recordsLoading = false;
let result = res.data.data; let result = res.data.data;
this.total1 = result.count; this.total1 = result.count;
this.recordsCountList = result.total;
if (result.list) { if (result.list) {
this.list1 = result.list.map(item => { this.list1 = result.list.map(item => {
item.fee = item.fee + item.coin; item.fee = item.fee + item.coin;
...@@ -775,7 +780,7 @@ ...@@ -775,7 +780,7 @@
//充提记录筛选 //充提记录筛选
handleCheckAllChange2(val) { handleCheckAllChange2(val) {
this.checkedOptions1 = val ? ['0', '1'] : []; this.checkedOptions1 = val ? ['0', '1'] : [];
console.log(this.checkedOptions1); // console.log(this.checkedOptions1);
this.isIndeterminate2 = false; this.isIndeterminate2 = false;
this.getRecords(); this.getRecords();
}, },
...@@ -1045,7 +1050,6 @@ ...@@ -1045,7 +1050,6 @@
margin: 20px 0 20px 0; margin: 20px 0 20px 0;
} }
.title-box { .title-box {
margin-bottom: 20px;
&>.title { &>.title {
display: inline-block; display: inline-block;
margin-bottom: 20px; margin-bottom: 20px;
...@@ -1054,26 +1058,6 @@ ...@@ -1054,26 +1058,6 @@
color:rgba(51,51,51,1); color:rgba(51,51,51,1);
} }
} }
.count-box {
margin-top: -40px;
.title {
line-height: 40px;
font-size:16px;
color:rgba(51,51,51,1);
}
.button {
padding: 5px 10px;
width: 60px;
height: 25px;
background: rgba(119,146,167,1);
border-radius: 4px;
line-height: 25px;
text-align: center;
color: rgba(255,255,255,1);
font-size: 12px;
cursor: pointer;
}
}
.select-bar-content { .select-bar-content {
width: 255px; width: 255px;
margin: 0 0 20px 20px; margin: 0 0 20px 20px;
...@@ -1092,97 +1076,109 @@ ...@@ -1092,97 +1076,109 @@
color:rgba(119,146,167,1); color:rgba(119,146,167,1);
} }
} }
</style> /*操作记录总计*/
<style> .count-box {
/*select组件样式覆盖*/ line-height: 30px;
.select-bar-content { color: rgba(51,51,51,1);
padding: 2px 0 0 65px; .title {
.el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner { font-size: 16px;
border-radius: 3px; margin-right: 10px;
}
&.pair {
.el-checkbox-button__inner{
width: 85px;
}
.el-checkbox-group .el-checkbox-button:first-child {
margin-left: 90px;
}
}
.el-checkbox-button__inner {
padding: 5px 0;
width: 58px;
text-align: center;
background-color: #C3D3DF;
border-color: #C3D3DF;
box-shadow: none;
color: #fff;
border-radius: 3px;
font-size: 12px;
}
.el-checkbox-button {
margin: 0 10px 10px 0;
border-radius: 3px;
}
.el-checkbox-button.is-checked .el-checkbox-button__inner {
background-color: #7792A7;
border-color: #7792A7;
}
.el-checkbox-button.is-focus .el-checkbox-button__inner {
border-color: #dcdfe6;
}
&>.el-checkbox-button {
margin-left: -69px;
} }
.el-checkbox-group { li {
margin-top: -34px; font-size: 15px;
.el-checkbox-button:first-child { margin-right: 10px;
margin-left: 70px; span:first-child {
font-size: 14px;
color: rgba(128,128,128,1);
} }
} }
} }
</style> </style>
<style> <style>
/*select组件样式覆盖*/ /*select组件样式覆盖*/
.record-box { .detail-box {
.select-bar-content { .select-bar-content {
padding: 0 0 0 40px; padding: 2px 0 0 65px;
.el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner {
border-radius: 3px;
}
&.pair {
.el-checkbox-button__inner{
width: 85px;
}
.el-checkbox-group .el-checkbox-button:first-child {
margin-left: 90px;
}
}
.el-checkbox-button__inner {
padding: 5px 0;
width: 58px;
text-align: center;
background-color: #C3D3DF;
border-color: #C3D3DF;
box-shadow: none;
color: #fff;
border-radius: 3px;
font-size: 12px;
}
.el-checkbox-button { .el-checkbox-button {
margin: 0 12px 0 0; margin: 0 10px 10px 0;
border-radius: 3px; border-radius: 3px;
} }
.el-checkbox-button.is-checked .el-checkbox-button__inner {
background-color: #7792A7;
border-color: #7792A7;
}
.el-checkbox-button.is-focus .el-checkbox-button__inner { .el-checkbox-button.is-focus .el-checkbox-button__inner {
border-color: #dcdfe6; border-color: #dcdfe6;
} }
&>.el-checkbox-button { &>.el-checkbox-button {
margin-left: -40px; margin-left: -69px;
position: relative;
top: -2px;
} }
.el-checkbox-group { .el-checkbox-group {
margin-top: -41px; margin-top: -34px;
.el-checkbox-button:first-child { .el-checkbox-button:first-child {
margin-left: 72px; margin-left: 70px;
} }
} }
} }
.select-bar-content.status-select { .record-box {
width: 400px; .select-bar-content {
&.small { padding: 0 0 0 40px;
width: 255px; .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 {
.el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner { width: 400px;
width: 370px; &.small {
} width: 255px;
.el-date-editor .el-range-input, .el-date-editor .el-range-separator { }
margin-right: 5px; }
} .el-date-editor--datetimerange.el-input, .el-date-editor--datetimerange.el-input__inner {
.el-pagination { width: 370px;
display: inline-block; }
position: relative; .el-date-editor .el-range-input, .el-date-editor .el-range-separator {
margin: 20px 0 0 50%; margin-right: 5px;
transform: translateX(-50%); }
} }
} }
</style> </style>
src/views/account.vue
View file @ d0c365e5
This diff is collapsed.
src/views/overview.vue
View file @ d0c365e5
...@@ -659,48 +659,50 @@ ...@@ -659,48 +659,50 @@
</style> </style>
<style> <style>
/*select组件样式覆盖*/ /*select组件样式覆盖*/
.select-bar-content { .overview {
padding: 2px 0 0 65px; .select-bar-content {
.el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner { padding: 2px 0 0 65px;
border-radius: 3px; .el-checkbox-button:last-child .el-checkbox-button__inner, .el-checkbox-button:first-child .el-checkbox-button__inner {
} border-radius: 3px;
&.pair {
.el-checkbox-button__inner{
width: 85px;
} }
.el-checkbox-group .el-checkbox-button:first-child { &.pair {
margin-left: 90px; .el-checkbox-button__inner{
width: 85px;
}
.el-checkbox-group .el-checkbox-button:first-child {
margin-left: 90px;
}
} }
} .el-checkbox-button__inner {
.el-checkbox-button__inner { padding: 5px 0;
padding: 5px 0; width: 58px;
width: 58px; text-align: center;
text-align: center; background-color: #C3D3DF;
background-color: #C3D3DF; border-color: #C3D3DF;
border-color: #C3D3DF; box-shadow: none;
box-shadow: none; color: #fff;
color: #fff; border-radius: 3px;
border-radius: 3px; font-size: 12px;
font-size: 12px; }
} .el-checkbox-button {
.el-checkbox-button { margin: 0 10px 10px 0;
margin: 0 10px 10px 0; border-radius: 3px;
border-radius: 3px; }
} .el-checkbox-button.is-checked .el-checkbox-button__inner {
.el-checkbox-button.is-checked .el-checkbox-button__inner { background-color: #7792A7;
background-color: #7792A7; border-color: #7792A7;
border-color: #7792A7; }
} .el-checkbox-button.is-focus .el-checkbox-button__inner {
.el-checkbox-button.is-focus .el-checkbox-button__inner { border-color: #dcdfe6;
border-color: #dcdfe6; }
} &>.el-checkbox-button {
&>.el-checkbox-button { margin-left: -69px;
margin-left: -69px; }
} .el-checkbox-group {
.el-checkbox-group { margin-top: -34px;
margin-top: -34px; .el-checkbox-button:first-child {
.el-checkbox-button:first-child { margin-left: 70px;
margin-left: 70px; }
} }
} }
} }
......
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