Skip to content

N
NewTruckTerminalSyetem
Commit b57a5206 authored by caicaicai's avatar caicaicai
Browse files
Options

修改

parent 7a2bcd22
Hide whitespace changes
Inline Side-by-side
Showing with 65 additions and 22 deletions
src/config.js
View file @ b57a5206
...@@ -4,8 +4,8 @@ const config = { ...@@ -4,8 +4,8 @@ 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.111:9090',
REAL_URL: 'http://192.168.0.108:8001', REAL_URL: 'http://192.168.0.111:9090',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @ b57a5206
...@@ -28,6 +28,7 @@ export default { ...@@ -28,6 +28,7 @@ export default {
btnShow2:false, //完成派单展示 btnShow2:false, //完成派单展示
sonTimer1:null, sonTimer1:null,
startOrderSrcUrl:'',//来订单语音路径 startOrderSrcUrl:'',//来订单语音路径
dingDanId:'',
} }
}, },
mounted(){ mounted(){
...@@ -44,11 +45,19 @@ export default { ...@@ -44,11 +45,19 @@ export default {
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.startOrderSrcUrl = newOrder;
let au = document.getElementById('audio1');
au.currentTime = 0;
au.play();
}else{ }else{
this.showDe = true; this.showDe = true;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = true; this.btnShow2 = true;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
} }
} }
} }
...@@ -73,11 +82,13 @@ export default { ...@@ -73,11 +82,13 @@ export default {
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;
}else{ }else{
this.showDe = true; this.showDe = true;
this.btnShow1 = false; this.btnShow1 = false;
this.btnShow2 = true; this.btnShow2 = true;
this.carDestination = res.data.content[0].destination; this.carDestination = res.data.content[0].destination;
this.dingDanId = res.data.content[0].id;
} }
} }
} }
...@@ -122,12 +133,16 @@ export default { ...@@ -122,12 +133,16 @@ 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,number:this.carnumber,workStatus:1,weightStatus:2}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:1,weightStatus: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) => {
if(res.code == 200){ if(res.code == 200){
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:1}).then((res) => {}); if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:1}).then((res) => {});
}
} }
}); });
}, },
...@@ -142,14 +157,19 @@ export default { ...@@ -142,14 +157,19 @@ 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,number:this.carnumber,oddStatus:1,workStatus:0}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,oddStatus:1,workStatus:0}).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) => {
if(res.code == 200){ if(res.code == 200){
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:0}).then((res) => {}); if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
} }
}); });
httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {});
}, },
//卸车 //卸车
finishPaidanFn(){ finishPaidanFn(){
...@@ -157,15 +177,19 @@ export default { ...@@ -157,15 +177,19 @@ export default {
this.showDe = false; this.showDe = false;
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,number:this.carnumber,workStatus:0,weightStatus:0}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1}).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) => {
if(res.code == 200){ if(res.code == 200){
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:this.carnumber,status:0}).then((res) => {}); if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
} }
}); });
httpDelForJson(dingDanBiaoCaoZuo,{carNo:this.carnumber}).then((res) => {}); httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {});
}, },
//获取当前时间 //获取当前时间
currentTime(){ currentTime(){
......
src/views/MLargeScreen/index.vue
View file @ b57a5206
...@@ -56,17 +56,16 @@ ...@@ -56,17 +56,16 @@
<personalCenter ref="personalCenterMethod" v-show="selectFunction == 6"/> <personalCenter ref="personalCenterMethod" v-show="selectFunction == 6"/>
<smallWindow ref="smallWindowMethod" v-show="selectFunction == 7"/> <smallWindow ref="smallWindowMethod" v-show="selectFunction == 7"/>
<!-- 地图区域 --> <!-- 地图区域 -->
<div id="centerDiv" class="mapcontainer"> <!-- <div id="centerDiv" class="mapcontainer">
<mars3dViewerMap :url="configUrl" @onload="onMapload"/> <mars3dViewerMap :url="configUrl" @onload="onMapload"/>
</div> </div> -->
<!-- 电铲待装车辆列表 --> <!-- 电铲待装车辆列表 -->
<div class="waitingtrucksView" v-if="carclass == '电铲'"> <div class="waitingtrucksView" v-if="carclass == '电铲'">
<div class="waitingtrucksView_title">待装卡车列表</div> <div class="waitingtrucksView_title">待装卡车列表</div>
<div class="waitingtrucksView_content"> <div class="waitingtrucksView_content">
<div v-for="(item,index) in daizhangCar" :key="index"> <div v-for="(item,index) in daizhangCar" :key="index">
<div>车牌号：{{item.number}}</div> <div>车牌号：{{item.number}}</div>
<div>司机：{{item.driver}}</div> <el-button type="primary" style="font-size:18px;" @click="wanchengzhuangcheFn(item.number,item.id)">完成装车</el-button>
<el-button type="primary" style="font-size:18px;" @click="wanchengzhuangcheFn(item.number)">完成装车</el-button>
</div> </div>
</div> </div>
</div> </div>
...@@ -360,19 +359,39 @@ export default { ...@@ -360,19 +359,39 @@ export default {
} }
}, },
//完成装车 //完成装车
wanchengzhuangcheFn(number){ wanchengzhuangcheFn(number,id){
//删除 //删除
httpDelForJson(dingDanBiaoCaoZuo,{carNo:number}).then((res) => {}); httpDelForJson(dingDanBiaoCaoZuo,[id]).then((res) => {
this.loadData1();
});
//改订单状态 //改订单状态
httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:number}).then((res) => { httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,carNo:number,status:0}).then((res) => {}); if(res.data.totalElements == 0){
}else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
} }
}); });
//车辆信息状态修改 //查询Oredr接口，判断是智能调度还是人工调度从而进行车辆信息状态修改
httpGet(vehicleInformationQuery,{number:number}).then((res) => { httpGet(dingDanBiaoCaoZuo,{carNo:number,size:1,sort:'createTime,desc'}).then((res) => {
if(res.code == 200){ if(res.code == 200){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:1,oddStatus:1}).then((res) => {}); if(res.data.content[0].flag != 0){
//车辆信息状态修改
httpGet(vehicleInformationQuery,{number:number}).then((res11) => {
if(res11.code == 200){
putForJson(vehicleInformationUpdate,{id:res11.data.content[0].id,workStatus:0,weightStatus:1,oddStatus:1}).then((res) => {});
}
});
}else{
//车辆信息状态修改
httpGet(vehicleInformationQuery,{number:number}).then((res11) => {
if(res11.code == 200){
putForJson(vehicleInformationUpdate,{id:res11.data.content[0].id,workStatus:0,weightStatus:1}).then((res) => {});
}
});
}
} }
}); });
//智能调度是否完成 //智能调度是否完成
......
vue.config.js
View file @ b57a5206
...@@ -31,13 +31,13 @@ module.exports = { ...@@ -31,13 +31,13 @@ module.exports = {
'/dianziweilan': { '/dianziweilan': {
target: 'http://192.168.0.108:8001' target: 'http://192.168.0.111:9090'
}, },
'/auth': { '/auth': {
target: 'http://192.168.0.108:8001', target: 'http://192.168.0.111:9090',
}, },
'/pic': { '/pic': {
target: 'http://192.168.0.108/avatar/', target: 'http://192.168.0.111/avatar/',
pathRewrite: { '^/pic': '' }, pathRewrite: { '^/pic': '' },
changeOrigin: true, changeOrigin: 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