Commit c0730dc9 authored by caicaicai's avatar caicaicai

修改

parent 3595d804
{
"map3d": {
"scene": {
"center": {"lat":36.655207,"lng":117.130,"alt":2500,"heading":360,"pitch":-90},
"center": {"lat":36.6800,"lng":117.1205,"alt":2500,"heading":360,"pitch":-90},
"scene3DOnly": false,
"shadows": false,
"removeDblClick": true,
......
// 项目配置相关
const config = {
// BASE_URL: 'http://8.143.203.103:9090', //线上地址2
// REAL_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
BASE_URL: 'http://192.168.0.110:8001',
REAL_URL: 'http://192.168.0.110:8001',
// BASE_URL: 'http://192.168.0.110:8001',
// REAL_URL: 'http://192.168.0.110:8001',
TOKEN_KEY: 'token',
USER_KEY: 'userInfo',
......
......@@ -256,8 +256,8 @@ export default {
//初始化weosocket
initWebSocket(){
//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://8.143.203.103:9090/webSocket' + '/' + this.userName1;
//const wsuri = 'ws://192.168.0.111:9090/webSocket' + '/' + this.userName1;
this.websocket = new WebSocket(wsuri);
this.websocket.onopen = this.websocketonopen;
this.websocket.onerror = this.websocketonerror;
......
......@@ -110,6 +110,7 @@ export default {
return {
//地图图片
configUrl: basePathUrl + 'config/config.json',
notifyPromise:Promise.resolve(),
orderReceiving:'开始接单',
carName:'4001',
personalName:'李三',
......@@ -143,10 +144,13 @@ export default {
httpGet(getalarmRealQuery,{name:res.data.content[0].equipmentName}).then((res1) => {
if(res1.code == 200){
res1.data.forEach((item,index) => {
this.notifyPromise = this.notifyPromise.then(this.$nextTick).then(()=>{
this.$notify({
title: (item.type == 1 ? "闯入" : item.type == 2 ? '闯出' : '') + item.areaName,
type: 'warning',
duration: 2500
duration: 8000,
dangerouslyUseHTMLString: true,
});
});
});
}
......
......@@ -17,31 +17,31 @@ module.exports = {
open: true, // 配置自动启动浏览器
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': {
target: 'http://192.168.0.110:8001'
target: 'http://8.143.203.103:9090'
},
'/auth': {
target: 'http://192.168.0.110:8001',
target: 'http://8.143.203.103:9090',
},
'/pic': {
target: 'http://192.168.0.110/avatar/',
target: 'http://8.143.203.103/avatar/',
pathRewrite: { '^/pic': '' },
changeOrigin: true,
},
// '/dianziweilan': {
// target: 'http://192.168.0.110:8001'
// },
// '/auth': {
// target: 'http://192.168.0.110:8001',
// },
// '/pic': {
// target: 'http://192.168.0.110/avatar/',
// pathRewrite: { '^/pic': '' },
// changeOrigin: 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