|
@@ -49,7 +49,6 @@
|
|
style="padding: 0 !important"
|
|
style="padding: 0 !important"
|
|
>
|
|
>
|
|
<div class="map" style="height: calc(48vh - 35px)">
|
|
<div class="map" style="height: calc(48vh - 35px)">
|
|
- <!-- <iframe id="myIframe" style="width:100%;height:100%;border:none;" src='https://www.thingjs.com/s/ef7ee6a73896c01bda77e679?params=105b0f77fd24654d4eebc434e9'></iframe> -->
|
|
|
|
<iframe
|
|
<iframe
|
|
id="myIframe"
|
|
id="myIframe"
|
|
style="
|
|
style="
|
|
@@ -57,7 +56,9 @@
|
|
height: 100%;
|
|
height: 100%;
|
|
border: none;
|
|
border: none;
|
|
"
|
|
"
|
|
- src="https://www.thingjs.com/s/b11227d4fd5505106989737c?params=105b0f77fd24654d4eebc434e9"
|
|
|
|
|
|
+ :src="thingJsApi"
|
|
|
|
+
|
|
|
|
+
|
|
></iframe>
|
|
></iframe>
|
|
</div>
|
|
</div>
|
|
</el-card>
|
|
</el-card>
|
|
@@ -490,6 +491,8 @@ export default {
|
|
},
|
|
},
|
|
data() {
|
|
data() {
|
|
return {
|
|
return {
|
|
|
|
+ thingJsApi:process.env.VUE_APP_THINGJS_API,
|
|
|
|
+ websocketApi:process.env.VUE_APP_WEBSOCKET_API,
|
|
hls: null,
|
|
hls: null,
|
|
timeNum: null,
|
|
timeNum: null,
|
|
title: "楼层展示",
|
|
title: "楼层展示",
|
|
@@ -580,7 +583,7 @@ export default {
|
|
this.getList();
|
|
this.getList();
|
|
this.getCollect();
|
|
this.getCollect();
|
|
this.yhTable();
|
|
this.yhTable();
|
|
- this.initWebSocket();
|
|
|
|
|
|
+ // this.initWebSocket();
|
|
this.getBuild();
|
|
this.getBuild();
|
|
},
|
|
},
|
|
mounted() {},
|
|
mounted() {},
|
|
@@ -783,7 +786,7 @@ export default {
|
|
}).then((res) => {
|
|
}).then((res) => {
|
|
if (IDX == 7) {
|
|
if (IDX == 7) {
|
|
this.loadVideoFn(
|
|
this.loadVideoFn(
|
|
- `https://iot.usky.cn/hls/${code}.m3u8`,
|
|
|
|
|
|
+ `${process.env.VUE_APP_VIDEO_API}/hls/${code}.m3u8`,
|
|
code
|
|
code
|
|
);
|
|
);
|
|
} else {
|
|
} else {
|
|
@@ -808,7 +811,7 @@ export default {
|
|
if (data[i].DEVICE == code) {
|
|
if (data[i].DEVICE == code) {
|
|
if (data[i].ONAIR && !data[i].LIVEONLINE) {
|
|
if (data[i].ONAIR && !data[i].LIVEONLINE) {
|
|
this.loadVideoFn(
|
|
this.loadVideoFn(
|
|
- `https://iot.usky.cn/hls//${code}.m3u8`,
|
|
|
|
|
|
+ `${process.env.VUE_APP_VIDEO_API}/hls//${code}.m3u8`,
|
|
code
|
|
code
|
|
);
|
|
);
|
|
|
|
|
|
@@ -932,6 +935,7 @@ export default {
|
|
});
|
|
});
|
|
},
|
|
},
|
|
initWebSocket() {
|
|
initWebSocket() {
|
|
|
|
+
|
|
getTbAlarm({
|
|
getTbAlarm({
|
|
current: 1,
|
|
current: 1,
|
|
size: 500,
|
|
size: 500,
|
|
@@ -944,7 +948,9 @@ export default {
|
|
let that = this;
|
|
let that = this;
|
|
let num = 0;
|
|
let num = 0;
|
|
if ("WebSocket" in window) {
|
|
if ("WebSocket" in window) {
|
|
- this.ws = new WebSocket("wss://10.21.39.1:8084/dm/alarmPush");
|
|
|
|
|
|
+ // this.ws = new WebSocket("wss://10.21.39.1:8084/dm/alarmPush");
|
|
|
|
+ this.ws = new WebSocket("wss://"+this.websocketApi+"/dm/alarmPush");
|
|
|
|
+
|
|
// console.log(this.ws)
|
|
// console.log(this.ws)
|
|
this.ws.onopen = () => {
|
|
this.ws.onopen = () => {
|
|
// console.log("websocket连接成功");
|
|
// console.log("websocket连接成功");
|
|
@@ -973,7 +979,7 @@ export default {
|
|
//console.log("连接已关闭...");
|
|
//console.log("连接已关闭...");
|
|
//断线重新连接
|
|
//断线重新连接
|
|
setTimeout(() => {
|
|
setTimeout(() => {
|
|
- this.initWebSocket();
|
|
|
|
|
|
+ // this.initWebSocket();
|
|
}, 2000);
|
|
}, 2000);
|
|
};
|
|
};
|
|
} else {
|
|
} else {
|