tijao
This commit is contained in:
parent
8ee6310280
commit
cea56cde5c
|
@ -23,6 +23,7 @@ var iotHost="192.168.10.241:32024"; // 海创iot 平台 host
|
||||||
var hrefHost = window.location.host;
|
var hrefHost = window.location.host;
|
||||||
// let httpProtocol = window.location.protocol;
|
// let httpProtocol = window.location.protocol;
|
||||||
// var hrefHost = '192.168.18.139';
|
// var hrefHost = '192.168.18.139';
|
||||||
|
port = ':' + port
|
||||||
let httpProtocol = window.dasConfig.protocol ? window.dasConfig.protocol : 'http://';
|
let httpProtocol = window.dasConfig.protocol ? window.dasConfig.protocol : 'http://';
|
||||||
|
|
||||||
|
|
||||||
|
@ -37,12 +38,13 @@ if (env.NODE_ENV == 'development') {
|
||||||
sysWebSocket = 'wss://';
|
sysWebSocket = 'wss://';
|
||||||
}
|
}
|
||||||
if (window.dasConfig.ip) {
|
if (window.dasConfig.ip) {
|
||||||
hrefHost = window.dasConfig.ip + window.dasConfig.prodApi ? '/' + window.dasConfig.prodApi : ''
|
hrefHost = window.dasConfig.ip
|
||||||
}
|
}
|
||||||
port = window.dasConfig.port
|
port = window.dasConfig.port ? ':' + window.dasConfig.port : '' + window.dasConfig.prodApi ? '/' + window.dasConfig.prodApi : ''
|
||||||
|
|
||||||
} else if(env.NODE_ENV == 'test') {
|
} else if(env.NODE_ENV == 'test') {
|
||||||
}
|
}
|
||||||
sysWebSocket = sysWebSocket + hrefHost + ( port ? ':'+ port :'');
|
sysWebSocket = sysWebSocket + hrefHost + port;
|
||||||
hrefHostUrl =
|
hrefHostUrl =
|
||||||
|
|
||||||
iotWebSocketAlarmBaseUrl = sysWebSocket + '/ws/alarm/live';
|
iotWebSocketAlarmBaseUrl = sysWebSocket + '/ws/alarm/live';
|
||||||
|
|
Loading…
Reference in New Issue