From 387a37f5a4babb9b5db31e179d606942cc2c87b0 Mon Sep 17 00:00:00 2001 From: XieYongHong <18010623010@163.com> Date: Sat, 15 Jul 2023 22:36:18 +0800 Subject: [PATCH] fix: bug#16441 --- src/api/device/instance.ts | 2 +- .../Base/components/VirtualRule/index.vue | 17 +++++++++-------- 2 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/api/device/instance.ts b/src/api/device/instance.ts index 838d6cf4..1b574c8e 100644 --- a/src/api/device/instance.ts +++ b/src/api/device/instance.ts @@ -604,6 +604,6 @@ export const getProtocolMetadata = (id: string, transport: string) => server.get */ export const saveDeviceVirtualProperty = (productId: string, deviceId: string, data: any[]) => server.patch(`/virtual/property/product/${productId}/${deviceId}/_batch`, data) -export const queryDeviceVirtualProperty = (productId: string, deviceId: string, propertyId: string) => server.get(`/virtual/property/product/${productId}/${deviceId}/${propertyId}`) +export const queryDeviceVirtualProperty = (productId: string, deviceId: string, propertyId: string) => server.get(`/virtual/property/device/${productId}/${deviceId}/${propertyId}`) export const queryByParent = (deviceId: string) => server.get(`/device/gateway/${deviceId}/parent`) diff --git a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue index 4f647c17..cc8a3a3d 100644 --- a/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue +++ b/src/views/device/components/Metadata/Base/components/VirtualRule/index.vue @@ -254,25 +254,26 @@ const options = computed(() => { const handleSearch = async () => { let resp: any = undefined; - if (target === 'product') { + try { + if (target === 'product') { resp = await queryProductVirtualProperty( productStore.current?.id, props.value?.id, ); - } else { + } else { resp = await queryDeviceVirtualProperty( instanceStore.current?.productId, instanceStore.current?.id, props.value?.id, ); - } - if (resp && resp.status === 200 && resp.result) { + } + if (resp && resp.status === 200 && resp.result) { formData.virtualRule = { - triggerProperties: resp.result.triggerProperties, - rule: resp.result.rule, + triggerProperties: resp.result.triggerProperties, + rule: resp.result.rule, } - } else { - console.log(props.value) + } + } catch (err) { formData.virtualRule = { triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'], rule: props.value?.expands?.virtualRule?.rule || initData.rule