Skip to content

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

1

parent c844cec0
Hide whitespace changes
Inline Side-by-side
Showing with 58 additions and 54 deletions
src/components/mars3d/Map.vue
View file @ e4ee906e
...@@ -217,8 +217,8 @@ export default { ...@@ -217,8 +217,8 @@ export default {
//模型配置 //模型配置
const graphic = new mars3d.graphic.BillboardEntity({ const graphic = new mars3d.graphic.BillboardEntity({
style: { style: {
//image: pic ? 'http://8.143.203.103:9092/avatar/' + pic : ddd, image: pic ? 'http://8.143.203.103:9092/avatar/' + pic : ddd,
image: pic ? 'http://120.224.103.84:9092/avatar/' + pic : ddd, // image: pic ? 'http://120.224.103.84:9092/avatar/' + pic : ddd,
width:35, width:35,
height:35, height:35,
horizontalOrigin: Cesium.HorizontalOrigin.CENTER, horizontalOrigin: Cesium.HorizontalOrigin.CENTER,
......
src/config.js
View file @ e4ee906e
// 项目配置相关 // 项目配置相关
const config = { const config = {
// BASE_URL: 'http://8.143.203.103:9092', BASE_URL: 'http://8.143.203.103:9092',
// REAL_URL: 'http://8.143.203.103:9092', REAL_URL: 'http://8.143.203.103:9092',
BASE_URL: 'http://120.224.103.84:9092', // BASE_URL: 'http://120.224.103.84:9092',
REAL_URL: 'http://120.224.103.84:9092', // REAL_URL: 'http://120.224.103.84:9092',
TOKEN_KEY: 'token', TOKEN_KEY: 'token',
USER_KEY: 'userInfo', USER_KEY: 'userInfo',
......
src/views/MLargeScreen/components/startOrderReceiving/index.vue
View file @ e4ee906e
...@@ -600,23 +600,25 @@ export default { ...@@ -600,23 +600,25 @@ export default {
this.btnShow4 = false; this.btnShow4 = false;
this.paidanFlag = 0; this.paidanFlag = 0;
this.zuizhongpaidanFlag = 0; this.zuizhongpaidanFlag = 0;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { this.$nextTick(()=>{
if(res.code == 200){ httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {}); if(res.code == 200){
} 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) => { });
if(res.code == 200){ httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.data.totalElements == 0){ if(res.code == 200){
if(res.data.totalElements == 0){
}else{ }else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {}); putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
} }
} });
}); httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => { this.$parent.zhixinglujing(false,this.carnumber,this.carDestination);
this.$parent.zhixinglujing(false,this.carnumber,this.carDestination); });
}); })
this.$nextTick(()=>{ this.$nextTick(()=>{
this.oldxy.lat = 0; this.oldxy.lat = 0;
this.oldxy.lng = 0; this.oldxy.lng = 0;
...@@ -665,23 +667,25 @@ export default { ...@@ -665,23 +667,25 @@ export default {
this.showDe = false; this.showDe = false;
this.paidanFlag = 0; this.paidanFlag = 0;
this.zuizhongpaidanFlag = 0; this.zuizhongpaidanFlag = 0;
httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => { this.$nextTick(()=>{
if(res.code == 200){ httpGet(vehicleInformationQuery,{number:this.carnumber}).then((res) => {
putForJson(vehicleInformationUpdate,{id:res.data.content[0].id,workStatus:0,weightStatus:0,oddStatus:1,odo:3}).then((res) => {}); if(res.code == 200){
} 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) => { });
if(res.code == 200){ httpGet(manualSchedulingQuery,{sort:'createTime,desc',size:1,carNo:this.carnumber}).then((res) => {
if(res.data.totalElements == 0){ if(res.code == 200){
if(res.data.totalElements == 0){
}else{ }else{
putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {}); putForJson(manualSchedulingQuery,{id:res.data.content[0].id,status:0}).then((res) => {});
}
} }
} });
}); httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => {
httpDelForJson(dingDanBiaoCaoZuo,[this.dingDanId]).then((res) => { this.$parent.zhixinglujing(false,this.carnumber,this.carDestination);
this.$parent.zhixinglujing(false,this.carnumber,this.carDestination); });
}); })
this.$nextTick(()=>{ this.$nextTick(()=>{
this.oldxy.lat = 0; this.oldxy.lat = 0;
this.oldxy.lng = 0; this.oldxy.lng = 0;
......
src/views/MLargeScreen/components/voiceApplication/index.vue
View file @ e4ee906e
...@@ -248,8 +248,8 @@ export default { ...@@ -248,8 +248,8 @@ export default {
//初始化weosocket //初始化weosocket
initWebSocket(){ initWebSocket(){
//const wsuri = 'ws://8.143.203.103:9092/webSocket' + '/' + this.userName1; const wsuri = 'ws://8.143.203.103:9092/webSocket' + '/' + this.userName1;
const wsuri = 'ws://120.224.103.84:9092/webSocket' + '/' + this.userName1; // const wsuri = 'ws://120.224.103.84:9092/webSocket' + '/' + this.userName1;
this.websocket = new WebSocket(wsuri); this.websocket = new WebSocket(wsuri);
this.websocket.onopen = this.websocketonopen; this.websocket.onopen = this.websocketonopen;
this.websocket.onerror = this.websocketonerror; this.websocket.onerror = this.websocketonerror;
......
vue.config.js
View file @ e4ee906e
...@@ -15,30 +15,30 @@ module.exports = { ...@@ -15,30 +15,30 @@ module.exports = {
open: true, // 配置自动启动浏览器 open: true, // 配置自动启动浏览器
proxy: { proxy: {
// '/dianziweilan': {
// target: 'http://8.143.203.103:9092'
// },
// '/auth': {
// target: 'http://8.143.203.103:9092',
// },
// '/pic': {
// target: 'http://8.143.203.103/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
'/dianziweilan': { '/dianziweilan': {
target: 'http://120.224.103.84:9092' target: 'http://8.143.203.103:9092'
}, },
'/auth': { '/auth': {
target: 'http://120.224.103.84:9092', target: 'http://8.143.203.103:9092',
}, },
'/pic': { '/pic': {
target: 'http://120.224.103.84/avatar/', target: 'http://8.143.203.103/avatar/',
pathRewrite: { '^/pic': '' }, pathRewrite: { '^/pic': '' },
changeOrigin: true, changeOrigin: true,
}, },
// '/dianziweilan': {
// target: 'http://120.224.103.84:9092'
// },
// '/auth': {
// target: 'http://120.224.103.84:9092',
// },
// '/pic': {
// target: 'http://120.224.103.84/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: true,
// },
//获取会话号 //获取会话号
// '/jiankong': { // '/jiankong': {
// target: 'http://oa.gemho.cn:8088', // target: 'http://oa.gemho.cn:8088',
......
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