Commit c68621b800c5d10e901fdf5c0e3f9227168caadf
Merge branch 'fix/attribute-distribution' into 'main_dev'
fix: 修改mqtt属性下发也提示物模型扩展描述没有值 See merge request yunteng/thingskit-front!785
Showing
1 changed file
with
12 additions
and
9 deletions
| ... | ... | @@ -37,7 +37,8 @@ | 
| 37 | 37 | const { name, detail, identifier, deviceDetail, extensionDesc } = record; | 
| 38 | 38 | const { dataType } = detail; | 
| 39 | 39 | const { type } = dataType || {}; | 
| 40 | - const { codeType } = deviceDetail || {}; | |
| 40 | + const { codeType, deviceProfile } = deviceDetail || {}; | |
| 41 | + const { transportType } = deviceProfile || {}; | |
| 41 | 42 | const { registerAddress, actionType } = extensionDesc || {}; | 
| 42 | 43 | formField.value = identifier; | 
| 43 | 44 | |
| ... | ... | @@ -53,8 +54,8 @@ | 
| 53 | 54 | isShowActionType.value = actionType ? true : false; //判断modBUS类型时 物模型是否填写扩展描述 | 
| 54 | 55 | |
| 55 | 56 | //是modBUS类型的就用另外的表单 | 
| 56 | - //判断是否是modBus的下发命令 | |
| 57 | - if (codeType == TaskTypeEnum.MODBUS) { | |
| 57 | + //判断是否是TCP ==> modBus的下发命令 | |
| 58 | + if (codeType == TaskTypeEnum.MODBUS && transportType == 'TCP') { | |
| 58 | 59 | isShowModBUS.value = true; | 
| 59 | 60 | modBUSForm.value = { | 
| 60 | 61 | crc: 'CRC_16_LOWER', | 
| ... | ... | @@ -91,15 +92,17 @@ | 
| 91 | 92 | try { | 
| 92 | 93 | loading.value = true; | 
| 93 | 94 | if (!props.deviceId) return; | 
| 94 | - if (!unref(isShowActionType)) { | |
| 95 | - createMessage.warning('当前物模型扩展描述没有填写'); | |
| 96 | - return; | |
| 97 | - } | |
| 98 | - const flag = await validate(); | |
| 99 | - if (!flag) return; | |
| 95 | + | |
| 100 | 96 | const sendValue = ref({}); | 
| 101 | 97 | //判断tcp类型 标识符是自定义还是ModBus | 
| 102 | 98 | if (unref(isShowModBUS)) { | 
| 99 | + if (!unref(isShowActionType)) { | |
| 100 | + createMessage.warning('当前物模型扩展描述没有填写'); | |
| 101 | + return; | |
| 102 | + } | |
| 103 | + const flag = await validate(); | |
| 104 | + if (!flag) return; | |
| 105 | + | |
| 103 | 106 | const oldValue = getFieldsValue()[unref(formField)]; | 
| 104 | 107 | modBUSForm.value.registerValues = [oldValue]; | 
| 105 | 108 | modBUSForm.value.registerNumber = 1; | ... | ... |