Commit 05950903e71419fec8f4f774097cb7897c376766
Merge branch 'fix/attribute-distribution' into 'main_dev'
fix: 修改属性下发时deviceCode的取值 See merge request yunteng/thingskit-front!796
Showing
2 changed files
with
3 additions
and
3 deletions
| ... | ... | @@ -39,10 +39,9 @@ |
| 39 | 39 | const { name, detail, identifier, deviceDetail, extensionDesc } = record; |
| 40 | 40 | const { dataType } = detail; |
| 41 | 41 | const { type } = dataType || {}; |
| 42 | - const { codeType, deviceProfile } = deviceDetail || {}; | |
| 42 | + const { codeType, deviceProfile, code } = deviceDetail || {}; | |
| 43 | 43 | const { transportType } = deviceProfile || {}; |
| 44 | 44 | const { registerAddress, actionType, zoomFactor } = extensionDesc || {}; //获取扩展描述内容 |
| 45 | - | |
| 46 | 45 | formField.value = identifier; |
| 47 | 46 | zoomFactorValue.value = zoomFactor ? Number(zoomFactor) : 1; |
| 48 | 47 | isShowMultiply.value = type == 'INT' || type == 'DOUBLE' ? true : false; |
| ... | ... | @@ -64,7 +63,7 @@ |
| 64 | 63 | isShowModBUS.value = true; |
| 65 | 64 | modBUSForm.value = { |
| 66 | 65 | crc: 'CRC_16_LOWER', |
| 67 | - deviceCode: '01', | |
| 66 | + deviceCode: code, | |
| 68 | 67 | method: actionType == '16' ? '10' : actionType, |
| 69 | 68 | registerAddress, |
| 70 | 69 | registerNumber: 1, | ... | ... |