|
|
@@ -107,8 +107,8 @@
|
|
|
<br/>
|
|
|
|
|
|
<!--用户筛选列表--------- userdata 开始的位置-->
|
|
|
- <el-table :data="userdata" highlight-current-row v-loading="listLoading" @selection-change="selsChange" style="width: 100%;" border v-if="display_table">
|
|
|
- <el-table-column label="用户信息表" align="center">
|
|
|
+ <el-table :data="userdata" highlight-current-row v-loading="listLoading" @selection-change="selsChange" :max-height="700" style="width: 100%;" border v-if="display_table">
|
|
|
+ <el-table-column label="用户信息表" align="center">
|
|
|
<el-table-column type="selection" width="55" align="center"></el-table-column>
|
|
|
<el-table-column type="index" width="80" align="center"></el-table-column>
|
|
|
<el-table-column prop="NAME" label="姓名" width="120" sortable align="center"></el-table-column>
|
|
|
@@ -138,7 +138,7 @@
|
|
|
|
|
|
<!-- 用户做过次订单的rollback 开始的位置-->
|
|
|
<div style="float:left;width:50%;" >
|
|
|
- <el-table :data="rollbackdata_list" highlight-current-row v-loading="rollbackloading" style="width:99%;" border v-if="lock_order" align="center" @selection-change="rollselsChange">
|
|
|
+ <el-table :data="rollbackdata_list" highlight-current-row v-loading="rollbackloading" :max-height="700" style="width:99%;" border v-if="lock_order" align="center" @selection-change="rollselsChange">
|
|
|
<el-table-column label="成功的订单" align="center">
|
|
|
<el-table-column type="selection" width="55" align="center"></el-table-column>
|
|
|
<el-table-column type="index" width="70" align="center"></el-table-column>
|
|
|
@@ -169,7 +169,7 @@
|
|
|
|
|
|
<!-- 用户做失败的订单 retry 开始的位置-->
|
|
|
<div style="float:left;width:50%;">
|
|
|
- <el-table :data="retrydata_list" highlight-current-row v-loading="retryloading" style="width:100%;" border v-if="lock_order" align="center" @selection-change="retryselsChange">
|
|
|
+ <el-table :data="retrydata_list" highlight-current-row v-loading="retryloading" :max-height="700" style="width:100%;" border v-if="lock_order" align="center" @selection-change="retryselsChange">
|
|
|
<el-table-column label="失败的订单" align="center">
|
|
|
<el-table-column type="selection" width="55" align="center"></el-table-column>
|
|
|
<el-table-column prop="orig_order" label="操盘手订单" width="110" align="center" ></el-table-column>
|
|
|
@@ -201,6 +201,7 @@
|
|
|
|
|
|
<!-- 遮罩框的显示 -->
|
|
|
<el-dialog title="进度提示" width="30%" :visible.sync="dialogVisible" :before-close="handleClose" :show-close='false' >
|
|
|
+ <el-progress type="circle" :percentage="child_num" ></el-progress>
|
|
|
</el-dialog>
|
|
|
|
|
|
</section>
|
|
|
@@ -235,7 +236,7 @@
|
|
|
|
|
|
|
|
|
dialogVisible:false, //控制是否显示锁屏
|
|
|
- //child_num:0, //控制进度条的进度
|
|
|
+ child_num:0, //控制进度条的进度
|
|
|
|
|
|
|
|
|
rollbackdata:[], //rollback表的信息
|
|
|
@@ -312,6 +313,7 @@
|
|
|
this.page_size = 100;
|
|
|
this.rollback_page_size= 100;
|
|
|
this.retry_page_size = 100;
|
|
|
+
|
|
|
}).catch(() => {
|
|
|
return false;
|
|
|
});
|
|
|
@@ -467,6 +469,7 @@
|
|
|
element.state =0;
|
|
|
});
|
|
|
this.users = user;
|
|
|
+ this.page_size = 100;
|
|
|
this.userdata = this.users.slice((this.page-1)*this.page_size,this.page*this.page_size);
|
|
|
this.listLoading = false;
|
|
|
this.display_table = true;
|
|
|
@@ -634,17 +637,20 @@
|
|
|
case "insert": //插入发送内容
|
|
|
var insert_data = msg['dest']; //将数组数据传递过去
|
|
|
_that_.insert_index+=insert_data.length;
|
|
|
+ console.log("insert执行了");
|
|
|
console.log(_that_.insert_index,_that_.sels.length);
|
|
|
+ _that_.child_num = (Math.round(_that_.insert_index / _that_.sels.length * 10000) / 100.00);
|
|
|
if(_that_.sels.length == _that_.insert_index){
|
|
|
- _that_.loading_insert = false;
|
|
|
- _that_.insert_index = 0;
|
|
|
- _that_.dialogVisible = false;
|
|
|
// 全部执行完成后，对所有不是失败的数据，进行成功操作
|
|
|
_that_.sels.forEach((element1,index) => {
|
|
|
- if(element1.state == 0){
|
|
|
- _that_.$set(element1,'state',100);
|
|
|
+ if(element1.state == 0){
|
|
|
+ _that_.$set(element1,'state',100);
|
|
|
}
|
|
|
});
|
|
|
+ _that_.loading_insert = false;
|
|
|
+ _that_.insert_index = 0;
|
|
|
+ _that_.dialogVisible = false;
|
|
|
+ _that_.child_num = 0;
|
|
|
}
|
|
|
insert_data.forEach(element => {
|
|
|
if(element['error_code']!=0){
|
|
|
@@ -655,30 +661,31 @@
|
|
|
});
|
|
|
}
|
|
|
});
|
|
|
- console.log("insert执行了");
|
|
|
break;
|
|
|
case "rollback": //Rollback请求
|
|
|
var rollback_data = msg['desc']; //将数组数据传递过去
|
|
|
_that_.rollback_index += rollback_data.length;
|
|
|
- console.log(_that_.rollback_index,_that_.rollback_sels.length);
|
|
|
+ console.log('rollback执行了');
|
|
|
+ console.log(_that_.rollback_index,_that_.rollback_sels.length);
|
|
|
+ _that_.child_num = (Math.round(_that_.rollback_index / _that_.rollback_sels.length * 10000) / 100.00);
|
|
|
if(_that_.rollback_sels.length == _that_.rollback_index){
|
|
|
- _that_.loading_rollback = false;
|
|
|
- _that_.rollback_index = 0;
|
|
|
- _that_.dialogVisible = false;
|
|
|
- //对所有不是失败的订单，变为成功的状态
|
|
|
+ //对所有不是失败的订单，变为成功的状态
|
|
|
_that_.rollback_sels.forEach((element1,index) => {
|
|
|
- if(element1.state == 0){
|
|
|
- _that_.$set(element1,'state',100);
|
|
|
+ if(element1.state == 0){
|
|
|
+ _that_.$set(element1,'state',100);
|
|
|
}
|
|
|
});
|
|
|
+ _that_.loading_rollback = false;
|
|
|
+ _that_.rollback_index = 0;
|
|
|
+ _that_.dialogVisible = false;
|
|
|
+ _that_.child_num = 0;
|
|
|
}
|
|
|
rollback_data.forEach(element => {
|
|
|
- console.log('执行了');
|
|
|
- if(element['error_code']!=0){
|
|
|
- //rollback不成功了 将状态更新为失败
|
|
|
+ if(element['error_code']!=0){
|
|
|
+ //rollback不成功了 将状态更新为失败
|
|
|
_that_.rollback_sels.forEach((element1,index) => {
|
|
|
- if(element1.dest_login==element['dest_login']){
|
|
|
- _that_.$set(element1,'state',200);
|
|
|
+ if(element1.dest_login==element['dest_login']){
|
|
|
+ _that_.$set(element1,'state',200);
|
|
|
}
|
|
|
});
|
|
|
}
|
|
|
@@ -724,7 +731,6 @@
|
|
|
//成功返回到rollback表中
|
|
|
_that_.rollbackdata.unshift(msg);
|
|
|
_that_.rollbackdata_list = _that_.rollbackdata.slice((_that_.rollback_page-1)*_that_.rollback_page_size,_that_.rollback_page*_that_.rollback_page_size);
|
|
|
-
|
|
|
//并且更新状态为成功
|
|
|
_that_.retry_sels.forEach((element,index) => {
|
|
|
if(element.dest_login==msg['dest_login']){
|
|
|
@@ -812,14 +818,13 @@
|
|
|
this.rollback_total = data.length; //获取数据的总数量
|
|
|
this.rollbackloading =false;
|
|
|
this.rollbackdata = data;
|
|
|
+ this.rollback_page_size = 100;
|
|
|
this.rollbackdata_list = this.rollbackdata.slice((this.rollback_page-1)*this.rollback_page_size,this.rollback_page*this.rollback_page_size);
|
|
|
}else{
|
|
|
this.rollbackloading =false;
|
|
|
this.rollback_total=0;
|
|
|
this.rollbackdata =[];
|
|
|
- this.rollbackdata_list = [];
|
|
|
-
|
|
|
-
|
|
|
+ this.rollbackdata_list = [];
|
|
|
}
|
|
|
} else {
|
|
|
|
|
|
@@ -848,13 +853,13 @@
|
|
|
this.retry_total = data.length; //获取数据的总数量
|
|
|
this.retryloading = false;
|
|
|
this.retrydata = data;
|
|
|
+ this.retry_page_size = 100;
|
|
|
this.retrydata_list = this.retrydata.slice((this.retry_page-1)*this.retry_page_size,this.retry_page*this.retry_page_size);
|
|
|
}else{
|
|
|
this.retryloading = false;
|
|
|
this.retry_total=0;
|
|
|
this.retrydata=[];
|
|
|
this.retrydata_list=[];
|
|
|
-
|
|
|
}
|
|
|
} else {
|
|
|
this.retryloading = false;
|
|
|
@@ -909,6 +914,7 @@
|
|
|
text-align: center !important;
|
|
|
}
|
|
|
.el-dialog--small{
|
|
|
- display: none !important;
|
|
|
+ top: 30% !important;
|
|
|
+ width: 30%;
|
|
|
}
|
|
|
</style>
|
