From ecfbc83d3dc4c70bcf7011d0d7779ae93d8fe2a2 Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Fri, 21 Oct 2022 11:07:17 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=20=E8=AE=BE=E5=A4=87=E8=AF=A6=E6=83=85(=E7=BD=91=E5=85=B3?=
 =?UTF-8?q?=E4=BB=A5=E5=8F=8A=E5=AD=90=E8=AE=BE=E5=A4=87=E5=9C=A8=E7=BA=BF?=
 =?UTF-8?q?=E7=8A=B6=E6=80=81=E6=9B=B4=E6=96=B0=E9=97=AE=E9=A2=98)?=
 =?UTF-8?q?=EF=BC=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../EWebSocket/src/basic/webSocket.js         |  1 -
 .../DeviceDetailsView/deviceSelectNav.vue     | 32 +++++++++++++------
 2 files changed, 23 insertions(+), 10 deletions(-)

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 @@
     <div class="layout-device-list">
       <el-card
         @click.native="viewDeviceChange(deviceInfo.deviceId)"
-        :body-style="{ padding: '0px', width: '220px' , 'boxShadow': '0 1px 5px 0 #2530341a' }"
+        :body-style="{
+          padding: '0px',
+          width: '220px',
+          boxShadow: '0 1px 5px 0 #2530341a',
+        }"
         :style="
           deviceInfo.deviceId === checkobxDeviceId
             ? 'border: 1px solid #1890ff; margin: 5px; width: 220px; flex-shrink: 0;'
@@ -272,19 +276,19 @@
           <div class="dev-info">
             <div
               :class="
-                deviceInfo['deviceState'] == 'ONLINE'
+                item['deviceState'] === 'ONLINE'
                   ? 'dev-info-state'
                   : 'dev-info-state off-line'
               "
               style="width: 60px"
             >
               <icon
-                v-if="deviceInfo['deviceState'] == 'ONLINE'"
+                v-if="item['deviceState'] === 'ONLINE'"
                 class="iconfont iconSYS_STA_1"
               />
               <icon v-else class="iconfont iconlixian" />
               <span style="margin-left: 1px; margin-top: 1px">{{
-                deviceInfo["deviceState"] == "ONLINE" ? "在线" : "离线"
+                getDeviceState(item["deviceState"])
               }}</span>
             </div>
             <div
@@ -326,7 +330,6 @@
 <script>
 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++) {