Merge branch 'fix/attribute-distribution' into 'main_dev'

fix: 修改属性下发时deviceCode的取值

See merge request yunteng/thingskit-front!796

@@ -167,6 +167,7 @@ export interface DeviceRecord {
   creator: string;
   creator: string;
   createTime: string;
   createTime: string;
   codeType?: string;
   codeType?: string;
+  code?: string;
   name: string;
   name: string;
   tenantId: string;
   tenantId: string;
   transportType: string;
   transportType: string;

@@ -39,10 +39,9 @@
     const { name, detail, identifier, deviceDetail, extensionDesc } = record;
     const { name, detail, identifier, deviceDetail, extensionDesc } = record;
     const { dataType } = detail;
     const { dataType } = detail;
     const { type } = dataType || {};
     const { type } = dataType || {};
-    const { codeType, deviceProfile } = deviceDetail || {};
+    const { codeType, deviceProfile, code } = deviceDetail || {};
     const { transportType } = deviceProfile || {};
     const { transportType } = deviceProfile || {};
     const { registerAddress, actionType, zoomFactor } = extensionDesc || {}; //获取扩展描述内容
     const { registerAddress, actionType, zoomFactor } = extensionDesc || {}; //获取扩展描述内容
-
     formField.value = identifier;
     formField.value = identifier;
     zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
     zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1;
     isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
     isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false;
@@ -64,7 +63,7 @@
       isShowModBUS.value = true;
       isShowModBUS.value = true;
       modBUSForm.value = {
       modBUSForm.value = {
         crc: 'CRC_16_LOWER',
         crc: 'CRC_16_LOWER',
-        deviceCode: '01',
+        deviceCode: code,
         method: actionType == '16' ? '10' : actionType,
         method: actionType == '16' ? '10' : actionType,
         registerAddress,
         registerAddress,
         registerNumber: 1,
         registerNumber: 1,