diff --git a/src/components/monitoring/door.vue b/src/components/monitoring/door.vue
index d2d9858..0b047bb 100644
--- a/src/components/monitoring/door.vue
+++ b/src/components/monitoring/door.vue
@@ -1041,7 +1041,7 @@ export default {
${item.name
}
-
设备状态：
@@ -1066,7 +1066,7 @@ export default {
${item.location}
-
diff --git a/src/components/monitoring/lift.vue b/src/components/monitoring/lift.vue
index 2608ef4..340dd3f 100644
--- a/src/components/monitoring/lift.vue
+++ b/src/components/monitoring/lift.vue
@@ -173,7 +173,7 @@ export default {
pos: 0,
height: 5350,
offsetZ: 250,
- // path: "ws://192.168.1.3/blade-datamqtt/ws",
+ // path: "ws://192.168.1.106/blade-datamqtt/ws",
path: "ws://10.90.100.204/blade-datamqtt/ws",
socket: "",
arr: [], //电梯信息
@@ -432,7 +432,7 @@ export default {
name = '塔楼北电梯';
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 -
1));
}
@@ -479,7 +479,7 @@ export default {
this.arr.reverse()
for (let i = 0; i < this.arr.length; i++) {
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));
}
// console.log(this.arr)
@@ -530,199 +530,13 @@ export default {
if (typeof (WebSocket) === "undefined") {
alert("您的浏览器不支持socket");
} else {
- // this.socket = new WebSocket(this.path);
- // // 监听socket连接
- // this.socket.onopen = this.open;
- // // 监听socket错误信息
- // this.socket.onerror = this.error;
- // // 监听socket消息
- // this.socket.onmessage = this.getMessage;
-
- //模拟代码
- // let test = setInterval(() => {
- // let floor = "01";
- // let msg = {
- // data: JSON.stringify({
- // "id": 91,
- // "code": "10700000004",
- // "floor": floor,
- // "direction": "向上",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区6号楼电梯",
- // "modelId": "升降电梯(6)",
- // "location": "6号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // let msg2 = {
- // data: JSON.stringify({
- // "id": 88,
- // "code": "10700000001",
- // "floor": floor,
- // "direction": "向上",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区1号楼电梯",
- // "modelId": "升降电梯(1)",
- // "location": "1号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // this.getMessage(msg);
- // this.getMessage(msg2);
- // setTimeout(() => {
- // let floor = "02";
- // let msg = {
- // data: JSON.stringify({
- // "id": 91,
- // "code": "10700000004",
- // "floor": floor,
- // "direction": "向上",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区6号楼电梯",
- // "modelId": "升降电梯(6)",
- // "location": "6号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // let msg2 = {
- // data: JSON.stringify({
- // "id": 88,
- // "code": "10700000001",
- // "floor": floor,
- // "direction": "向上",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区1号楼电梯",
- // "modelId": "升降电梯(1)",
- // "location": "1号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // this.getMessage(msg);
- // this.getMessage(msg2);
- // setTimeout(() => {
- // let floor = "03";
- // let msg = {
- // data: JSON.stringify({
- // "id": 91,
- // "code": "10700000004",
- // "floor": floor,
- // "direction": "向下",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区6号楼电梯",
- // "modelId": "升降电梯(6)",
- // "location": "6号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // this.getMessage(msg);
- // setTimeout(() => {
- // let floor = "02";
- // let msg = {
- // data: JSON.stringify({
- // "id": 91,
- // "code": "10700000004",
- // "floor": floor,
- // "direction": "向下",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区6号楼电梯",
- // "modelId": "升降电梯(6)",
- // "location": "6号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // let msg2 = {
- // data: JSON.stringify({
- // "id": 88,
- // "code": "10700000001",
- // "floor": floor,
- // "direction": "向下",
- // "status": "90000",
- // "statusMsg": "正常",
- // "createTime": "2022-06-18 12:00:00",
- // "name": "业务区1号楼电梯",
- // "modelId": "升降电梯(1)",
- // "location": "1号楼",
- // "factory": "",
- // "tendingTime": "",
- // "tendingUser": "",
- // "tendingPhone": "",
- // "alarmStatus": "",
- // "alarmType": "",
- // "alarmTime": "",
- // "alarmContext": "",
- // "height": ""
- // })
- // };
- // this.getMessage(msg);
- // this.getMessage(msg2);
- // }, 300)
- // }, 300)
- // }, 300)
- // }, 5000);
-
- // setTimeout(() => {
- // clearInterval(test);
- // }, 1000 * 20);
+ this.socket = new WebSocket(this.path);
+ // 监听socket连接
+ this.socket.onopen = this.open;
+ // 监听socket错误信息
+ this.socket.onerror = this.error;
+ // 监听socket消息
+ this.socket.onmessage = this.getMessage;
}
},
windowClick(e) {
@@ -753,26 +567,29 @@ export default {
},
getMessage(msg) {
let obj = JSON.parse(msg.data)
- 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.createTime = dateFormat(new Date(obj.createTime), 'yyyy-MM-dd hh:mm');
+ // obj.tendingTime = dateFormat(new Date(obj.tendingTime), 'yyyy-MM-dd hh:mm');
// if(obj.status != 90000){
let idx = this.arr.findIndex(item => { return item.id == obj.id });
if (idx > -1) {
- this.arr[idx].modelId = obj.modelId;
- this.arr[idx].status = obj.status;
- this.arr[idx].createTime = obj.createTime;
- this.arr[idx].tendingTime = obj.tendingTime;
- this.arr[idx].factory = obj.factory;
+ // this.arr[idx].modelId = obj.modelId;
+ // this.arr[idx].status = obj.status;
+ // this.arr[idx].createTime = obj.createTime;
+ // this.arr[idx].tendingTime = obj.tendingTime;
+ // this.arr[idx].factory = obj.factory;
// this.arr[idx].floor = obj.floor;
- this.arr[idx].statusMsg = obj.statusMsg;
+ // this.arr[idx].statusMsg = obj.statusMsg;
this.arr[idx].direction = obj.direction;
+ let _obj = JSON.parse(JSON.stringify(this.arr[idx]));
+ _obj.floor = obj.floor;
+
this.setLiftColor(this.arr)
if (this.bimModel == 1) {
- let content = this.getContent(idx, obj);
+ let content = this.getContent(idx, _obj);
let objectId = bfHelper.getExternalComponentId(obj.modelId);
- console.log(obj.modelId, obj.floor, this.height * ((obj.floor * 1) - (this.arr[idx].floor * 1)))
+ // console.log(obj.modelId, obj.floor, this.height * ((obj.floor * 1) - (this.arr[idx].floor * 1)))
if (this.arr[idx].floor != obj.floor) {
bfHelper.setExternalComponentZ(obj.modelId, this.height * ((obj.floor * 1) - (this.arr[idx].floor * 1)));
}
@@ -784,7 +601,7 @@ export default {
this.arr[idx].floor = obj.floor;
}, 150);
} else {
- let content = this.getContent(idx, obj);
+ let content = this.getContent(idx, _obj);
if (this.arr[idx].floor != obj.floor) {
bfHelper.setExternalComponentZ(obj.modelId, this.height * ((obj.floor * 1) - (this.arr[idx].floor * 1)));
diff --git a/src/components/monitoring/warm.vue b/src/components/monitoring/warm.vue
index 7d219a0..2f8b672 100644
--- a/src/components/monitoring/warm.vue
+++ b/src/components/monitoring/warm.vue
@@ -632,7 +632,7 @@ export default {
this.getHistoryWarm(); //历史用热统计
this.getCurWarm(); //本月用热
this.getMode(); //模式
- // this.getWarmLists(); //获取热量表列表
+ this.getWarmLists(); //获取热量表列表
// this.getWarmGK(); //获取热量表概况
this.getHeatWarnList(); //告警列表
}
diff --git a/src/util/bfHelper.js b/src/util/bfHelper.js
index 13ad768..9d1339c 100644
--- a/src/util/bfHelper.js
+++ b/src/util/bfHelper.js
@@ -2862,12 +2862,12 @@ const loadModel = (i) => {
// BimfaceLoaderConfig.APIHost = "http://10.90.100.203:8080";
BimfaceLoaderConfig.dataEnvType = BimfaceEnvOption.Local;
BimfaceLoaderConfig.sdkPath = "static/jssdk@3.6.191/jssdk";
- // BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
- // 'http://47.103.199.45:8000/face/tt/viewToken.json';
- BimfaceLoaderConfig.path =
- i == 1
- ? "http://10.90.100.203:8080/ywq/viewToken.json"
- : "http://10.90.100.203:8080/tt/viewToken.json";
+ BimfaceLoaderConfig.path = i == 1 ? 'http://47.103.199.45:8000/face/ywq/viewToken.json' :
+ 'http://47.103.199.45:8000/face/tt/viewToken.json';
+ // BimfaceLoaderConfig.path =
+ // i == 1
+ // ? "http://10.90.100.203:8080/ywq/viewToken.json"
+ // : "http://10.90.100.203:8080/tt/viewToken.json";
BimfaceSDKLoader.load(BimfaceLoaderConfig, onSDKLoadSucceeded);
};
diff --git a/src/views/sourceAnaly/components/buildWarm.vue b/src/views/sourceAnaly/components/buildWarm.vue
index 71ee7ac..ce79256 100644
--- a/src/views/sourceAnaly/components/buildWarm.vue
+++ b/src/views/sourceAnaly/components/buildWarm.vue
@@ -199,13 +199,13 @@ export default {
).then((res) => {
let leidaData = [];
let lineData = [];
- const data = res.data.data;
+ const data = res.data.data.dataList;
for (let i = 0; i < data.length; i++) {
leidaData.push(data[i].consume);
lineData.push(data[i].consumeMonList);
}
this.getWarmLeida(leidaData);
- this.getWarmLine(lineData);
+ this.getWarmLine(lineData,res.data.data.dateList);
});
},
getGaugeData() {
@@ -322,19 +322,25 @@ export default {
});
},
getWarmLeida(value) {
+ value.map(item => {
+ item = item.toString().split('.')[1] != undefined && item.toString().split('.')[1].length > 1 ? item.toFixed(2) : item
+ })
+ let max = Math.max(...value);
const data = [
{
value: value,
name: "楼宇耗热",
},
];
+ max = max === 0 ? 100 : max;
+ console.log('max', max);
const title = [
- { name: "#1", max: 2000 },
- { name: "#2", max: 2000 },
- { name: "#3", max: 2000 },
- { name: "#4", max: 2000 },
- { name: "#5", max: 2000 },
- { name: "#6", max: 2000 },
+ { name: "#1", max: max },
+ { name: "#2", max: max },
+ { name: "#3", max: max },
+ { name: "#4", max: max },
+ { name: "#5", max: max },
+ { name: "#6", max: max },
];
this.$refs.radar.getLeidaChart(
"耗热",
@@ -344,7 +350,7 @@ export default {
title
);
},
- getWarmLine(value) {
+ getWarmLine(value,category) {
const data = [];
for (let i = 0; i < this.build.length; i++) {
data.push({
@@ -361,7 +367,7 @@ export default {
},
});
}
- this.$refs.line.getLineCharts("耗热量(MJ)", data);
+ this.$refs.line.getLineCharts("耗热量(MJ)", data, category);
},
getFloorTemper(id, value) {
let myChart = this.$echarts.init(document.getElementById(id));
diff --git a/src/views/sourceAnaly/components/conditionAnaly.vue b/src/views/sourceAnaly/components/conditionAnaly.vue
index b2fc700..2ac4237 100644
--- a/src/views/sourceAnaly/components/conditionAnaly.vue
+++ b/src/views/sourceAnaly/components/conditionAnaly.vue
@@ -63,7 +63,7 @@
@change="searchBuild"
>
-
- 
当前风速：
- 
+