diff --git a/src/components/EWebSocket/src/basic/webSocket.js b/src/components/EWebSocket/src/basic/webSocket.js index 672f85b7..5d9af2d9 100644 --- a/src/components/EWebSocket/src/basic/webSocket.js +++ b/src/components/EWebSocket/src/basic/webSocket.js @@ -52,7 +52,6 @@ export default { * @param {*} evt */ socket_message(evt) { - console.log("wsljcg:=", evt); const data = JSON.parse(evt.data); this.$emit('message_http', evt); this.$emit('message', data) diff --git a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue index 47637312..366016b7 100644 --- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue +++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue @@ -141,7 +141,11 @@
{{ - deviceInfo["deviceState"] == "ONLINE" ? "在线" : "离线" + getDeviceState(item["deviceState"]) }}
import { listChildrenDevice, setSwitchControl } from "@/api/iot/device"; import { - iotWebSocketBaseUrl, devLiveWebSocketBaseUrl, webSocketProjectGatewayUrl, } from "@/config/env"; @@ -407,15 +410,27 @@ export default { }, }, methods: { + getDeviceState(e) { + switch (e) { + case "ONLINE": + return "在线"; + case "OUTLINE": + return "脱线"; + default: + return "离线"; + } + }, // 开启 设备状态ws handleOpenDevStatusService(str) { - console.log("handleOpenDevStatusService", str); this.wsStatusService = `${webSocketProjectGatewayUrl}/${this.getGuid()}/${ this.deviceInfo.deviceKey },${str}`; }, wsMessage(e) { - if (e["deviceState"] || (e["switch"] !== null && e["switch"] !== undefined)) { + if ( + e["deviceState"] || + (e["switch"] !== null && e["switch"] !== undefined) + ) { this.handleDeviceInfo(e); } }, @@ -432,6 +447,7 @@ export default { return v; } }); + this.$forceUpdate(); } } }, @@ -503,7 +519,6 @@ export default { // } }, selectDevClose(e) { - console.log(e); this.tSelectList.splice(this.tSelectLabelList.indexOf(e), 1); this.tSelectLabelList.splice(this.tSelectLabelList.indexOf(e), 1); }, @@ -576,7 +591,6 @@ export default { this.handlerWsMsgData(JSON.parse(evt.data)); }, handlerWsMsgData(evt) { - // console.log("msg:", evt); this.$emit("wsRealTImeMsg", JSON.stringify(evt)); if (this.deviceInfo.deviceId !== this.wsDeviceInfo.deviceId) { for (let i = 0; i < this.childDeviceList.length; i++) {