Commit 7a2bcd22 authored by caicaicai's avatar caicaicai

修改

parent 2663283e
...@@ -39,14 +39,17 @@ export default { ...@@ -39,14 +39,17 @@ 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.showDe = true; if(res.data.content[0].orderClass == 0){
this.btnShow1 = true; this.showDe = true;
this.btnShow2 = false; this.btnShow1 = true;
this.carDestination = res.data.content[0].destination; this.btnShow2 = false;
this.startOrderSrcUrl = newOrder; this.carDestination = res.data.content[0].destination;
let au = document.getElementById('audio1'); }else{
au.currentTime = 0; this.showDe = true;
au.play(); this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res.data.content[0].destination;
}
} }
} }
}); });
...@@ -65,14 +68,17 @@ export default { ...@@ -65,14 +68,17 @@ 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.showDe = true; if(res.data.content[0].orderClass == 0){
this.btnShow1 = true; this.showDe = true;
this.btnShow2 = false; this.btnShow1 = true;
this.carDestination = res.data.content[0].destination; this.btnShow2 = false;
this.startOrderSrcUrl = newOrder; this.carDestination = res.data.content[0].destination;
let au = document.getElementById('audio1'); }else{
au.currentTime = 0; this.showDe = true;
au.play(); this.btnShow1 = false;
this.btnShow2 = true;
this.carDestination = res.data.content[0].destination;
}
} }
} }
}); });
......
...@@ -370,9 +370,9 @@ export default { ...@@ -370,9 +370,9 @@ export default {
} }
}); });
//车辆信息状态修改 //车辆信息状态修改
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { httpGet(vehicleInformationQuery,{number:number}).then((res) => {
if(res.code == 200){ if(res.code == 200){
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,number:this.carnumber,workStatus:0,weightStatus:1,oddStatus:1}).then((res) => {}); putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:1,oddStatus:1}).then((res) => {});
} }
}); });
//智能调度是否完成 //智能调度是否完成
......
...@@ -10,8 +10,8 @@ module.exports = { ...@@ -10,8 +10,8 @@ module.exports = {
productionSourceMap:false, //去掉打包的时候生成的map文件 productionSourceMap:false, //去掉打包的时候生成的map文件
lintOnSave: false, // 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码 lintOnSave: false, // 是否在开发环境下通过 eslint-loader 在每次保存时 lint 代码
devServer: { devServer: {
//host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试 host: '192.168.0.101', // 也可以直接写IP地址这样方便真机测试
host: 'localhost', //host: 'localhost',
port: 3002, // 端口号 port: 3002, // 端口号
https: false, // https:{type:Boolean} https: false, // https:{type:Boolean}
open: true, // 配置自动启动浏览器 open: 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