From 7edd17714d53b9843cdf0c4f23bc2ce3abdd48ea Mon Sep 17 00:00:00 2001
From: 23688nl <329261568@qq.com>
Date: Wed, 28 Sep 2022 16:32:01 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=9A=20ws=20=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9=E8=AE=BE=E5=A4=87id=20=E4=B8=BAdeviceKey?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue | 4 ++--
 src/views/profile/DeviceDetailsView/deviceSelectNav.vue       | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
index 65174f4e..fe18c194 100644
--- a/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
+++ b/src/views/iot/project/profileV2/DeviceManage/EDeviceTable.vue
@@ -404,7 +404,7 @@ export default {
       if (!this.list || this.length <= 0) {
         return;
       }
-      let deviceIds = this.list.map((v) => v["deviceId"]);
+      let deviceIds = this.list.map((v) => v["deviceKey"]);
       this.stompClient = new WebSocket(
         `${webSocketProjectGatewayUrl}/${this.getGuid()}/${deviceIds.toString()}`
       );
@@ -424,7 +424,7 @@ export default {
     handleDeviceInfo(param) {
       if (this.list && this.list.length > 0) {
         this.list = this.list.map((v) => {
-          if (v["deviceId"] === param["deviceId"]) {
+          if (v["deviceKey"] === param["deviceKey"]) {
             return Object.assign(v, param);
           } else {
             return v;
diff --git a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
index 09c21862..ec4a92e7 100644
--- a/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
+++ b/src/views/profile/DeviceDetailsView/deviceSelectNav.vue
@@ -340,7 +340,7 @@ export default {
     handleOpenDevStatusService(str) {
       console.log("handleOpenDevStatusService", str);
       this.wsStatusService = `${webSocketProjectGatewayUrl}/${this.getGuid()}/${
-        this.deviceInfo.deviceId
+        this.deviceInfo.deviceKey
       },${str}`;
     },
     wsMessage(e) {
@@ -602,7 +602,7 @@ export default {
       }).then((response) => {
         this.childDeviceList = response.rows;
         var childDeviceIds = [...response.rows].map((v) => {
-          return v.deviceId;
+          return v.deviceKey;
         });
         this.handleOpenDevStatusService(childDeviceIds.toString());
       });