0017
/
iot-ui-vue
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: bug#16441

This commit is contained in:
XieYongHong 2023-07-15 22:36:18 +08:00
parent 69dad3807a
commit 387a37f5a4
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/api/device/instance.ts
View File

@ -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 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`) export const queryByParent = (deviceId: string) => server.get(`/device/gateway/${deviceId}/parent`)

17
src/views/device/components/Metadata/Base/components/VirtualRule/index.vue
View File

@ -254,25 +254,26 @@ const options = computed(() => {
const handleSearch = async () => { const handleSearch = async () => {
let resp: any = undefined; let resp: any = undefined;
if (target === 'product') { try {
if (target === 'product') {
resp = await queryProductVirtualProperty( resp = await queryProductVirtualProperty(
productStore.current?.id, productStore.current?.id,
props.value?.id, props.value?.id,
); );
} else { } else {
resp = await queryDeviceVirtualProperty( resp = await queryDeviceVirtualProperty(
instanceStore.current?.productId, instanceStore.current?.productId,
instanceStore.current?.id, instanceStore.current?.id,
props.value?.id, props.value?.id,
); );
} }
if (resp && resp.status === 200 && resp.result) { if (resp && resp.status === 200 && resp.result) {
formData.virtualRule = { formData.virtualRule = {
triggerProperties: resp.result.triggerProperties, triggerProperties: resp.result.triggerProperties,
rule: resp.result.rule, rule: resp.result.rule,
} }
} else { }
console.log(props.value) } catch (err) {
formData.virtualRule = { formData.virtualRule = {
triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'], triggerProperties: props.value?.expands?.virtualRule?.triggerProperties || ['*'],
rule: props.value?.expands?.virtualRule?.rule || initData.rule rule: props.value?.expands?.virtualRule?.rule || initData.rule