Compare commits

..

No commits in common. "355d666d55ff0e934a3492fdbb7661b1b327f41a" and "e0b24650eb641e3dddd3c20c72e7f0ead0a68f70" have entirely different histories.

4 changed files with 8 additions and 31 deletions

View File

@ -244,7 +244,7 @@ export default {
#app { #app {
// width: 6144px; // width: 6144px;
// height: 1920px; // height: 1920px;
background: rgba(1, 1, 7, 0); background: rgba(1, 1, 7, 1);
// overflow: hidden; // overflow: hidden;
.header { .header {
height: 11%; height: 11%;

View File

@ -37,8 +37,7 @@ class mqttHandle {
const { host, port, endpoint, ...options } = this.connect; const { host, port, endpoint, ...options } = this.connect;
console.log("this.connect.host", this.connect.host) console.log("this.connect.host", this.connect.host)
// const connectUrl = 'ws://138.227.111.141:8083/mqtt'; // const connectUrl = 'ws://138.227.111.141:8083/mqtt';
// const connectUrl = 'ws://138.227.208.100:1884/mqtt'; const connectUrl = 'ws://138.227.208.100:1884/mqtt';
const connectUrl = 'ws://172.16.1.253:1884/mqtt';
// const connectUrl = `ws://${this.connect.host}:${this.connect.port}`; // const connectUrl = `ws://${this.connect.host}:${this.connect.port}`;
// if (!client.connected) { // if (!client.connected) {
// client.on('connect', function () { // client.on('connect', function () {

View File

@ -203,12 +203,12 @@
<div class="rightThree"> <div class="rightThree">
<div class="title" style="height: 15%">摄像监控</div> <div class="title" style="height: 15%">摄像监控</div>
<div class="camera"> <div class="camera">
<!-- <div <div
class="cameraList" class="cameraList"
v-for="(item, index) in cameraList" v-for="(item, index) in cameraList"
:key="index" :key="index"
@click="changeCamera(item.video)" @click="changeCamera(item.video)"
> --> >
<!-- <img :src="item.icon" style="width: 100%; height: 100%" /> --> <!-- <img :src="item.icon" style="width: 100%; height: 100%" /> -->
<!-- <iframe <!-- <iframe
:src="item.video" :src="item.video"
@ -221,7 +221,7 @@
:videoUrl="item.video" :videoUrl="item.video"
:id="index" :id="index"
/> --> /> -->
<!-- </div> --> </div>
</div> </div>
</div> </div>
</div> </div>
@ -399,7 +399,7 @@ export default {
}; };
}, },
mounted() { mounted() {
// this.getCamera(); this.getCamera();
//id //id
this.getBuildingData(); this.getBuildingData();
let that = this; let that = this;

View File

@ -64,14 +64,14 @@
<img src="../assets/images/camera.png" style="width:100%;height:100%"/> <img src="../assets/images/camera.png" style="width:100%;height:100%"/>
</div> --> </div> -->
<div class="warnCameraList"> <div class="warnCameraList">
<!-- <div <div
style="width: 45%; height: 30%" style="width: 45%; height: 30%"
v-for="(item, index) in warnCameraList" v-for="(item, index) in warnCameraList"
:key="index" :key="index"
@click="videoChange(index)" @click="videoChange(index)"
> >
<img :src="item.icon" style="width: 100%; height: 100%" /> <img :src="item.icon" style="width: 100%; height: 100%" />
</div> --> </div>
</div> </div>
</div> </div>
</div> </div>
@ -636,32 +636,10 @@ export default {
this.getAlarmCount(); this.getAlarmCount();
} }
if (warnListMqtt[i].DeviceType == "消防") { if (warnListMqtt[i].DeviceType == "消防") {
console.log("warnListMqtt[i]",warnListMqtt[i])
this.fireWarnList.splice(0, 0, warnListMqtt[i]); this.fireWarnList.splice(0, 0, warnListMqtt[i]);
this.getWarning(warnListMqtt[i].position)
} }
} }
}, },
getWarning(name) {
// console.log("name",name)
if (name.indexOf("法院一层") != -1) {
console.log("消防联动 主楼一层");
} else if(name.indexOf("法院四层") != -1) {
console.log("消防联动 主楼四层");
}else if(name.indexOf("法院二层") != -1) {
console.log("消防联动 主楼二层");
}else if(name.indexOf("法院三层") != -1) {
console.log("消防联动 主楼三层");
}else if(name.indexOf("辅楼1层") != -1) {
console.log("消防联动 辅楼一层");
}else if(name.indexOf("辅楼2层") != -1) {
console.log("消防联动 辅楼二层");
}else if(name.indexOf("辅楼3层") != -1) {
console.log("消防联动 辅楼三层");
}else if(name.indexOf("辅楼4层") != -1) {
console.log("消防联动 辅楼四层");
}
},
}, },
components: {}, components: {},
}; };