Ver Fonte

fix: cyclic request for device information during debugging

Casper Dai há 3 anos atrás
pai
commit
015ae7b94b
2 ficheiros alterados com 8 adições e 7 exclusões
  1. 0 1
      .env.development
  2. 8 6
      src/views/debug/debug.js

+ 0 - 1
.env.development

@@ -19,7 +19,6 @@ VUE_APP_KEYCLOAK_OPTIONS_URL = 'https://isoc.artaplay.com:8443/auth'
 # 徐州
 # VUE_APP_KEYCLOAK_OPTIONS_URL = 'https://msr.rondochina.com:6443/auth'
 
-
 # mqtt
 VUE_APP_MQTT_URL = 'ws://10.180.88.10:8083/mqtt'
 # VUE_APP_MQTT_URL = 'wss://msr.rondochina.com:6443/mqtt'

+ 8 - 6
src/views/debug/debug.js

@@ -77,13 +77,15 @@ function getDevice (id) {
     custom: true,
     background: true
   }).then(({ data }) => {
-    const { name, serialNumber, mac } = data
     deviceMap[id].loaded = true
-    const device = deviceMessage.find(item => item.id === id)
-    device.name = name
-    device.serialNumber = serialNumber
-    device.mac = mac
-    devices.find(item => item.id === id).name = name
+    if (data) {
+      const { name, serialNumber, mac } = data
+      const device = deviceMessage.find(item => item.id === id)
+      device.name = name
+      device.serialNumber = serialNumber
+      device.mac = mac
+      devices.find(item => item.id === id).name = name
+    }
   }).finally(() => {
     deviceMap[id].loading = false
   })