Commit 9983a514 authored by xxx's avatar xxx

修改绩效统计接口

parent ea0dc6f8
......@@ -1238,7 +1238,7 @@ var HttpReq = function(){
data:data,
})
},
//车辆产量,司机产量,车辆班次,司机班次总的年月日
//车辆产量,车辆班次总的年月日
apiManmadesCheDayQueryDay: function(param){
return request({
url: '/api/Manmades/CheDay',
......@@ -1260,6 +1260,14 @@ var HttpReq = function(){
params:param,
})
},
//司机产量,司机班次总的年月日
apiManmadesSijiQueryDay: function(param){
return request({
url: '/api/Manmades/Siji',
method: 'get',
params:param,
})
},
//绩效统计——日报——车辆产量报表
carOutputQueryDay: function(param){
return request({
......@@ -1447,6 +1455,14 @@ var HttpReq = function(){
})
},
//绩效统计——月报——区域产量报表采区
apiPlanNewZhouQuery: function(param){
return request({
url: '/api/PlanNew/Zhou',
method: 'get',
params:param,
})
},
//绩效统计——月报——区域产量报表采区
caiquAreaQueryMonth: function(param){
return request({
url: '/api/PlanNew/Month',
......
......@@ -49,47 +49,56 @@ export default {
this.yearCurrentTimeFn();
//装卸点平均时长
if(this.loadAndUnloadListData.selectTimeText == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryDay({createTime:this.currentTime.day}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.apiPlanNewZhouQuery().then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryMonth({createTime:this.currentTime.month}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
......@@ -97,100 +106,118 @@ export default {
this.DPcomputer25BoxTimer = setInterval(() => {
//装卸点平均时长
if(this.loadAndUnloadListData.selectTimeText == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res) => {
if(res.code == 200){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryDay({createTime:this.currentTime.day}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.apiPlanNewZhouQuery().then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryMonth({createTime:this.currentTime.month}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
})
}
})
}
},60000)
},
//装卸点平均时长切换
loadAndUnloadChangeTime(text){
this.loadAndUnloadListData.selectTimeText = text;
if(this.loadAndUnloadListData.selectTimeText == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryDay({createTime:this.currentTime.day}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res) => {
if(res.code == 200){
})
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.apiPlanNewZhouQuery().then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res) => {
if(res.code == 200){
})
}
})
}
if(this.loadAndUnloadListData.selectTimeText == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res1) => {
if(res1.code == 200){
HttpReq.truckDispatching.caiquAreaQueryMonth({createTime:this.currentTime.month}).then((res2) => {
let lastData1 = [...res1.data, ...res2];
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
lastData1.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
},20000)
},
//装卸点平均时长切换
loadAndUnloadChangeTime(text){
this.loadAndUnloadListData.selectTimeText = text;
if(text == 'day'){
HttpReq.truckDispatching.xiequAreaQueryDay({createTime:this.currentTime.day}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(text == 'week'){
HttpReq.truckDispatching.xiequAreaQueryMonth({createTime:this.currentTime.month}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
if(text == 'month'){
HttpReq.truckDispatching.xiequAreaQueryYear({createTime:this.currentTime.year}).then((res) => {
if(res.code == 200){
let caiquName = [];
let workTime = [];
res.data.forEach((item,index)=>{
caiquName.push(item.name);
workTime.push(item.worktime);
})
this.loadAndUnloadListData.caiquName = caiquName;
this.loadAndUnloadListData.timeData = workTime;
this.echarts4Fn();
}
})
}
})
}
},
echarts4Fn(){
......@@ -201,8 +228,8 @@ export default {
trigger: 'axis'
},
grid: {
left: '3%',
right: '4%',
left: '0%',
right: '0%',
bottom: '3%',
containLabel: true
},
......
......@@ -76,13 +76,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheDayQueryDay(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
......@@ -76,13 +76,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
......@@ -76,13 +76,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheYearQueryYear(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheYearQueryYear({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
......@@ -75,13 +75,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheDayQueryDay(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheDayQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
......@@ -75,13 +75,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheMonthQueryMonth({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
......@@ -75,13 +75,13 @@ export default {
}
this.$nextTick(()=>{
HttpReq.truckDispatching.apiManmadesCheYearQueryYear(param).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay(param).then((res) => {
if(res.code == 200){
this.loading = false;
this.tableData = res.data;
}
})
HttpReq.truckDispatching.apiManmadesCheYearQueryYear({createTime:param.createTime,size:9999,page:0}).then((res) => {
HttpReq.truckDispatching.apiManmadesSijiQueryDay({createTime:param.createTime,size:9999,page:0}).then((res) => {
if(res.code == 200){
this.total = res.data.length;
}
......
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