设备物模型属性和指令界面优化

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',
+        field: 'propertyArray',
-        title: '标识符',
+        title: '属性标识符集合',
         minWidth: 140,
         showOverflow: 'tooltip',
       },

apps/web-antd/src/views/thingmodelinfo/deviceThingModelManagement/DeviceThingModelPropertyModal.vue

@@ -22,21 +22,69 @@ const [Grid, gridApi] = useVbenVxeGrid({
   gridOptions: {
     columns: [
       {
-        field: 'propertyName',
+        field: 'standardFieldDisplayName',
-        title: '属性名称',
+        title: '标准属性名称',
         minWidth: 160,
         showOverflow: 'tooltip',
       },
       {
-        field: 'identifier',
+        field: 'standardFieldName',
-        title: '标识符',
+        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',
+        field: 'nativeSkipNumber',
-        title: '数据类型',
+        title: '正序跳过数量',
-        minWidth: 120,
+        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({
+          const { data } =
-            body: {
+            await postDeviceThingModelManagementPropertyPageAsync({
-              pageIndex: page.currentPage,
+              body: {
-              pageSize: page.pageSize,
+                pageIndex: page.currentPage,
-              deviceThingModelId: deviceThingModelId.value,
+                pageSize: page.pageSize,
-            },
+                deviceThingModelId: deviceThingModelId.value,
-          });
+              },
+            });
           return data || { items: [], totalCount: 0 };
         },
       },
@@ -90,5 +139,3 @@ const [Modal, modalApi] = useVbenModal({
     </Grid>
   </Modal>
 </template>
-
-