Commit 61d7750e authored by xxx's avatar xxx

修改绩效问题

parent 6b9c6ce9
......@@ -43,3 +43,4 @@ export const dispatchFinishQuery = '/api/Dispatch/finish'; //获取智能调度
export const apiCpointQuery = '/api/Cpoint'; //获取关键控制点坐标
export const apiPathmapNavigationQuery = '/api/Pathmap/navigation'; //获取关键控制点坐标
export const apiManmadesRealCarQuery = '/api/Manmades/RealCar'; //点击车辆小弹框
export const apiManmadesChanJxQuery = '/api/Manmades/ChanJx'; //铲车绩效上面
......@@ -40,7 +40,7 @@
</div>
<div class="carInFrom_content">
<div>运行状态:</div>
<div class="carInFrom_input">{{realTimeData.status == 0 ? '' : realTimeData.status == 1 ? '运行中' : '暂无状态'}}</div>
<div class="carInFrom_input">{{realTimeData.status == 0 ? '' : realTimeData.status == 1 ? '重运' : realTimeData.status == 2 ? '待装' : '停运'}}</div>
</div>
<div class="carInFrom_content">
<div>运行时长:</div>
......
......@@ -24,35 +24,35 @@
</div>
<div class="checkFrom_content">
<div>{{carclass != '铲车' ? '今日车数:' : '今日装车数:'}}</div>
<div class="checkFrom_input">{{checkFromData.carnum ? checkFromData.carnum : ''}}</div>
<div class="checkFrom_input">{{checkFromData.carNum ? checkFromData.carNum + '' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>今日工作时间:</div>
<div class="checkFrom_input">{{checkFromData.time ? checkFromData.time : ''}}</div>
<div class="checkFrom_input">{{checkFromData.time ? checkFromData.time + '小时' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>今日产量:</div>
<div class="checkFrom_input">{{checkFromData.yield ? checkFromData.yield : ''}}</div>
<div class="checkFrom_input">{{checkFromData.yield ? checkFromData.yield + '' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>接单次数:</div>
<div class="checkFrom_input">{{checkFromData.number ? checkFromData.number : ''}}</div>
<div class="checkFrom_input">{{checkFromData.number ? checkFromData.number + '' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>已完成单数:</div>
<div class="checkFrom_input">{{checkFromData.finish ? checkFromData.finish : ''}}</div>
<div class="checkFrom_input">{{checkFromData.finish ? checkFromData.finish + '' : ''}}</div>
</div>
<div class="checkFrom_content" v-if="carclass != '铲车'">
<div>今日里程数:</div>
<div class="checkFrom_input">{{checkFromData.odo ? checkFromData.odo : ''}}</div>
<div class="checkFrom_input">{{checkFromData.odo ? checkFromData.odo + 'km' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>今日停车时长:</div>
<div class="checkFrom_input">{{checkFromData.stop ? checkFromData.stop : ''}}</div>
<div class="checkFrom_input">{{checkFromData.stop ? checkFromData.stop + '小时' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>车辆故障次数:</div>
<div class="checkFrom_input">{{checkFromData.alarm ? checkFromData.alarm : ''}}</div>
<div class="checkFrom_input">{{checkFromData.alarm ? checkFromData.alarm + '' : ''}}</div>
</div>
<div class="checkFrom_content">
<div>主要工作区域:</div>
......@@ -115,7 +115,7 @@
<script>
import { httpGet, httpPostForJson, putForJson, httpDelForJson} from "@/common/httpBean.js"
import {achievementStatisticsQuery,intelligentDispatchQuery,apiManmadesJXQuery,chanRealQuery} from "@/axios/api.js"
import {achievementStatisticsQuery,intelligentDispatchQuery,apiManmadesJXQuery,chanRealQuery,apiManmadesChanJxQuery} from "@/axios/api.js"
export default {
data() {
......@@ -140,11 +140,6 @@ export default {
this.carclass = carclass;
this.startTime = '';
this.endTime = '';
httpGet(apiManmadesJXQuery,{number:this.carNumber}).then((res) => {
if(res.code == 200 && res.data.length != 0){
this.checkFromData = res.data[0];
}
});
this.getintelligentDisData();
},
//获取智能派单
......@@ -160,11 +155,18 @@ export default {
query2.endTime = this.currentTime(this.endTime);
query2.car = this.carNumber;
query2.flag = 0;
//下面
httpGet(chanRealQuery,query2).then((res) => {
if(res.code === 200){
this.chanRealQueryData = res.data;
};
});
//上面
httpGet(apiManmadesChanJxQuery,{car:this.carNumber}).then((res) => {
if(res.code == 200 && res.data.length != 0){
this.checkFromData = res.data[0];
}
});
}else{
let query1 = {};
query1.size = 50;
......@@ -174,11 +176,18 @@ export default {
query1.endTime = this.currentTime(this.endTime);
query1.carNo = this.carNumber;
query1.flag = 0;
//下面
httpGet(intelligentDispatchQuery,query1).then((res) => {
if(res.code === 200){
this.intelligentDispatchData = res.data;
};
});
//上面
httpGet(apiManmadesJXQuery,{number:this.carNumber}).then((res) => {
if(res.code == 200 && res.data.length != 0){
this.checkFromData = res.data[0];
}
});
}
},
//查询
......
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