Commit 618b6218b3802f151f387509656b40ae0bbe525f
Merge branch 'ww' into 'main'
fix: rule linkedge alarm configuration can not save deviceType fields See merge request yunteng/thingskit-front!477
Showing
2 changed files
with
2 additions
and
3 deletions
| @@ -423,6 +423,7 @@ | @@ -423,6 +423,7 @@ | ||
| 423 | triggered: | 423 | triggered: |
| 424 | action.doContext.clearRule[index].triggerCondition.condition.spec.type, | 424 | action.doContext.clearRule[index].triggerCondition.condition.spec.type, |
| 425 | device: action.doContext.clearRule[index].entityType, | 425 | device: action.doContext.clearRule[index].entityType, |
| 426 | + deviceType: action.doContext.clearRule[index].deviceType, | ||
| 426 | triggerType: action.doContext.clearRule[index].triggerType, | 427 | triggerType: action.doContext.clearRule[index].triggerType, |
| 427 | type1: | 428 | type1: |
| 428 | action.doContext.clearRule[index].triggerCondition.condition.condition[0].key | 429 | action.doContext.clearRule[index].triggerCondition.condition.condition[0].key |
| @@ -694,8 +695,6 @@ | @@ -694,8 +695,6 @@ | ||
| 694 | } | 695 | } |
| 695 | if (mustTriggerCondition) return; | 696 | if (mustTriggerCondition) return; |
| 696 | if (mustCondition) return; | 697 | if (mustCondition) return; |
| 697 | - console.log(postAddOrEditData); | ||
| 698 | - return; | ||
| 699 | //FT change | 698 | //FT change |
| 700 | await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate)); | 699 | await screenLinkPageAddApi(postAddOrEditData, unref(isUpdate)); |
| 701 | createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`); | 700 | createMessage.success(`${unref(isUpdate) ? '编辑' : '新增'}成功`); |
| @@ -120,7 +120,7 @@ export const genActionData = (actionData) => { | @@ -120,7 +120,7 @@ export const genActionData = (actionData) => { | ||
| 120 | triggerType: item.triggerType, | 120 | triggerType: item.triggerType, |
| 121 | entityType: item.device, | 121 | entityType: item.device, |
| 122 | entityId: item.device === 'PART' ? item.entityId : null, | 122 | entityId: item.device === 'PART' ? item.entityId : null, |
| 123 | - deviceType, | 123 | + deviceType: item.deviceType, |
| 124 | deviceProfileId: item.deviceProfileId, | 124 | deviceProfileId: item.deviceProfileId, |
| 125 | triggerCondition: { | 125 | triggerCondition: { |
| 126 | alarmDetails: item.detail, | 126 | alarmDetails: item.detail, |