Commit 3476eb01 authored by xxx's avatar xxx

1

parent 6275a44b
...@@ -258,10 +258,10 @@ export default { ...@@ -258,10 +258,10 @@ export default {
if(res.length != 0){ if(res.length != 0){
this.carryCenterData.dayAllCarry1 = res[0].finish; this.carryCenterData.dayAllCarry1 = res[0].finish;
this.carryCenterData.dayAverageCarry1 = parseFloat(res[0].pfin).toFixed(2); this.carryCenterData.dayAverageCarry1 = parseFloat(res[0].pfin).toFixed(2);
this.carryCenterData.dayAllMil1 = res[0].allmil ? parseFloat(res[0].allmil).toFixed(2) : 0; this.carryCenterData.dayAllMil1 = res[0].allmil ? parseFloat(res[0].allmil).toFixed(3) : 0;
this.carryCenterData.dayAllCarNum = res[0].num; this.carryCenterData.dayAllCarNum = res[0].num;
this.carryCenterData.singleAverageTime = parseFloat(res[0].time).toFixed(2); this.carryCenterData.singleAverageTime = parseFloat(res[0].time).toFixed(2);
this.carryCenterData.singleAverageMil = res[0].averagemil ? parseFloat(res[0].averagemil).toFixed(2) : 0; this.carryCenterData.singleAverageMil = res[0].averagemil ? parseFloat(res[0].averagemil).toFixed(3) : 0;
} }
}) })
//中间echarts装载数据 //中间echarts装载数据
...@@ -361,10 +361,10 @@ export default { ...@@ -361,10 +361,10 @@ export default {
if(res.length != 0){ if(res.length != 0){
this.carryCenterData.dayAllCarry1 = res[0].finish; this.carryCenterData.dayAllCarry1 = res[0].finish;
this.carryCenterData.dayAverageCarry1 = parseFloat(res[0].pfin).toFixed(2); this.carryCenterData.dayAverageCarry1 = parseFloat(res[0].pfin).toFixed(2);
this.carryCenterData.dayAllMil1 = res[0].allmil ? parseFloat(res[0].allmil).toFixed(2) : 0; this.carryCenterData.dayAllMil1 = res[0].allmil ? parseFloat(res[0].allmil).toFixed(3) : 0;
this.carryCenterData.dayAllCarNum = res[0].num; this.carryCenterData.dayAllCarNum = res[0].num;
this.carryCenterData.singleAverageTime = parseFloat(res[0].time).toFixed(2); this.carryCenterData.singleAverageTime = parseFloat(res[0].time).toFixed(2);
this.carryCenterData.singleAverageMil = res[0].averagemil ? parseFloat(res[0].averagemil).toFixed(2) : 0; this.carryCenterData.singleAverageMil = res[0].averagemil ? parseFloat(res[0].averagemil).toFixed(3) : 0;
} }
}) })
//中间echarts装载数据 //中间echarts装载数据
......
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
</div> </div>
<div class="carPicStyle2"> <div class="carPicStyle2">
<div style="margin-top:0.5vh;font-size:17px;">{{item.cartype}}</div> <div style="margin-top:0.5vh;font-size:17px;">{{item.cartype}}</div>
<div style="font-size:14px;margin-top:1.5vh;">总工时:<b>{{item.gongshi}}</b>H</div> <div style="font-size:14px;margin-top:1vh;">总工时:<b>{{item.gongshi}}</b>H</div>
<div style="font-size:14px;margin-top:1vh;">闲置率:<b>{{item.xianzhi}}</b>%</div> <div style="font-size:14px;margin-top:1vh;">闲置率:<b>{{item.xianzhi}}</b>%</div>
</div> </div>
</div> </div>
...@@ -62,63 +62,349 @@ export default { ...@@ -62,63 +62,349 @@ export default {
this.yearCurrentTimeFn(); this.yearCurrentTimeFn();
//车辆工时 //车辆工时
HttpReq.truckDispatching.carWorkInforQuery({riqi:this.carWorkTimeData.selectTimeDate}).then((res) => { if(this.carWorkTimeData.selectTimeText == 'day'){
this.carWorkTimeData.selectTimeDate = this.currentTime.day;
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ let allTime1 = 0;
this.carWorkTimeData.listData = [ let allEffic1 = 0;
{cartype:'卡车',gongshi:0,xianzhi:0}, let num1 = 0;
{cartype:'铲车',gongshi:0,xianzhi:0}, let allTime2 = 0;
{cartype:'其他车辆',gongshi:0,xianzhi:0}, let allEffic2 = 0;
]; let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
}
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
}
})
}
if(this.carWorkTimeData.selectTimeText == 'month'){
this.carWorkTimeData.selectTimeDate = this.currentTime.month;
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
}
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
}
})
}
if(this.carWorkTimeData.selectTimeText == 'year'){
this.carWorkTimeData.selectTimeDate = this.currentTime.year;
HttpReq.truckDispatching.apiManmadesCheYearQueryYear({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{ }else{
this.carWorkTimeData.listData = res.data.content; allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
} }
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
} }
}) })
}
this.DPcomputer7BoxTimer = setInterval(() => { this.DPcomputer7BoxTimer = setInterval(() => {
//车辆工时 //车辆工时
HttpReq.truckDispatching.carWorkInforQuery({riqi:this.carWorkTimeData.selectTimeDate}).then((res) => { if(this.carWorkTimeData.selectTimeText == 'day'){
this.carWorkTimeData.selectTimeDate = this.currentTime.day;
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ let allTime1 = 0;
this.carWorkTimeData.listData = [ let allEffic1 = 0;
{cartype:'卡车',gongshi:0,xianzhi:0}, let num1 = 0;
{cartype:'铲车',gongshi:0,xianzhi:0}, let allTime2 = 0;
{cartype:'其他车辆',gongshi:0,xianzhi:0}, let allEffic2 = 0;
]; let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{ }else{
this.carWorkTimeData.listData = res.data.content; allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
} }
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
} }
}) })
}
if(this.carWorkTimeData.selectTimeText == 'month'){
this.carWorkTimeData.selectTimeDate = this.currentTime.month;
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
}
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
}
})
}
if(this.carWorkTimeData.selectTimeText == 'year'){
this.carWorkTimeData.selectTimeDate = this.currentTime.year;
HttpReq.truckDispatching.apiManmadesCheYearQueryYear({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
}
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
}
})
}
},10000) },10000)
}, },
//车辆工时切换时间 //车辆工时切换时间
carWorkTimeChangeTime(text){ carWorkTimeChangeTime(text){
this.carWorkTimeData.selectTimeText = text; this.carWorkTimeData.selectTimeText = text;
if(text == 'day'){ //车辆工时
if(this.carWorkTimeData.selectTimeText == 'day'){
this.carWorkTimeData.selectTimeDate = this.currentTime.day; this.carWorkTimeData.selectTimeDate = this.currentTime.day;
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
} }
if(text == 'month'){ });
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
}
})
}
if(this.carWorkTimeData.selectTimeText == 'month'){
this.carWorkTimeData.selectTimeDate = this.currentTime.month; this.carWorkTimeData.selectTimeDate = this.currentTime.month;
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){
let allTime1 = 0;
let allEffic1 = 0;
let num1 = 0;
let allTime2 = 0;
let allEffic2 = 0;
let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{
allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
} }
if(text == 'year'){ });
this.carWorkTimeData.selectTimeDate = this.currentTime.year; this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
} }
HttpReq.truckDispatching.carWorkInforQuery({riqi:this.carWorkTimeData.selectTimeDate}).then((res) => { })
}
if(this.carWorkTimeData.selectTimeText == 'year'){
this.carWorkTimeData.selectTimeDate = this.currentTime.year;
HttpReq.truckDispatching.apiManmadesCheYearQueryYear({createTime:this.carWorkTimeData.selectTimeDate,size:9999,page:0}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(res.data.totalElements == 0){ let allTime1 = 0;
this.carWorkTimeData.listData = [ let allEffic1 = 0;
{cartype:'卡车',gongshi:0,xianzhi:0}, let num1 = 0;
{cartype:'铲车',gongshi:0,xianzhi:0}, let allTime2 = 0;
{cartype:'其他车辆',gongshi:0,xianzhi:0}, let allEffic2 = 0;
]; let num2 = 0;
let allTime3 = 0;
let allEffic3 = 0;
let num3 = 0;
res.data.forEach((item1,index1)=>{
if(item1.carclass == '卡车'){
allTime1 = allTime1 + parseFloat(item1.time);
allEffic1 = allEffic1 + (item1.effic ? parseFloat(item1.effic) : 0);
num1++;
}else if(item1.carclass == '铲车'){
allTime2 = allTime2 + parseFloat(item1.time);
allEffic2 = allEffic2 + (item1.effic ? parseFloat(item1.effic) : 0);
num2++;
}else{ }else{
this.carWorkTimeData.listData = res.data.content; allTime3 = allTime3 + parseFloat(item1.time);
allEffic3 = allEffic3 + (item1.effic ? parseFloat(item1.effic) : 0);
num3++;
} }
});
this.carWorkTimeData.listData[0].gongshi = allTime1;
this.carWorkTimeData.listData[0].xianzhi = allEffic1 ? (parseFloat(allEffic1 / num1)).toFixed(2) : 0;
this.carWorkTimeData.listData[1].gongshi = allTime2;
this.carWorkTimeData.listData[1].xianzhi = allEffic2 ? (parseFloat(allEffic2 / num2)).toFixed(2) : 0;
this.carWorkTimeData.listData[2].gongshi = allTime3;
this.carWorkTimeData.listData[2].xianzhi = allEffic3 ? (parseFloat(allEffic3 / num3)).toFixed(2) : 0;
} }
}) })
}
}, },
//获取当前时间 //获取当前时间
dayCurrentTimeFn(){ dayCurrentTimeFn(){
......
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