coding
This commit is contained in:
parent
e6cd43373c
commit
7d405680d1
|
@ -2,4 +2,3 @@ NODE_ENV=development
|
||||||
VUE_APP_PREVIEW=true
|
VUE_APP_PREVIEW=true
|
||||||
VUE_APP_API_BASE_URL=/api
|
VUE_APP_API_BASE_URL=/api
|
||||||
VUE_APP_API_URL=http://192.168.0.189:8099
|
VUE_APP_API_URL=http://192.168.0.189:8099
|
||||||
VUE_APP_MAPVIEW_URL = ws://192.168.0.189:8099
|
|
||||||
|
|
3
public/config.js
vendored
3
public/config.js
vendored
|
@ -5,8 +5,7 @@ window._CONFIG = {
|
||||||
TerrainProviderUrl: '/map/mapTerrain/',
|
TerrainProviderUrl: '/map/mapTerrain/',
|
||||||
thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin',
|
thirdLoginUrl: 'http://127.0.0.1:8080/thirdLogin',
|
||||||
clientId: '0123456789',
|
clientId: '0123456789',
|
||||||
evaluationSrc: 'http://127.0.0.1:8000',
|
evaluationSrc: 'http://192.168.0.189:8088/thirdLogin/thirdLoginPage?username=admin',
|
||||||
VUE_APP_API_URL: 'http://192.168.0.189:8099',
|
VUE_APP_API_URL: 'http://192.168.0.189:8099',
|
||||||
VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.189:8099',
|
VUE_APP_WEBSOCKET_URL: 'ws://192.168.0.189:8099',
|
||||||
VUE_APP_MAPVIEW_URL:'ws://192.168.0.189:8099'
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -13,7 +13,7 @@ NProgress.configure({ showSpinner: false }) // NProgress Configuration
|
||||||
|
|
||||||
const allowList = ['thirdLogin', 'login', 'register', 'registerResult'] // no redirect allowList
|
const allowList = ['thirdLogin', 'login', 'register', 'registerResult'] // no redirect allowList
|
||||||
const loginRoutePath = '/user/login'
|
const loginRoutePath = '/user/login'
|
||||||
const defaultRoutePath = '/user/thirdLogin'
|
const defaultRoutePath = '/user/welcome'
|
||||||
|
|
||||||
router.beforeEach((to, from, next) => {
|
router.beforeEach((to, from, next) => {
|
||||||
NProgress.start() // start progress bar
|
NProgress.start() // start progress bar
|
||||||
|
|
|
@ -97,7 +97,7 @@ export default {
|
||||||
|
|
||||||
initWebSocket() {
|
initWebSocket() {
|
||||||
// 创建连接(替换实际地址)
|
// 创建连接(替换实际地址)
|
||||||
this.ws = new WebSocket(window._CONFIG.VUE_APP_MAPVIEW_URL+`/ws/${this.scenarioId}/${this.homeId}`)
|
this.ws = new WebSocket(window._CONFIG.VUE_APP_WEBSOCKET_URL+`/ws/${this.scenarioId}/${this.homeId}`)
|
||||||
|
|
||||||
// 监听连接成功
|
// 监听连接成功
|
||||||
this.ws.onopen = () => {
|
this.ws.onopen = () => {
|
||||||
|
|
Loading…
Reference in New Issue
Block a user