diff --git a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue index 514fad96..0f1cadb3 100644 --- a/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue +++ b/src/views/device/Instance/Detail/ChildDevice/EdgeMap/index.vue @@ -184,6 +184,7 @@ let _metadata = ref(); const loading = ref(false); const channelList = ref([]); + const modelRef = reactive({ dataSource: [], }); diff --git a/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue b/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue index ea3c26c2..d29f5105 100644 --- a/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue +++ b/src/views/device/Instance/Detail/ChildDevice/SaveChild/index.vue @@ -146,7 +146,7 @@ const selectChange = (e: any) => { visible.value = true; } const item = productList.value.filter((i: any) => i.id === e)[0]; - const array = JSON.parse(item.metadata || '{}')?.properties?.map( + const array = JSON.parse(item?.metadata || '{}')?.properties?.map( (i: any) => ({ metadataType: 'property', metadataName: `${i.name}(${i.id})`, diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue index 99352445..91513938 100644 --- a/src/views/device/Instance/Detail/index.vue +++ b/src/views/device/Instance/Detail/index.vue @@ -137,6 +137,7 @@ const routerParams = useRouterParams(); const instanceStore = useInstanceStore(); const statusMap = new Map(); + statusMap.set('online', 'success'); statusMap.set('offline', 'error'); statusMap.set('notActive', 'warning'); @@ -276,7 +277,7 @@ const initPage = async (newId: any) => { } onBeforeRouteUpdate((to: any) => { - if (to.params?.id) { + if (to.params?.id!==instanceStore.current.id) { initPage(to.params?.id) } }) diff --git a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue index b1b07811..ca4b8506 100644 --- a/src/views/device/Product/Detail/DeviceAccess/accessModal.vue +++ b/src/views/device/Product/Detail/DeviceAccess/accessModal.vue @@ -6,6 +6,7 @@ okText="确定" cancelText="取消" :confirmLoading='loading' + :maskClosable="false" @ok="submitData" @cancel="cancel" >