Skip to content

N
NewTruckTerminalSyetem
Commit 4a4dec9d authored by xxx's avatar xxx
Browse files
Options

1

parent 19e13351
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 11 deletions
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @ 4a4dec9d
...@@ -112,7 +112,7 @@ export default { ...@@ -112,7 +112,7 @@ export default {
this.oldxy.lat = res2.data.location.y; this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x; this.oldxy.lng = res2.data.location.x;
}else{ }else{
let distance1 = this.getDistance(this.oldxy.lat,this.oldxy.lng,res2.data.location.y,res2.data.location.x) + parseFloat(res.data.content[0].mil); let distance1 = this.getDistance(this.oldxy.lat,this.oldxy.lng,res2.data.location.y,res2.data.location.x) + parseFloat(res_1.data.content[0].mil);
putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {}); putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {});
this.$nextTick(()=>{ this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y; this.oldxy.lat = res2.data.location.y;
...@@ -282,7 +282,7 @@ export default { ...@@ -282,7 +282,7 @@ export default {
this.oldxy.lat = res2.data.location.y; this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x; this.oldxy.lng = res2.data.location.x;
}else{ }else{
let distance1 = this.getDistance(this.oldxy.lat,this.oldxy.lng,res2.data.location.y,res2.data.location.x) + parseFloat(res.data.content[0].mil); let distance1 = this.getDistance(this.oldxy.lat,this.oldxy.lng,res2.data.location.y,res2.data.location.x) + parseFloat(res_1.data.content[0].mil);
putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {}); putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {});
this.$nextTick(()=>{ this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y; this.oldxy.lat = res2.data.location.y;
...@@ -418,15 +418,15 @@ export default { ...@@ -418,15 +418,15 @@ export default {
} }
} }
}); });
httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => { // httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.code == 200){ // if(res.code == 200){
if(res.data.totalElements == 0){ // if(res.data.totalElements == 0){
}else{ // }else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:1}).then((res) => {}); // putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:1}).then((res) => {});
} // }
} // }
}); // });
}else if(this.paidanFlag == 1){ }else if(this.paidanFlag == 1){
this.zuizhongpaidanFlag = 1; this.zuizhongpaidanFlag = 1;
this.btnShow3 = true; this.btnShow3 = true;
......
src/views/MLargeScreen/index.vue
View file @ 4a4dec9d
...@@ -560,7 +560,7 @@ export default { ...@@ -560,7 +560,7 @@ export default {
//执行路径 //执行路径
zhixinglujing(boo,carnumber,carDestination){ zhixinglujing(boo,carnumber,carDestination){
if(boo){ if(boo){
httpGet(apiPathmapNavigationQuery,{equipmentName:this.equipmentName,point:carDestination}).then((res1) => { httpGet(apiPathmapNavigationQuery,{point:carDestination,equipmentName:this.equipmentName}).then((res1) => {
if(res1.code == 200){ if(res1.code == 200){
let route1 = res1.data.split(';'); let route1 = res1.data.split(';');
let route2 = []; let route2 = [];
......
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