Commit 961e320a authored by xxx's avatar xxx

11

parent 431d33ee
...@@ -9,6 +9,7 @@ ...@@ -9,6 +9,7 @@
<div class="orderText2" @click="startPaidanFn()" v-show="btnShow1">接受派单</div> <div class="orderText2" @click="startPaidanFn()" v-show="btnShow1">接受派单</div>
<div class="orderText2" @click="refusePaidanFn()" v-show="btnShow1">拒绝派单</div> <div class="orderText2" @click="refusePaidanFn()" v-show="btnShow1">拒绝派单</div>
<div class="orderText2" @click="finishPaidanFn()" v-show="btnShow2">卸车</div> <div class="orderText2" @click="finishPaidanFn()" v-show="btnShow2">卸车</div>
<div class="orderText2" @click="finishPaidanFn1()" v-show="btnShow3">完成派单</div>
<audio controls currentTime autoplay :src='startOrderSrcUrl' style="display:none;" id="audio1"></audio> <audio controls currentTime autoplay :src='startOrderSrcUrl' style="display:none;" id="audio1"></audio>
</div> </div>
</template> </template>
...@@ -36,13 +37,16 @@ export default { ...@@ -36,13 +37,16 @@ export default {
carDestination:'', carDestination:'',
btnShow1:false, //开始派单和拒绝派单展示 btnShow1:false, //开始派单和拒绝派单展示
btnShow2:false, //完成派单展示 btnShow2:false, //完成派单展示
btnShow3:false, //完成派单展示
sonTimer1:null, sonTimer1:null,
startOrderSrcUrl:'',//来订单语音路径 startOrderSrcUrl:'',//来订单语音路径
dingDanId:'', dingDanId:'',
zuizhongdingdanid:'',
equipmentName:'',//车载设备编号 equipmentName:'',//车载设备编号
xiecheBtnAble:false,//卸车按钮是否能用 xiecheBtnAble:false,//卸车按钮是否能用
zhinengpaidanBoolan:false,//更改该车是否可接受智能派单 zhinengpaidanBoolan:false,//更改该车是否可接受智能派单
paidanFlag:0,//暂存的派单是否是人工或者智能 paidanFlag:0,//暂存的派单是否是人工或者智能
zuizhongpaidanFlag:0,
//暂存的经纬度 //暂存的经纬度
oldxy:{ oldxy:{
lat:0,//纬度 lat:0,//纬度
...@@ -66,15 +70,17 @@ export default { ...@@ -66,15 +70,17 @@ export default {
this.showDe = false; this.showDe = false;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
}else{ }else{
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0){ if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){
this.paidanFlag = res_1.data.content[0].flag; this.paidanFlag = res_1.data.content[0].flag;
if(res_1.data.content[0].orderClass == 0){ if(res_1.data.content[0].orderClass == 0){
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res_1.data.content[0].destination; this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id; this.dingDanId = res_1.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -87,6 +93,7 @@ export default { ...@@ -87,6 +93,7 @@ export default {
this.showDe = true; this.showDe = true;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = true; this.btnShow2 = true;
this.btnShow3 = false;
this.carDestination = res_1.data.content[0].destination; this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id; this.dingDanId = res_1.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -125,11 +132,12 @@ export default { ...@@ -125,11 +132,12 @@ export default {
//有人工调度下面展示操作 //有人工调度下面展示操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0){ if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){
this.paidanFlag = res.data.content[0].flag; this.paidanFlag = res.data.content[0].flag;
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -166,6 +174,7 @@ export default { ...@@ -166,6 +174,7 @@ export default {
this.showDe = false; this.showDe = false;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
}else{ }else{
//有人工调度就删除智能调度单子 //有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => { httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
...@@ -178,11 +187,12 @@ export default { ...@@ -178,11 +187,12 @@ export default {
//有人工调度下面展示操作 //有人工调度下面展示操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0){ if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){
this.paidanFlag = res.data.content[0].flag; this.paidanFlag = res.data.content[0].flag;
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -231,6 +241,7 @@ export default { ...@@ -231,6 +241,7 @@ export default {
this.showDe = false; this.showDe = false;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
}else{ }else{
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
...@@ -240,6 +251,7 @@ export default { ...@@ -240,6 +251,7 @@ export default {
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res_1.data.content[0].destination; this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id; this.dingDanId = res_1.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -247,6 +259,7 @@ export default { ...@@ -247,6 +259,7 @@ export default {
this.showDe = true; this.showDe = true;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = true; this.btnShow2 = true;
this.btnShow3 = false;
this.carDestination = res_1.data.content[0].destination; this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id; this.dingDanId = res_1.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -285,11 +298,12 @@ export default { ...@@ -285,11 +298,12 @@ export default {
//有人工调度下面展示操作 //有人工调度下面展示操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){ if(resSon1.data.content[0].workStatus == 0){
this.paidanFlag = res.data.content[0].flag; this.paidanFlag = res.data.content[0].flag;
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -321,6 +335,7 @@ export default { ...@@ -321,6 +335,7 @@ export default {
this.showDe = false; this.showDe = false;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
}else{ }else{
//有人工调度就删除智能调度单子 //有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => { httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
...@@ -333,11 +348,12 @@ export default { ...@@ -333,11 +348,12 @@ export default {
//有人工调度下面操作 //有人工调度下面操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){ if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){ if(resSon1.data.content[0].workStatus == 0){
this.paidanFlag = res.data.content[0].flag; this.paidanFlag = res.data.content[0].flag;
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
this.btnShow3 = false;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
this.equipmentName = resSon1.data.content[0].equipmentName; this.equipmentName = resSon1.data.content[0].equipmentName;
...@@ -380,11 +396,34 @@ export default { ...@@ -380,11 +396,34 @@ export default {
type: 'success', type: 'success',
duration: 2500 duration: 2500
}); });
if(this.paidanFlag == 0){
this.zuizhongpaidanFlag = 0;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
if(res.code == 200){
if(this.paidanFlag == 0){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:1}).then((res) => {});
}else if(this.paidanFlag == 1){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:2}).then((res) => {});
}
}
});
httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:1}).then((res) => {});
}
}
});
}else if(this.paidanFlag == 1){
this.zuizhongpaidanFlag = 1;
this.btnShow3 = true;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
if(res.code == 200){ if(res.code == 200){
if(this.paidanFlag == 0){ if(this.paidanFlag == 0){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:1}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:1}).then((res) => {});
}else if(this.paidanFlag == 0){ }else if(this.paidanFlag == 1){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:2}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:2}).then((res) => {});
} }
} }
...@@ -398,6 +437,7 @@ export default { ...@@ -398,6 +437,7 @@ export default {
} }
} }
}); });
}
//执行路径 //执行路径
//this.$parent.zhixinglujing(true); //this.$parent.zhixinglujing(true);
}, },
...@@ -406,6 +446,7 @@ export default { ...@@ -406,6 +446,7 @@ export default {
this.btnShow1 = false; this.btnShow1 = false;
this.showDe = false; this.showDe = false;
this.paidanFlag = 0; this.paidanFlag = 0;
this.zuizhongpaidanFlag = 0;
this.$notify({ this.$notify({
title: '已拒绝派单!', title: '已拒绝派单!',
type: 'success', type: 'success',
...@@ -460,6 +501,7 @@ export default { ...@@ -460,6 +501,7 @@ export default {
this.btnShow2 = false; this.btnShow2 = false;
this.showDe = false; this.showDe = false;
this.paidanFlag = 0; this.paidanFlag = 0;
this.zuizhongpaidanFlag = 0;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
if(res.code == 200){ if(res.code == 200){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {});
...@@ -493,6 +535,71 @@ export default { ...@@ -493,6 +535,71 @@ export default {
} }
}); });
}, },
//车辆自主完成派单
finishPaidanFn1(){
//查询指定目的地围栏以及判断该车是否在围栏里
let carDestinationText1 = this.carDestination;
let carDestinationText2 = carDestinationText1.split('-')[0];
httpGet(screenMapSetUpQuery,{size:9999,name:carDestinationText2}).then((resSon2) => {
if(resSon2){
let weilanArr1 = [];
resSon2[this.carDestination].forEach((item,index)=>{
let weilanobj1 = [];
weilanobj1.push(parseFloat(item.lon));
weilanobj1.push(parseFloat(item.lat));
weilanArr1.push(weilanobj1);
})
httpGet(carRealTimeLocationQuery2,{name:this.equipmentName}).then((resSon3) => {
if(resSon3.code == 200){
let resSon3Obj1 = [];
resSon3Obj1.push(resSon3.data.location.x);
resSon3Obj1.push(resSon3.data.location.y);
if(!this.isPointInPolygon(resSon3Obj1,weilanArr1)){
this.$notify({
title: '未到调度区域,不可完成派单!',
type: 'warning',
duration: 2500
});
}else{
this.btnShow3 = false;
this.showDe = false;
this.paidanFlag = 0;
this.zuizhongpaidanFlag = 0;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
if(res.code == 200){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {});
}
});
httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.code == 200){
if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
}
});
httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
//this.$parent.zhixinglujing2(false);
});
this.$nextTick(()=>{
this.oldxy.lat = 0;
this.oldxy.lng = 0;
this.$notify({
title: '完成派单!',
type: 'success',
duration: 2500
});
})
}
}
});
}
});
},
//获取当前时间 //获取当前时间
currentTime(){ currentTime(){
var date = new Date(); var date = new Date();
......
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