diff --git a/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelCommandModal.vue b/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelCommandModal.vue index 7eeaa79..a8f59cc 100644 --- a/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelCommandModal.vue +++ b/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelCommandModal.vue @@ -26,10 +26,16 @@ const [Grid, gridApi] = useVbenVxeGrid({ title: '指令名称', minWidth: 160, showOverflow: 'tooltip', + }, + { + field: 'issueCommand', + title: '下发指令', + minWidth: 140, + showOverflow: 'tooltip', }, { - field: 'identifier', - title: '标识符', + field: 'propertyArray', + title: '属性标识符集合', minWidth: 140, showOverflow: 'tooltip', }, diff --git a/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelPropertyModal.vue b/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelPropertyModal.vue index 2bf0fc5..a8ffba4 100644 --- a/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelPropertyModal.vue +++ b/apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelPropertyModal.vue @@ -22,21 +22,69 @@ const [Grid, gridApi] = useVbenVxeGrid({ gridOptions: { columns: [ { - field: 'propertyName', - title: '属性名称', + field: 'standardFieldDisplayName', + title: '标准属性名称', minWidth: 160, showOverflow: 'tooltip', }, { - field: 'identifier', - title: '标识符', + field: 'standardFieldName', + title: '标准属性标识符', + minWidth: 160, + showOverflow: 'tooltip', + }, + { + field: 'standardFieldValueType', + title: '标准属性值类型', + minWidth: 160, + showOverflow: 'tooltip', + }, + { + field: 'ioTPlatformRawFieldName', + title: '平台属性标识符', + minWidth: 160, + showOverflow: 'tooltip', + }, + { + field: 'ioTPlatformRawFieldDataType', + title: '平台属性值类型', + minWidth: 160, + showOverflow: 'tooltip', + }, + { + field: 'isValueNeedConvert', + title: '值类型是否转换', + minWidth: 120, + showOverflow: 'tooltip', + }, + { + field: 'parsingSequence', + title: '解析方式', minWidth: 140, showOverflow: 'tooltip', }, { - field: 'dataType', - title: '数据类型', - minWidth: 120, + field: 'nativeSkipNumber', + title: '正序跳过数量', + minWidth: 140, + showOverflow: 'tooltip', + }, + { + field: 'nativeTakeNumber', + title: '正序获取数量', + minWidth: 140, + showOverflow: 'tooltip', + }, + { + field: 'reversalSkipNumber', + title: '反转跳过数量', + minWidth: 140, + showOverflow: 'tooltip', + }, + { + field: 'reversalTakeNumber', + title: '反转获取数量', + minWidth: 140, showOverflow: 'tooltip', }, { @@ -55,13 +103,14 @@ const [Grid, gridApi] = useVbenVxeGrid({ if (!deviceThingModelId.value) { return { items: [], totalCount: 0 }; } - const { data } = await postDeviceThingModelManagementPropertyPageAsync({ - body: { - pageIndex: page.currentPage, - pageSize: page.pageSize, - deviceThingModelId: deviceThingModelId.value, - }, - }); + const { data } = + await postDeviceThingModelManagementPropertyPageAsync({ + body: { + pageIndex: page.currentPage, + pageSize: page.pageSize, + deviceThingModelId: deviceThingModelId.value, + }, + }); return data || { items: [], totalCount: 0 }; }, }, @@ -90,5 +139,3 @@ const [Modal, modalApi] = useVbenModal({ - -