Commit 64cde454 authored by xxx's avatar xxx

1

parent 6d50f796
......@@ -25,7 +25,6 @@ import {
getXieCheDingDanQuery,
screenMapSetUpQuery,
carRealTimeLocationQuery2,
} from "@/axios/api.js"
import newOrder from '@/assets/dingdan.mp3'
......@@ -70,14 +69,14 @@ export default {
}else{
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0 && this.paidanFlag == 0){
this.paidanFlag = res.data.content[0].flag;
if(res.data.content[0].orderClass == 0){
if(resSon1.data.content[0].workStatus == 0){
this.paidanFlag = res_1.data.content[0].flag;
if(res_1.data.content[0].orderClass == 0){
this.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id;
//启动语音
this.startOrderSrcUrl = newOrder;
let au = document.getElementById('audio1');
......@@ -87,8 +86,8 @@ export default {
this.showDe = true;
this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id;
//查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
if(resSon2){
......@@ -119,7 +118,7 @@ export default {
this.oldxy.lng = res2.data.location.x;
}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);
putForJson(dingDanBiaoCaoZuo,{id:res.data.content[0].id,mil:distance1}).then((res) => {});
putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
......@@ -136,7 +135,7 @@ export default {
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
resDel.data.content.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
......@@ -144,7 +143,7 @@ export default {
//有人工调度下面展示操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
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.showDe = true;
this.btnShow1 = true;
......@@ -208,7 +207,7 @@ export default {
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
resDel.data.content.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
......@@ -216,7 +215,7 @@ export default {
//有人工调度下面展示操作
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
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.showDe = true;
this.btnShow1 = true;
......@@ -292,19 +291,19 @@ export default {
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => {
if(resSon1.code == 200){
if(resSon1.data.content[0].workStatus == 0){
this.paidanFlag = res.data.content[0].flag;
if(res.data.content[0].orderClass == 0){
this.paidanFlag = res_1.data.content[0].flag;
if(res_1.data.content[0].orderClass == 0){
this.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id;
}else{
this.showDe = true;
this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
this.carDestination = res_1.data.content[0].destination;
this.dingDanId = res_1.data.content[0].id;
}
}
//获取车辆坐标计算距离并返回给后台
......@@ -315,7 +314,7 @@ export default {
this.oldxy.lng = res2.data.location.x;
}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);
putForJson(dingDanBiaoCaoZuo,{id:res.data.content[0].id,mil:distance1}).then((res) => {});
putForJson(dingDanBiaoCaoZuo,{id:res_1.data.content[0].id,mil:distance1}).then((res) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
......@@ -332,7 +331,7 @@ export default {
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
resDel.data.content.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
......@@ -379,7 +378,7 @@ export default {
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
resDel.data.content.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
......
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