电梯ws开启,暖表园区状态设备列表调用

dev
张群 3 years ago
parent e923ff702a
commit ae6b309274
  1. 34
      src/components/monitoring/lift.vue
  2. 2
      src/components/monitoring/warm.vue

@ -432,7 +432,7 @@ export default {
name = '塔楼北电梯'; name = '塔楼北电梯';
this.arr[i].height = this.height * (this.arr[i].floor * 1 - 1); this.arr[i].height = this.height * (this.arr[i].floor * 1 - 1);
} }
this.arr[i].floor = this.arr[i].floor ? this.arr[i].floor : '-1' this.arr[i].floor = this.arr[i].floor ? this.arr[i].floor : '1'
bfHelper.setExternalComponentZ(name, this.height * (this.arr[i].floor * 1 - bfHelper.setExternalComponentZ(name, this.height * (this.arr[i].floor * 1 -
1)); 1));
} }
@ -479,7 +479,7 @@ export default {
this.arr.reverse() this.arr.reverse()
for (let i = 0; i < this.arr.length; i++) { for (let i = 0; i < this.arr.length; i++) {
this.arr[i].height = this.height * (this.arr[i].floor * 1 - 1); this.arr[i].height = this.height * (this.arr[i].floor * 1 - 1);
this.arr[i].floor = this.arr[i].floor ? this.arr[i].floor : '-1' this.arr[i].floor = this.arr[i].floor ? this.arr[i].floor : '1'
bfHelper.setExternalComponentZ(this.arr[i].modelId, this.height * (this.arr[i].floor * 1 - 1)); bfHelper.setExternalComponentZ(this.arr[i].modelId, this.height * (this.arr[i].floor * 1 - 1));
} }
// console.log(this.arr) // console.log(this.arr)
@ -530,13 +530,13 @@ export default {
if (typeof (WebSocket) === "undefined") { if (typeof (WebSocket) === "undefined") {
alert("您的浏览器不支持socket"); alert("您的浏览器不支持socket");
} else { } else {
// this.socket = new WebSocket(this.path); this.socket = new WebSocket(this.path);
// // socket // socket
// this.socket.onopen = this.open; this.socket.onopen = this.open;
// // socket // socket
// this.socket.onerror = this.error; this.socket.onerror = this.error;
// // socket // socket
// this.socket.onmessage = this.getMessage; this.socket.onmessage = this.getMessage;
// //
// let test = setInterval(() => { // let test = setInterval(() => {
@ -753,18 +753,18 @@ export default {
}, },
getMessage(msg) { getMessage(msg) {
let obj = JSON.parse(msg.data) let obj = JSON.parse(msg.data)
obj.createTime = dateFormat(new Date(obj.createTime), 'yyyy-MM-dd hh:mm'); // obj.createTime = dateFormat(new Date(obj.createTime), 'yyyy-MM-dd hh:mm');
obj.tendingTime = dateFormat(new Date(obj.tendingTime), 'yyyy-MM-dd hh:mm'); // obj.tendingTime = dateFormat(new Date(obj.tendingTime), 'yyyy-MM-dd hh:mm');
// if(obj.status != 90000){ // if(obj.status != 90000){
let idx = this.arr.findIndex(item => { return item.id == obj.id }); let idx = this.arr.findIndex(item => { return item.id == obj.id });
if (idx > -1) { if (idx > -1) {
this.arr[idx].modelId = obj.modelId; // this.arr[idx].modelId = obj.modelId;
this.arr[idx].status = obj.status; // this.arr[idx].status = obj.status;
this.arr[idx].createTime = obj.createTime; // this.arr[idx].createTime = obj.createTime;
this.arr[idx].tendingTime = obj.tendingTime; // this.arr[idx].tendingTime = obj.tendingTime;
this.arr[idx].factory = obj.factory; // this.arr[idx].factory = obj.factory;
// this.arr[idx].floor = obj.floor; // this.arr[idx].floor = obj.floor;
this.arr[idx].statusMsg = obj.statusMsg; // this.arr[idx].statusMsg = obj.statusMsg;
this.arr[idx].direction = obj.direction; this.arr[idx].direction = obj.direction;
this.setLiftColor(this.arr) this.setLiftColor(this.arr)

@ -632,7 +632,7 @@ export default {
this.getHistoryWarm(); // this.getHistoryWarm(); //
this.getCurWarm(); // this.getCurWarm(); //
this.getMode(); // this.getMode(); //
// this.getWarmLists(); // this.getWarmLists(); //
// this.getWarmGK(); // // this.getWarmGK(); //
this.getHeatWarnList(); // this.getHeatWarnList(); //
} }

Loading…
Cancel
Save