diff --git a/.env.development b/.env.development index 85f0b6e0..7c8827db 100644 --- a/.env.development +++ b/.env.development @@ -12,11 +12,11 @@ port= 9988 # 服务端地址 // 陈志荣 本地 - target = http://192.168.18.140:8899 + //target = http://192.168.18.140:8899 //target = http://192.168.18.139:8899 // target = http://192.168.18.136:8899 // 测试端 // target = http://192.168.10.241:32024 // 开发端 -// target = http://192.168.10.241:30646 + target = http://192.168.10.241:30646 diff --git a/src/config/env.js b/src/config/env.js index ec52a770..0f22d4c1 100644 --- a/src/config/env.js +++ b/src/config/env.js @@ -28,7 +28,7 @@ let httpProtocol = 'http'; if (env.NODE_ENV == 'development') { flowIotUrl = 'http://127.0.0.1:1880/#flow/' - hrefHost = "192.168.18.140" + hrefHost = "192.168.10.241" } else if(env.NODE_ENV == 'production') { // if (hrefHost.indexOf('.gkiiot.com') >= 0) { // iotHost = 'iot.gkiiot.com' @@ -43,7 +43,7 @@ if (env.NODE_ENV == 'development') { } else if(env.NODE_ENV == 'test') { } sysWebSocket = sysWebSocket + hrefHost + ( port ? ':'+ port :''); -hrefHostUrl = +hrefHostUrl = iotWebSocketAlarmBaseUrl = sysWebSocket + '/ws/alarm/live'; bigWebSocketUrl = sysWebSocket + '/ws/dev/readData' diff --git a/src/views/home/index.vue b/src/views/home/index.vue new file mode 100644 index 00000000..c64e6194 --- /dev/null +++ b/src/views/home/index.vue @@ -0,0 +1,4 @@ + + \ No newline at end of file