Skip to content

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

1

parent eba05cf5
Hide whitespace changes
Inline Side-by-side
Showing with 76 additions and 69 deletions
src/components/mars3d/Map.vue
View file @ e033eeaa
...@@ -247,7 +247,8 @@ export default { ...@@ -247,7 +247,8 @@ export default {
const graphic = new mars3d.graphic.BillboardEntity({ const graphic = new mars3d.graphic.BillboardEntity({
style: { style: {
image: pic ? 'http://8.143.203.103:9090/avatar/' + pic : ddd, //image: pic ? 'http://8.143.203.103:9090/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 @ e033eeaa
// 项目配置相关 // 项目配置相关
const config = { const config = {
BASE_URL: 'http://8.143.203.103:9090', //线上地址2 // BASE_URL: 'http://8.143.203.103:9090',
REAL_URL: 'http://8.143.203.103:9090', //线上地址2 // REAL_URL: 'http://8.143.203.103:9090',
// BASE_URL: 'http://192.168.0.108:8001', BASE_URL: 'http://120.224.103.84:9092',
// REAL_URL: 'http://192.168.0.108:8001', 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 @ e033eeaa
...@@ -91,21 +91,23 @@ export default { ...@@ -91,21 +91,23 @@ export default {
this.dingDanId = res.data.content[0].id; this.dingDanId = res.data.content[0].id;
//查询指定目的地围栏以及判断该车是否在围栏里 //查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => { httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = []; if(resSon2){
resSon2[this.carDestination].forEach((item,index)=>{ let weilanArr1 = [];
let weilanobj1 = {}; resSon2[this.carDestination].forEach((item,index)=>{
weilanobj1.lat = item.lat; let weilanobj1 = {};
weilanobj1.lng = item.lon; weilanobj1.lat = item.lat;
weilanArr1.push(weilanobj1); weilanobj1.lng = item.lon;
}) weilanArr1.push(weilanobj1);
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => { })
if(resSon3.code == 200){ httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
let resSon3Obj1 = {}; if(resSon3.code == 200){
resSon3Obj1.lat = resSon3.data.location.y; let resSon3Obj1 = {};
resSon3Obj1.lng = resSon3.data.location.x; resSon3Obj1.lat = resSon3.data.location.y;
this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1); resSon3Obj1.lng = resSon3.data.location.x;
} this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1);
}); }
});
}
}); });
} }
} }
...@@ -156,21 +158,23 @@ export default { ...@@ -156,21 +158,23 @@ export default {
au.play(); au.play();
//查询指定目的地围栏以及判断该车是否在围栏里 //查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => { httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = []; if(resSon2){
resSon2[this.carDestination].forEach((item,index)=>{ let weilanArr1 = [];
let weilanobj1 = {}; resSon2[this.carDestination].forEach((item,index)=>{
weilanobj1.lat = item.lat; let weilanobj1 = {};
weilanobj1.lng = item.lon; weilanobj1.lat = item.lat;
weilanArr1.push(weilanobj1); weilanobj1.lng = item.lon;
}) weilanArr1.push(weilanobj1);
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => { })
if(resSon3.code == 200){ httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
let resSon3Obj1 = {}; if(resSon3.code == 200){
resSon3Obj1.lat = resSon3.data.location.y; let resSon3Obj1 = {};
resSon3Obj1.lng = resSon3.data.location.x; resSon3Obj1.lat = resSon3.data.location.y;
this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1); resSon3Obj1.lng = resSon3.data.location.x;
} this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1);
}); }
});
}
}); });
} }
//获取车辆坐标计算距离并返回给后台 //获取车辆坐标计算距离并返回给后台
...@@ -226,21 +230,23 @@ export default { ...@@ -226,21 +230,23 @@ export default {
au.play(); au.play();
//查询指定目的地围栏以及判断该车是否在围栏里 //查询指定目的地围栏以及判断该车是否在围栏里
httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => { httpGet(screenMapSetUpQuery,{size:9999,name:this.carDestination}).then((resSon2) => {
let weilanArr1 = []; if(resSon2){
resSon2[this.carDestination].forEach((item,index)=>{ let weilanArr1 = [];
let weilanobj1 = {}; resSon2[this.carDestination].forEach((item,index)=>{
weilanobj1.lat = item.lat; let weilanobj1 = {};
weilanobj1.lng = item.lon; weilanobj1.lat = item.lat;
weilanArr1.push(weilanobj1); weilanobj1.lng = item.lon;
}) weilanArr1.push(weilanobj1);
httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => { })
if(resSon3.code == 200){ httpGet(carRealTimeLocationQuery2,{name:resSon1.data.content[0].equipmentName}).then((resSon3) => {
let resSon3Obj1 = {}; if(resSon3.code == 200){
resSon3Obj1.lat = resSon3.data.location.y; let resSon3Obj1 = {};
resSon3Obj1.lng = resSon3.data.location.x; resSon3Obj1.lat = resSon3.data.location.y;
this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1); resSon3Obj1.lng = resSon3.data.location.x;
} this.xiecheBtnAble = this.isPointInPolygon(resSon3Obj1,weilanArr1);
}); }
});
}
}); });
} }
//获取车辆坐标计算距离并返回给后台 //获取车辆坐标计算距离并返回给后台
......
src/views/MLargeScreen/components/voiceApplication/index.vue
View file @ e033eeaa
...@@ -246,8 +246,8 @@ export default { ...@@ -246,8 +246,8 @@ export default {
//初始化weosocket //初始化weosocket
initWebSocket(){ initWebSocket(){
const wsuri = 'ws://8.143.203.103:9090/webSocket' + '/' + this.userName1; //const wsuri = 'ws://8.143.203.103:9090/webSocket' + '/' + this.userName1;
//const wsuri = 'ws://192.168.0.111:9090/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 @ e033eeaa
...@@ -16,33 +16,33 @@ module.exports = { ...@@ -16,33 +16,33 @@ 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://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,
},
}, },
https: true, //https: true,
}, },
configureWebpack: { configureWebpack: {
plugins: [ plugins: [
......
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