Commit c96c4ff6 authored by caicaicai's avatar caicaicai

修改

parent 66769ef9
...@@ -122,7 +122,7 @@ ...@@ -122,7 +122,7 @@
<div style="color:white;font-size:20px;">{{truckDynamicListData.rate}}%</div> <div style="color:white;font-size:20px;">{{truckDynamicListData.rate}}%</div>
<div style="color:white;font-size:15px;">完成度</div> <div style="color:white;font-size:15px;">完成度</div>
</div> </div>
<el-progress type="circle" :percentage="28" :stroke-width="7" :width="90" :height="90" :show-text='false'></el-progress> <el-progress type="circle" :percentage="parseInt(truckDynamicListData.rate)" :stroke-width="7" :width="90" :height="90" :show-text='false'></el-progress>
<div style="text-align: center;"> <div style="text-align: center;">
<div style="font-size:14px;color:white;">今日运载量</div> <div style="font-size:14px;color:white;">今日运载量</div>
<div style="font-size:20px;color:#05F7FC;">{{truckDynamicListData.carry}}<span style="font-size:14px;">T</span></div> <div style="font-size:20px;color:#05F7FC;">{{truckDynamicListData.carry}}<span style="font-size:14px;">T</span></div>
...@@ -297,41 +297,41 @@ export default { ...@@ -297,41 +297,41 @@ export default {
truckDynamicListData:{ truckDynamicListData:{
data:[], data:[],
num2:0, num2:0,
number:'', number:'',
rate:0, rate:0,
carry:0, carry:0,
workTime:0, workTime:0,
mileage:0, mileage:0,
startTime:'', startTime:'',
endTime:'', endTime:'',
loadArea:'', loadArea:'',
unloadArea:'', unloadArea:'',
}, },
//电铲动态 //电铲动态
forkliftkDynamicListData:{ forkliftkDynamicListData:{
data:[], data:[],
num2:0, num2:0,
number:'', number:'',
rate:0, rate:0,
workTime:0, workTime:0,
mileage:0, mileage:0,
startTime:'', startTime:'',
endTime:'', endTime:'',
loadArea:'', loadArea:'',
unloadArea:'', unloadArea:'',
}, },
//其他车动态 //其他车动态
otherCarDynamicListData:{ otherCarDynamicListData:{
data:[], data:[],
num2:0, num2:0,
number:'', number:'',
rate:0, rate:0,
workTime:0, workTime:0,
mileage:0, mileage:0,
startTime:'', startTime:'',
endTime:'', endTime:'',
loadArea:'', loadArea:'',
unloadArea:'', unloadArea:'',
}, },
} }
}, },
...@@ -459,6 +459,92 @@ export default { ...@@ -459,6 +459,92 @@ export default {
this.kachedongtai(); this.kachedongtai();
this.dianchandongtai(); this.dianchandongtai();
this.qitachedongtai(); this.qitachedongtai();
//获取车辆运行状况
HttpReq.truckDispatching.screenDriverInformationQuery({size:9999}).then((res) => {
let kache1 = [];
let kachezaixian = [];
let kachelixian = [];
let dianchan1 = [];
let dianchanzaixian = [];
let dianchanlixian = [];
let qitache1 = [];
let qitachezaixian = [];
let qitachelixian = [];
let zaixianAllNum = [];
let lixianAllNum = [];
if(res.code == 200){
res.data.content.forEach((item)=>{
if(item.carclass == '卡车'){
kache1.push(item);
}else if(item.carclass == '电铲'){
dianchan1.push(item);
}else{
qitache1.push(item);
}
})
kache1.forEach((item)=>{
if(item.status == 1){
kachezaixian.push(item);
}else{
kachelixian.push(item);
}
})
dianchan1.forEach((item)=>{
if(item.status == 1){
dianchanzaixian.push(item);
}else{
dianchanlixian.push(item);
}
})
qitache1.forEach((item)=>{
if(item.status == 1){
qitachezaixian.push(item);
}else{
qitachelixian.push(item);
}
})
zaixianAllNum.push(kachezaixian.length);
zaixianAllNum.push(dianchanzaixian.length);
zaixianAllNum.push(qitachezaixian.length);
lixianAllNum.push(kachelixian.length);
lixianAllNum.push(dianchanlixian.length);
lixianAllNum.push(qitachelixian.length);
this.carWorkingStateData.online = zaixianAllNum;
this.carWorkingStateData.offline = lixianAllNum;
//绘制车辆运行状况图表
this.$nextTick(()=>{
this.carWorkingStateEcharts();
})
}
})
//获取卡车排行榜
this.truckRankListData.selectTimeDate = this.currentTime.day;
let truckQuery1 = {};
truckQuery1.size = 10;
truckQuery1.sort = this.truckRankListData.selectFieldText + ',desc';
truckQuery1.carclass = this.truckRankListData.carclass;
truckQuery1.createTime = this.truckRankListData.selectTimeDate;
this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(truckQuery1).then((res) => {
if(res.code == 200){
this.truckRankListData.listData = res.data.content;
}
})
})
//获取电铲排行榜
this.forkLiftRankListData.selectTimeDate = this.currentTime.day;
let forkLiftQuery1 = {};
forkLiftQuery1.size = 10;
forkLiftQuery1.sort = this.forkLiftRankListData.selectFieldText + ',desc';
forkLiftQuery1.carclass = this.forkLiftRankListData.carclass;
forkLiftQuery1.createTime = this.forkLiftRankListData.selectTimeDate;
this.$nextTick(()=>{
HttpReq.truckDispatching.screenDriverInformationQuery(forkLiftQuery1).then((res) => {
if(res.code == 200){
this.forkLiftRankListData.listData = res.data.content;
}
})
})
}, 20000) }, 20000)
}) })
}) })
...@@ -473,6 +559,7 @@ export default { ...@@ -473,6 +559,7 @@ export default {
//车辆运行状况 //车辆运行状况
carWorkingStateEcharts(){ carWorkingStateEcharts(){
let that = this; let that = this;
echarts.init(document.getElementById('carWorkingStateEcharts')).dispose();
var myChart = echarts.init(document.getElementById('carWorkingStateEcharts')); var myChart = echarts.init(document.getElementById('carWorkingStateEcharts'));
var option = { var option = {
tooltip: { tooltip: {
...@@ -616,6 +703,9 @@ export default { ...@@ -616,6 +703,9 @@ export default {
}else{ }else{
this.truckDynamicListData.num2 = 0; this.truckDynamicListData.num2 = 0;
} }
if(this.truckDynamicListData.data == 0){
return
}
this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number; this.truckDynamicListData.number = this.truckDynamicListData.data[this.truckDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.truckDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.truckDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
...@@ -624,10 +714,10 @@ export default { ...@@ -624,10 +714,10 @@ export default {
this.truckDynamicListData.carry = 0; this.truckDynamicListData.carry = 0;
this.truckDynamicListData.workTime = 0; this.truckDynamicListData.workTime = 0;
this.truckDynamicListData.mileage = 0; this.truckDynamicListData.mileage = 0;
this.truckDynamicListData.startTime = ''; this.truckDynamicListData.startTime = '';
this.truckDynamicListData.endTime = ''; this.truckDynamicListData.endTime = '';
this.truckDynamicListData.loadArea = ''; this.truckDynamicListData.loadArea = '';
this.truckDynamicListData.unloadArea = ''; this.truckDynamicListData.unloadArea = '';
}else{ }else{
this.truckDynamicListData.rate = res.data.content[0].rate; this.truckDynamicListData.rate = res.data.content[0].rate;
this.truckDynamicListData.carry = res.data.content[0].carry; this.truckDynamicListData.carry = res.data.content[0].carry;
...@@ -651,6 +741,9 @@ export default { ...@@ -651,6 +741,9 @@ export default {
}else{ }else{
this.forkliftkDynamicListData.num2 = 0; this.forkliftkDynamicListData.num2 = 0;
} }
if(this.forkliftkDynamicListData.data == 0){
return
}
this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number; this.forkliftkDynamicListData.number = this.forkliftkDynamicListData.data[this.forkliftkDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.forkliftkDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.forkliftkDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
...@@ -659,10 +752,10 @@ export default { ...@@ -659,10 +752,10 @@ export default {
this.forkliftkDynamicListData.carry = 0; this.forkliftkDynamicListData.carry = 0;
this.forkliftkDynamicListData.workTime = 0; this.forkliftkDynamicListData.workTime = 0;
this.forkliftkDynamicListData.mileage = 0; this.forkliftkDynamicListData.mileage = 0;
this.forkliftkDynamicListData.startTime = ''; this.forkliftkDynamicListData.startTime = '';
this.forkliftkDynamicListData.endTime = ''; this.forkliftkDynamicListData.endTime = '';
this.forkliftkDynamicListData.loadArea = ''; this.forkliftkDynamicListData.loadArea = '';
this.forkliftkDynamicListData.unloadArea = ''; this.forkliftkDynamicListData.unloadArea = '';
}else{ }else{
this.forkliftkDynamicListData.rate = res.data.content[0].rate; this.forkliftkDynamicListData.rate = res.data.content[0].rate;
this.forkliftkDynamicListData.carry = res.data.content[0].carry; this.forkliftkDynamicListData.carry = res.data.content[0].carry;
...@@ -686,6 +779,9 @@ export default { ...@@ -686,6 +779,9 @@ export default {
}else{ }else{
this.otherCarDynamicListData.num2 = 0; this.otherCarDynamicListData.num2 = 0;
} }
if(this.otherCarDynamicListData.data == 0){
return
}
this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number; this.otherCarDynamicListData.number = this.otherCarDynamicListData.data[this.otherCarDynamicListData.num2].number;
HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.otherCarDynamicListData.number}).then((res) => { HttpReq.truckDispatching.screenCarInforCarRealQuery({number:this.otherCarDynamicListData.number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
...@@ -694,10 +790,10 @@ export default { ...@@ -694,10 +790,10 @@ export default {
this.otherCarDynamicListData.carry = 0; this.otherCarDynamicListData.carry = 0;
this.otherCarDynamicListData.workTime = 0; this.otherCarDynamicListData.workTime = 0;
this.otherCarDynamicListData.mileage = 0; this.otherCarDynamicListData.mileage = 0;
this.otherCarDynamicListData.startTime = ''; this.otherCarDynamicListData.startTime = '';
this.otherCarDynamicListData.endTime = ''; this.otherCarDynamicListData.endTime = '';
this.otherCarDynamicListData.loadArea = ''; this.otherCarDynamicListData.loadArea = '';
this.otherCarDynamicListData.unloadArea = ''; this.otherCarDynamicListData.unloadArea = '';
}else{ }else{
this.otherCarDynamicListData.rate = res.data.content[0].rate; this.otherCarDynamicListData.rate = res.data.content[0].rate;
this.otherCarDynamicListData.carry = res.data.content[0].carry; this.otherCarDynamicListData.carry = res.data.content[0].carry;
......
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