Commit adef5e25 authored by xxx's avatar xxx

1

parent d479ac66
// 项目配置相关 // 项目配置相关
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',
......
...@@ -204,12 +204,14 @@ export default { ...@@ -204,12 +204,14 @@ export default {
this.$refs.startOrderReceivingMethod.loadData(this.carnumber); this.$refs.startOrderReceivingMethod.loadData(this.carnumber);
this.$refs.voiceApplicationMethod.loadData3(this.carnumber); this.$refs.voiceApplicationMethod.loadData3(this.carnumber);
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res1) => {
if(res.code == 200){ if(res1.code == 200){
if(res.data.totalElements == 0){ if(res1.data.totalElements == 0){
return return
}else{ }else{
this.carclass = res.data.content[0].carclass; //修改车辆状态为在线
putForJson(vehicleInformationUpdate,{id:res1.data.content[0].id,odo:3}).then((res2) => {});
this.carclass = res1.data.content[0].carclass;
if(this.carclass == '铲车'){ if(this.carclass == '铲车'){
this.loadData1(); this.loadData1();
this.systemTitle = '卡车调度系统铲车终端'; this.systemTitle = '卡车调度系统铲车终端';
......
...@@ -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