Skip to content

N
NewTruckTerminalSyetem
Commit 2e25aecb authored by xxx's avatar xxx
Browse files
Options

1

parent adef5e25
Hide whitespace changes
Inline Side-by-side
Showing with 344 additions and 129 deletions
src/config.js
View file @ 2e25aecb
// 项目配置相关 // 项目配置相关
const config = { const config = {
// BASE_URL: 'http://8.143.203.103:9090', //线上地址2 BASE_URL: 'http://8.143.203.103:9090', //线上地址2
// REAL_URL: 'http://8.143.203.103:9090', //线上地址2 REAL_URL: 'http://8.143.203.103:9090', //线上地址2
BASE_URL: 'http://192.168.0.108:8001', // BASE_URL: 'http://192.168.0.108:8001',
REAL_URL: 'http://192.168.0.108:8001', // REAL_URL: 'http://192.168.0.108:8001',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @ 2e25aecb
...@@ -42,6 +42,8 @@ export default { ...@@ -42,6 +42,8 @@ export default {
dingDanId:'', dingDanId:'',
equipmentName:'',//车载设备编号 equipmentName:'',//车载设备编号
xiecheBtnAble:false,//卸车按钮是否能用 xiecheBtnAble:false,//卸车按钮是否能用
zhinengpaidanBoolan:false,//更改该车是否可接受智能派单
paidanFlag:0,//暂存的派单是否是人工或者智能
//暂存的经纬度 //暂存的经纬度
oldxy:{ oldxy:{
lat:0,//纬度 lat:0,//纬度
...@@ -50,19 +52,98 @@ export default { ...@@ -50,19 +52,98 @@ export default {
} }
}, },
mounted(){ mounted(){
//删除路径
//this.$parent.zhixinglujing(false);
//this.$parent.zhixinglujing2(true);
this.sonTimer1 = setInterval(() => { this.sonTimer1 = setInterval(() => {
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => { //如果zhinengpaidanBoolan为true，获取人工和智能一起的调度
if(res.data.content.length == 0){ if(this.zhinengpaidanBoolan){
//this.loadData2(); //先查人工调度
this.showDe = false; httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber,flag:1}).then((res) => {
this.btnShow1 = false; //如果没有就获取智能调度
this.btnShow2 = false; if(res.data.content.length == 0){
}else{ httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res_1) => {
httpGet(vehicleInformationQuery,{number:this.carnumber,size:1}).then((resSon1) => { if(res_1.data.content.length == 0){
if(resSon1.code == 200){ this.showDe = false;
this.equipmentName = resSon1.data.content[0].equipmentName; this.btnShow1 = false;
if(resSon1.data.content[0].workStatus == 0){ this.btnShow2 = false;
if(res.data.content[0].orderClass == 0){ }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){
this.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
//启动语音
this.startOrderSrcUrl = newOrder;
let au = document.getElementById('audio1');
au.currentTime = 0;
au.play();
}else{
this.showDe = true;
this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
//查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = [];
resSon2[this.carDestination].forEach((item,index)=>{
let weilanobj1 = {};
weilanobj1.lat = item.lat;
weilanobj1.lng = item.lon;
weilanArr1.push(weilanobj1);
})
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
if(resSon3.code == 200){
let resSon3Obj1 = {};
resSon3Obj1.lat = resSon3.data.location.y;
resSon3Obj1.lng = resSon3.data.location.x;
this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1);
}
});
});
}
}
//获取车辆坐标计算距离并返回给后台
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
if(res2.data){
if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
this.oldxy.lat = res2.data.location.y;
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) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
})
}
}
});
}
});
}
})
}else{
//如果有人工调度
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
})
//有人工调度下面展示操作
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;
this.showDe = true; this.showDe = true;
this.btnShow1 = true; this.btnShow1 = true;
this.btnShow2 = false; this.btnShow2 = false;
...@@ -73,15 +154,6 @@ export default { ...@@ -73,15 +154,6 @@ export default {
let au = document.getElementById('audio1'); let au = document.getElementById('audio1');
au.currentTime = 0; au.currentTime = 0;
au.play(); au.play();
}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.$parent.zhixinglujing(false);
//this.$parent.zhixinglujing2(true);
//查询指定目的地围栏以及判断该车是否在围栏里 //查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => { httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = []; let weilanArr1 = [];
...@@ -91,7 +163,7 @@ export default { ...@@ -91,7 +163,7 @@ export default {
weilanobj1.lng = item.lon; weilanobj1.lng = item.lon;
weilanArr1.push(weilanobj1); weilanArr1.push(weilanobj1);
}) })
httpGet(carRealTimeLocationQuery2,{name:this.equipmentName}).then((resSon3) => { httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
if(resSon3.code == 200){ if(resSon3.code == 200){
let resSon3Obj1 = {}; let resSon3Obj1 = {};
resSon3Obj1.lat = resSon3.data.location.y; resSon3Obj1.lat = resSon3.data.location.y;
...@@ -101,56 +173,75 @@ export default { ...@@ -101,56 +173,75 @@ export default {
}); });
}); });
} }
} //获取车辆坐标计算距离并返回给后台
//获取车辆坐标计算距离并返回给后台 httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => { if(res2.data){
if(res2.data){ if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
this.oldxy.lat = res2.data.location.y;
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) => {});
this.$nextTick(()=>{
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{
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) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
})
}
} }
} });
}); }
} });
}); }
} });
}); }else{
}, 10000) //如果zhinengpaidanBoolan为false，获取人工的调度
}, httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber,flag:1}).then((res) => {
methods:{
loadData(carnumber){
this.carnumber = carnumber;
this.$nextTick(()=>{
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.data.content.length == 0){ if(res.data.content.length == 0){
//this.loadData2();
this.showDe = false; this.showDe = false;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = false; this.btnShow2 = false;
}else{ }else{
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
})
//有人工调度下面展示操作
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){
if(res.data.content[0].orderClass == 0){ 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.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;
}else{ //启动语音
this.showDe = true; this.startOrderSrcUrl = newOrder;
this.btnShow1 = false; let au = document.getElementById('audio1');
this.btnShow2 = true; au.currentTime = 0;
this.carDestination = res.data.content[0].destination; au.play();
this.dingDanId = res.data.content[0].id; //查询指定目的地围栏以及判断该车是否在围栏里
} httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = [];
resSon2[this.carDestination].forEach((item,index)=>{
let weilanobj1 = {};
weilanobj1.lat = item.lat;
weilanobj1.lng = item.lon;
weilanArr1.push(weilanobj1);
})
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
if(resSon3.code == 200){
let resSon3Obj1 = {};
resSon3Obj1.lat = resSon3.data.location.y;
resSon3Obj1.lng = resSon3.data.location.x;
this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1);
}
});
});
} }
//获取车辆坐标计算距离并返回给后台 //获取车辆坐标计算距离并返回给后台
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => { httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
...@@ -172,6 +263,153 @@ export default { ...@@ -172,6 +263,153 @@ export default {
}); });
} }
}); });
}
}, 10000)
},
methods:{
loadData(carnumber){
this.carnumber = carnumber;
this.$nextTick(()=>{
//如果zhinengpaidanBoolan为true，获取人工和智能一起的调度
if(this.zhinengpaidanBoolan){
//先查人工调度
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber,flag:1}).then((res) => {
//如果没有就获取智能调度
if(res.data.content.length == 0){
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res_1) => {
if(res_1.data.content.length == 0){
this.showDe = false;
this.btnShow1 = false;
this.btnShow2 = false;
}else{
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.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.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;
}
}
//获取车辆坐标计算距离并返回给后台
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
if(res2.data){
if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
this.oldxy.lat = res2.data.location.y;
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) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
})
}
}
});
}
});
}
})
}else{
//如果有人工调度
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
})
//有人工调度下面展示操作
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;
this.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
}
//获取车辆坐标计算距离并返回给后台
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
if(res2.data){
if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
this.oldxy.lat = res2.data.location.y;
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) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
})
}
}
});
}
});
}
});
}else{
//如果zhinengpaidanBoolan为false，获取人工的调度
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',size:1,carNo:this.carnumber,flag:1}).then((res) => {
if(res.data.content.length == 0){
this.showDe = false;
this.btnShow1 = false;
this.btnShow2 = false;
}else{
//有人工调度就删除智能调度单子
httpGet(dingDanBiaoCaoZuo,{sort:'createTime,desc',carNo:this.carnumber,flag:0}).then((resDel) => {
if(resDel.code == 200){
resDel.data.conten.forEach((itemDel,indexDel)=>{
httpDelForJson(dingDanBiaoCaoZuo,[itemDel.id]).then((resDelSon) => {});
})
}
})
//有人工调度下面操作
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;
this.showDe = true;
this.btnShow1 = true;
this.btnShow2 = false;
this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
}
//获取车辆坐标计算距离并返回给后台
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((res2) => {
if(res2.data){
if(this.oldxy.lat == 0 || this.oldxy.lng == 0){
this.oldxy.lat = res2.data.location.y;
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) => {});
this.$nextTick(()=>{
this.oldxy.lat = res2.data.location.y;
this.oldxy.lng = res2.data.location.x;
})
}
}
});
}
});
}
});
}
}) })
}, },
...@@ -181,25 +419,6 @@ export default { ...@@ -181,25 +419,6 @@ export default {
clearInterval(this.sonTimer1); //关闭 clearInterval(this.sonTimer1); //关闭
} }
}, },
//查询是否有卸车
loadData2(){
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
if(res.code == 200){
if(res.data.content[0].weightStatus == 1){
httpGet(getXieCheDingDanQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.length == 0){
return
}else{
this.showDe = true;
this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res[0].destination;
}
});
}
}
});
},
//开始派单 //开始派单
startPaidanFn(){ startPaidanFn(){
this.btnShow1 = false; this.btnShow1 = false;
...@@ -210,7 +429,11 @@ export default { ...@@ -210,7 +429,11 @@ export default {
}); });
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:1,weightStatus:2}).then((res) => {}); if(this.paidanFlag == 0){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus:2,odo:1}).then((res) => {});
}else if(this.paidanFlag == 0){
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) => { httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
...@@ -229,7 +452,7 @@ export default { ...@@ -229,7 +452,7 @@ export default {
refusePaidanFn(){ refusePaidanFn(){
this.btnShow1 = false; this.btnShow1 = false;
this.showDe = false; this.showDe = false;
this.paidanFlag = 0;
this.$notify({ this.$notify({
title: '已拒绝派单！', title: '已拒绝派单！',
type: 'success', type: 'success',
...@@ -237,7 +460,7 @@ export default { ...@@ -237,7 +460,7 @@ export default {
}); });
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,oddStatus:1,workStatus:0}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,oddStatus:1,workStatus:0,odo:3}).then((res) => {});
} }
}); });
httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => { httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
...@@ -266,9 +489,10 @@ export default { ...@@ -266,9 +489,10 @@ export default {
}else{ }else{
this.btnShow2 = false; this.btnShow2 = false;
this.showDe = false; this.showDe = false;
this.paidanFlag = 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}).then((res) => {}); 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) => { httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
...@@ -392,6 +616,10 @@ export default { ...@@ -392,6 +616,10 @@ export default {
s = Math.round(s * 10000) / 10000; s = Math.round(s * 10000) / 10000;
return s return s
}, },
//更改该车是否可接受智能派单
zhinengpaidanFn(boolan){
this.zhinengpaidanBoolan = boolan;
},
}, },
beforeDestroy() { beforeDestroy() {
......
src/views/MLargeScreen/index.vue
View file @ 2e25aecb
...@@ -16,11 +16,8 @@ ...@@ -16,11 +16,8 @@
</div> </div>
</div> </div>
<div class="centerViews"> <div class="centerViews">
<!-- <div :class="orderReceiving == '停止接单' ? 'IntelligentDis1' : 'IntelligentDis2'" @click="IntelligentDisFn()"> <div :class="orderReceiving ? 'IntelligentDis1' : 'IntelligentDis2'" @click="IntelligentDisFn()">
<div :class="orderReceiving == '停止接单' ? 'centerViewsTitle1' : 'centerViewsTitle2'">{{orderReceiving}}</div> <div :class="orderReceiving ? 'centerViewsTitle1' : 'centerViewsTitle2'">智能派单</div>
</div> -->
<div class="IntelligentDis1">
<div class="centerViewsTitle1">接收派单</div>
</div> </div>
<div :class="selectFunction == 2 ? 'voiceAp2' : 'voiceAp1'" @click="voiceApFn()"> <div :class="selectFunction == 2 ? 'voiceAp2' : 'voiceAp1'" @click="voiceApFn()">
<div :class="selectFunction == 2 ? 'centerViewsTitle1' : 'centerViewsTitle2'">语音申请</div> <div :class="selectFunction == 2 ? 'centerViewsTitle1' : 'centerViewsTitle2'">语音申请</div>
...@@ -118,7 +115,7 @@ export default { ...@@ -118,7 +115,7 @@ export default {
configUrl: basePathUrl + 'config/config.json', configUrl: basePathUrl + 'config/config.json',
notifyPromise:Promise.resolve(), notifyPromise:Promise.resolve(),
systemTitle:'卡车调度系统卡车终端', systemTitle:'卡车调度系统卡车终端',
orderReceiving:'开始接单', orderReceiving:false,
personalName:'', personalName:'',
zongTimer1:null, zongTimer1:null,
zongTimer2:null, zongTimer2:null,
...@@ -224,7 +221,7 @@ export default { ...@@ -224,7 +221,7 @@ export default {
} }
}); });
//展示二维地图 //展示二维地图
//this.$refs.mars3dViewerMapMethod.getCarInforFn(); this.$refs.mars3dViewerMapMethod.getCarInforFn();
}, },
//获取待装卡车列表 //获取待装卡车列表
...@@ -257,23 +254,13 @@ export default { ...@@ -257,23 +254,13 @@ export default {
}, },
//接受派单 //接受派单
IntelligentDisFn(){ IntelligentDisFn(){
// if(this.orderReceiving == "停止接单"){ if(this.orderReceiving){
// this.orderReceiving = '开始接单'; this.orderReceiving = false;
// this.$refs.startOrderReceivingMethod.loadData(this.carnumber,false); this.$refs.startOrderReceivingMethod.zhinengpaidanFn(false);
// }else{ }else{
// this.orderReceiving = '停止接单'; this.orderReceiving = true;
// this.$refs.startOrderReceivingMethod.loadData(this.carnumber,true); this.$refs.startOrderReceivingMethod.zhinengpaidanFn(true);
// } }
// this.$refs.voiceApplicationMethod.voiceAppCloseFn();
// this.$refs.failureDeclarationMethod.failureDeCloseFn();
// this.$refs.performanceStatisticsMethod.achievementCloseFn();
// this.$refs.carInformationMethod.carInCloseFn();
// this.$refs.personalCenterMethod.personalCenCloseFn();
// this.$refs.smallWindowMethod.carInCloseFn();
}, },
//语音申请 //语音申请
voiceApFn(tishi){ voiceApFn(tishi){
......
vue.config.js
View file @ 2e25aecb
...@@ -16,30 +16,30 @@ module.exports = { ...@@ -16,30 +16,30 @@ module.exports = {
open: true, // 配置自动启动浏览器 open: true, // 配置自动启动浏览器
proxy: { proxy: {
// '/dianziweilan': {
// target: 'http://8.143.203.103:9090'
// },
// '/auth': {
// target: 'http://8.143.203.103:9090',
// },
// '/pic': {
// target: 'http://8.143.203.103/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
'/dianziweilan': { '/dianziweilan': {
target: 'http://192.168.0.108:8001' target: 'http://8.143.203.103:9090'
}, },
'/auth': { '/auth': {
target: 'http://192.168.0.108:8001', target: 'http://8.143.203.103:9090',
}, },
'/pic': { '/pic': {
target: 'http://192.168.0.108/avatar/', target: 'http://8.143.203.103/avatar/',
pathRewrite: { '^/pic': '' }, pathRewrite: { '^/pic': '' },
changeOrigin: true, changeOrigin: true,
}, },
// '/dianziweilan': {
// target: 'http://192.168.0.108:8001'
// },
// '/auth': {
// target: 'http://192.168.0.108:8001',
// },
// '/pic': {
// target: 'http://192.168.0.108/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
}, },
//https: true, //https: true,
......
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