Commit cb6053d8 authored by xxx's avatar xxx

修改

parent 42227e1c
...@@ -48,6 +48,7 @@ export default { ...@@ -48,6 +48,7 @@ export default {
}, },
methods:{ methods:{
loadData(){ loadData(){
let that = this;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 7; truckQuery1.size = 7;
truckQuery1.sort = this.truckRankListData.selectFieldText; truckQuery1.sort = this.truckRankListData.selectFieldText;
...@@ -57,7 +58,10 @@ export default { ...@@ -57,7 +58,10 @@ export default {
HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -69,7 +73,10 @@ export default { ...@@ -69,7 +73,10 @@ export default {
HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -81,7 +88,10 @@ export default { ...@@ -81,7 +88,10 @@ export default {
HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -103,7 +113,10 @@ export default { ...@@ -103,7 +113,10 @@ export default {
HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -115,7 +128,10 @@ export default { ...@@ -115,7 +128,10 @@ export default {
HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -127,7 +143,10 @@ export default { ...@@ -127,7 +143,10 @@ export default {
HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -142,6 +161,7 @@ export default { ...@@ -142,6 +161,7 @@ export default {
}, },
//卡车切换时间 //卡车切换时间
truckChangeTime(text){ truckChangeTime(text){
let that = this;
this.truckRankListData.selectTimeText = text; this.truckRankListData.selectTimeText = text;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 7; truckQuery1.size = 7;
...@@ -151,7 +171,10 @@ export default { ...@@ -151,7 +171,10 @@ export default {
HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -163,7 +186,10 @@ export default { ...@@ -163,7 +186,10 @@ export default {
HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -175,7 +201,10 @@ export default { ...@@ -175,7 +201,10 @@ export default {
HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -187,6 +216,7 @@ export default { ...@@ -187,6 +216,7 @@ export default {
}, },
//卡车切换字段排序 //卡车切换字段排序
truckChangeField(text){ truckChangeField(text){
let that = this;
this.truckRankListData.selectFieldText = text; this.truckRankListData.selectFieldText = text;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 7; truckQuery1.size = 7;
...@@ -206,7 +236,10 @@ export default { ...@@ -206,7 +236,10 @@ export default {
HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesDay1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -218,7 +251,10 @@ export default { ...@@ -218,7 +251,10 @@ export default {
HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesZhou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -230,7 +266,10 @@ export default { ...@@ -230,7 +266,10 @@ export default {
HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesMou1Query(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return a[that.truckRankListData.selectFieldText] - b[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.number); arr1.push(item.number);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
......
...@@ -70,6 +70,7 @@ export default { ...@@ -70,6 +70,7 @@ export default {
}, },
methods:{ methods:{
loadData(){ loadData(){
let that = this;
//获取铲车排行榜 //获取铲车排行榜
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -78,15 +79,24 @@ export default { ...@@ -78,15 +79,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
...@@ -100,15 +110,24 @@ export default { ...@@ -100,15 +110,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
...@@ -117,6 +136,7 @@ export default { ...@@ -117,6 +136,7 @@ export default {
}, },
//铲车切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
let that = this;
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -124,22 +144,32 @@ export default { ...@@ -124,22 +144,32 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
if(text == 'day'){ if(text == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
if(text == 'week'){ if(text == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
if(text == 'month'){ if(text == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}, },
//铲车切换字段排序 //铲车切换字段排序
forkLiftChangeField(text){ forkLiftChangeField(text){
let that = this;
this.forkLiftRankListData.selectFieldText = text; this.forkLiftRankListData.selectFieldText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -148,15 +178,24 @@ export default { ...@@ -148,15 +178,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
......
...@@ -46,6 +46,7 @@ export default { ...@@ -46,6 +46,7 @@ export default {
}, },
methods:{ methods:{
loadData(){ loadData(){
let that = this;
//获取卡车排行榜 //获取卡车排行榜
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 5; truckQuery1.size = 5;
...@@ -56,7 +57,10 @@ export default { ...@@ -56,7 +57,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -68,7 +72,10 @@ export default { ...@@ -68,7 +72,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -80,7 +87,10 @@ export default { ...@@ -80,7 +87,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -102,7 +112,10 @@ export default { ...@@ -102,7 +112,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -114,7 +127,10 @@ export default { ...@@ -114,7 +127,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -126,7 +142,10 @@ export default { ...@@ -126,7 +142,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -142,6 +161,7 @@ export default { ...@@ -142,6 +161,7 @@ export default {
}, },
//卡车切换时间 //卡车切换时间
truckChangeTime(text){ truckChangeTime(text){
let that = this;
this.truckRankListData.selectTimeText = text; this.truckRankListData.selectTimeText = text;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 5; truckQuery1.size = 5;
...@@ -151,7 +171,10 @@ export default { ...@@ -151,7 +171,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -163,7 +186,10 @@ export default { ...@@ -163,7 +186,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -175,7 +201,10 @@ export default { ...@@ -175,7 +201,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -187,6 +216,7 @@ export default { ...@@ -187,6 +216,7 @@ export default {
}, },
//卡车切换字段排序 //卡车切换字段排序
truckChangeField(text){ truckChangeField(text){
let that = this;
this.truckRankListData.selectFieldText = text; this.truckRankListData.selectFieldText = text;
let truckQuery1 = {}; let truckQuery1 = {};
truckQuery1.size = 5; truckQuery1.size = 5;
...@@ -206,7 +236,10 @@ export default { ...@@ -206,7 +236,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListDayQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -218,7 +251,10 @@ export default { ...@@ -218,7 +251,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListZhouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
...@@ -230,7 +266,10 @@ export default { ...@@ -230,7 +266,10 @@ export default {
HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => { HttpReq.truckDispatching.kaChanRankListMouQuery(truckQuery1).then((res) => {
let arr1 = []; let arr1 = [];
let arr2 = []; let arr2 = [];
res.forEach((item,index)=>{ let transitionRes = res.sort(function(a,b){
return b[that.truckRankListData.selectFieldText] - a[that.truckRankListData.selectFieldText];
})
transitionRes.forEach((item,index)=>{
arr1.push(item.driver); arr1.push(item.driver);
arr2.push(item[this.truckRankListData.selectFieldText]); arr2.push(item[this.truckRankListData.selectFieldText]);
}) })
......
...@@ -70,6 +70,7 @@ export default { ...@@ -70,6 +70,7 @@ export default {
}, },
methods:{ methods:{
loadData(){ loadData(){
let that = this;
//获取铲车排行榜 //获取铲车排行榜
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -78,15 +79,24 @@ export default { ...@@ -78,15 +79,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
...@@ -100,15 +110,24 @@ export default { ...@@ -100,15 +110,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
...@@ -116,6 +135,7 @@ export default { ...@@ -116,6 +135,7 @@ export default {
}, },
//铲车切换时间 //铲车切换时间
forkLiftChangeTime(text){ forkLiftChangeTime(text){
let that = this;
this.forkLiftRankListData.selectTimeText = text; this.forkLiftRankListData.selectTimeText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -123,22 +143,32 @@ export default { ...@@ -123,22 +143,32 @@ export default {
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass; forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
if(text == 'day'){ if(text == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
if(text == 'week'){ if(text == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
if(text == 'month'){ if(text == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}, },
//铲车切换字段排序 //铲车切换字段排序
forkLiftChangeField(text){ forkLiftChangeField(text){
let that = this;
this.forkLiftRankListData.selectFieldText = text; this.forkLiftRankListData.selectFieldText = text;
let forkLiftQuery1 = {}; let forkLiftQuery1 = {};
forkLiftQuery1.size = 5; forkLiftQuery1.size = 5;
...@@ -147,15 +177,24 @@ export default { ...@@ -147,15 +177,24 @@ export default {
this.$nextTick(()=>{ this.$nextTick(()=>{
if(this.forkLiftRankListData.selectTimeText == 'day'){ if(this.forkLiftRankListData.selectTimeText == 'day'){
HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadeschanjiedanDayQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'week'){ }else if(this.forkLiftRankListData.selectTimeText == 'week'){
HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanZhouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
}else if(this.forkLiftRankListData.selectTimeText == 'month'){ }else if(this.forkLiftRankListData.selectTimeText == 'month'){
HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => { HttpReq.truckDispatching.apiManmadesChanjiedanMouQuery(forkLiftQuery1).then((res) => {
this.forkLiftRankListData.listData = res; let transitionRes = res.sort(function(a,b){
return b[that.forkLiftRankListData.selectFieldText] - a[that.forkLiftRankListData.selectFieldText];
})
this.forkLiftRankListData.listData = transitionRes;
}) })
} }
}) })
......
...@@ -41,10 +41,10 @@ export default { ...@@ -41,10 +41,10 @@ export default {
DPcomputer8BoxTimer:null, DPcomputer8BoxTimer:null,
//矿石开采效率 //矿石开采效率
exploitationEfficiencyData:{ exploitationEfficiencyData:{
rate1:[0.5], rate1:[0],
dayYield1:0, dayYield1:0,
dayMil1:0, dayMil1:0,
rate2:[0.5], rate2:[0],
dayWorkTime2:0, dayWorkTime2:0,
dayYield2:0, dayYield2:0,
}, },
...@@ -68,12 +68,19 @@ export default { ...@@ -68,12 +68,19 @@ export default {
}); });
this.exploitationEfficiencyData.dayYield1 = text1; this.exploitationEfficiencyData.dayYield1 = text1;
this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3); this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3);
let transitArr1 = [];
transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(4))
this.exploitationEfficiencyData.rate1 = transitArr1;
this.exploitationEfficiencyData.dayWorkTime2 = text3; this.exploitationEfficiencyData.dayWorkTime2 = text3;
this.exploitationEfficiencyData.dayYield2 = text1; this.exploitationEfficiencyData.dayYield2 = text1;
let transitArr2 = [];
transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(4))
this.exploitationEfficiencyData.rate2 = transitArr2;
this.initLiquidEchart1();
this.initLiquidEchart2();
} }
}) })
this.initLiquidEchart1();
this.initLiquidEchart2();
this.DPcomputer8BoxTimer = setInterval(() => { this.DPcomputer8BoxTimer = setInterval(() => {
//矿石开采效率 //矿石开采效率
...@@ -89,12 +96,19 @@ export default { ...@@ -89,12 +96,19 @@ export default {
}); });
this.exploitationEfficiencyData.dayYield1 = text1; this.exploitationEfficiencyData.dayYield1 = text1;
this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3); this.exploitationEfficiencyData.dayMil1 = text2.toFixed(3);
let transitArr1 = [];
transitArr1.push((parseFloat(text2) / parseFloat(text1)).toFixed(4))
this.exploitationEfficiencyData.rate1 = transitArr1;
this.exploitationEfficiencyData.dayWorkTime2 = text3; this.exploitationEfficiencyData.dayWorkTime2 = text3;
this.exploitationEfficiencyData.dayYield2 = text1; this.exploitationEfficiencyData.dayYield2 = text1;
let transitArr2 = [];
transitArr2.push((parseFloat(text3) / parseFloat(text1)).toFixed(4))
this.exploitationEfficiencyData.rate2 = transitArr2;
this.initLiquidEchart1();
this.initLiquidEchart2();
} }
}) })
this.initLiquidEchart1();
this.initLiquidEchart2();
},10000) },10000)
}, },
//矿石开采效率 //矿石开采效率
...@@ -115,7 +129,7 @@ export default { ...@@ -115,7 +129,7 @@ export default {
color: '#05ADFB', color: '#05ADFB',
insideColor: '#fff', insideColor: '#fff',
textStyle: { textStyle: {
fontSize: 18, fontSize: 17,
} }
} }
}, },
...@@ -170,7 +184,7 @@ export default { ...@@ -170,7 +184,7 @@ export default {
color: 'rgb(3, 254, 254)', color: 'rgb(3, 254, 254)',
insideColor: '#fff', insideColor: '#fff',
textStyle: { textStyle: {
fontSize: 18, fontSize: 17,
} }
} }
}, },
......
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