diff --git a/src/views/device/Instance/Detail/Info/index.vue b/src/views/device/Instance/Detail/Info/index.vue
index 178dc38f..a16996f6 100644
--- a/src/views/device/Instance/Detail/Info/index.vue
+++ b/src/views/device/Instance/Detail/Info/index.vue
@@ -13,16 +13,16 @@
{{
- instanceStore.current.id
+ instanceStore.current?.id
}}
{{
- instanceStore.current.productName
+ instanceStore.current?.productName
}}
{{
- instanceStore.current.classifiedName
+ instanceStore.current?.classifiedName
}}
{{
- instanceStore.current.deviceType?.text
+ instanceStore.current?.deviceType?.text
}}
{{
instanceStore.current?.firmwareInfo?.version
@@ -31,25 +31,25 @@
instanceStore.current?.transport
}}
{{
- instanceStore.current.protocolName
+ instanceStore.current?.protocolName
}}
{{
- instanceStore.current.createTime
- ? moment(instanceStore.current.createTime).format(
+ instanceStore.current?.createTime
+ ? moment(instanceStore.current?.createTime).format(
'YYYY-MM-DD HH:mm:ss',
)
: ''
}}
{{
- instanceStore.current.registerTime
- ? moment(instanceStore.current.registerTime).format(
+ instanceStore.current?.registerTime
+ ? moment(instanceStore.current?.registerTime).format(
'YYYY-MM-DD HH:mm:ss',
)
: ''
}}
{{
- instanceStore.current.onlineTime
- ? moment(instanceStore.current.onlineTime).format(
+ instanceStore.current?.onlineTime
+ ? moment(instanceStore.current?.onlineTime).format(
'YYYY-MM-DD HH:mm:ss',
)
: ''
@@ -57,12 +57,12 @@
{{ instanceStore.current.parentId }}{{ instanceStore.current?.parentId }}
{{
- instanceStore.current.description
+ instanceStore.current?.description
}}
diff --git a/src/views/device/Instance/Detail/index.vue b/src/views/device/Instance/Detail/index.vue
index 716f31c4..0df755d7 100644
--- a/src/views/device/Instance/Detail/index.vue
+++ b/src/views/device/Instance/Detail/index.vue
@@ -9,7 +9,7 @@
- {{ instanceStore.current.name }}
+ {{ instanceStore.current?.name }}
@@ -20,15 +20,15 @@
- {{ instanceStore.current.state?.text }}
+ {{ instanceStore.current?.state?.text }}
{{
- instanceStore.current.id
+ instanceStore.current?.id
}}
- {{ instanceStore.current.productName }}
+ {{ instanceStore.current?.productName }}
@@ -192,11 +192,12 @@ const getStatus = (id: string) => {
};
watch(
- () => route.params.id,
+ () => route.params?.id,
(newId) => {
if (newId) {
instanceStore.refresh(String(newId));
getStatus(String(newId));
+ instanceStore.tabActiveKey = 'Info'
}
},
{ immediate: true, deep: true },
@@ -215,43 +216,43 @@ const onTabChange = (e: string) => {
};
const handleAction = async () => {
- if (instanceStore.current.id) {
- const resp = await _deploy(instanceStore.current.id);
+ if (instanceStore.current?.id) {
+ const resp = await _deploy(instanceStore.current?.id);
if (resp.status === 200) {
message.success('操作成功!');
- instanceStore.refresh(instanceStore.current.id);
+ instanceStore.refresh(instanceStore.current?.id);
}
}
};
const handleDisconnect = async () => {
- if (instanceStore.current.id) {
- const resp = await _disconnect(instanceStore.current.id);
+ if (instanceStore.current?.id) {
+ const resp = await _disconnect(instanceStore.current?.id);
if (resp.status === 200) {
message.success('操作成功!');
- instanceStore.refresh(instanceStore.current.id);
+ instanceStore.refresh(instanceStore.current?.id);
}
}
};
const handleRefresh = async () => {
- if (instanceStore.current.id) {
- await instanceStore.refresh(instanceStore.current.id);
+ if (instanceStore.current?.id) {
+ await instanceStore.refresh(instanceStore.current?.id);
message.success('操作成功');
}
};
const jumpProduct = () => {
menuStory.jumpPage('device/Product/Detail', {
- id: instanceStore.current.productId,
+ id: instanceStore.current?.productId,
});
};
watchEffect(() => {
const keys = list.value.map((i) => i.key);
if (
- instanceStore.current.protocol &&
- !['modbus-tcp', 'opc-ua'].includes(instanceStore.current.protocol) &&
+ instanceStore.current?.protocol &&
+ !['modbus-tcp', 'opc-ua'].includes(instanceStore.current?.protocol) &&
!keys.includes('Diagnose')
) {
list.value.push({
@@ -260,8 +261,8 @@ watchEffect(() => {
});
}
if (
- instanceStore.current.features?.find(
- (item: any) => item.id === 'transparentCodec',
+ instanceStore.current?.features?.find(
+ (item: any) => item?.id === 'transparentCodec',
) &&
!keys.includes('Parsing')
) {
@@ -271,7 +272,7 @@ watchEffect(() => {
});
}
if (
- instanceStore.current.protocol === 'modbus-tcp' &&
+ instanceStore.current?.protocol === 'modbus-tcp' &&
!keys.includes('Modbus')
) {
list.value.push({
@@ -280,7 +281,7 @@ watchEffect(() => {
});
}
if (
- instanceStore.current.protocol === 'opc-ua' &&
+ instanceStore.current?.protocol === 'opc-ua' &&
!keys.includes('OPCUA')
) {
list.value.push({
@@ -289,7 +290,7 @@ watchEffect(() => {
});
}
if (
- instanceStore.current.deviceType?.value === 'gateway' &&
+ instanceStore.current?.deviceType?.value === 'gateway' &&
!keys.includes('ChildDevice')
) {
// 产品类型为网关的情况下才显示此模块
@@ -299,8 +300,8 @@ watchEffect(() => {
});
}
if (
- instanceStore.current.accessProvider === 'edge-child-device' &&
- instanceStore.current.parentId &&
+ instanceStore.current?.accessProvider === 'edge-child-device' &&
+ instanceStore.current?.parentId &&
!keys.includes('EdgeMap')
) {
list.value.push({