Commit 0221f8593aaccc2873698c1dc6a57ee4d8a228b5
1 parent
7b9625bf
fix: DEFECT-955 linkedge remark echo other data item
Showing
1 changed file
with
1 additions
and
4 deletions
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | v-bind="$attrs" | 4 | v-bind="$attrs" |
| 5 | @register="registerDrawer" | 5 | @register="registerDrawer" |
| 6 | @ok="handleSubmit" | 6 | @ok="handleSubmit" |
| 7 | + destroy-on-close | ||
| 7 | width="50%" | 8 | width="50%" |
| 8 | showFooter | 9 | showFooter |
| 9 | @close="handleClose" | 10 | @close="handleClose" |
| @@ -245,7 +246,6 @@ | @@ -245,7 +246,6 @@ | ||
| 245 | operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType, | 246 | operationType: trigger?.triggerCondition?.condition?.condition[0]?.valueType, |
| 246 | detail: trigger?.triggerCondition?.alarmDetails, | 247 | detail: trigger?.triggerCondition?.alarmDetails, |
| 247 | entityId: trigger?.entityId, | 248 | entityId: trigger?.entityId, |
| 248 | - deviceType: trigger?.deviceType, | ||
| 249 | deviceProfileId: trigger?.deviceProfileId, | 249 | deviceProfileId: trigger?.deviceProfileId, |
| 250 | replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue, | 250 | replaceValue: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue, |
| 251 | time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue, | 251 | time: trigger?.triggerCondition?.condition?.spec?.predicate?.defaultValue, |
| @@ -326,7 +326,6 @@ | @@ -326,7 +326,6 @@ | ||
| 326 | operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType, | 326 | operationType: condition?.triggerCondition?.condition?.condition[0]?.valueType, |
| 327 | detail: condition?.triggerCondition?.alarmDetails, | 327 | detail: condition?.triggerCondition?.alarmDetails, |
| 328 | entityId: condition?.entityId, | 328 | entityId: condition?.entityId, |
| 329 | - deviceType: condition?.deviceType, | ||
| 330 | deviceProfileId: condition?.deviceProfileId, | 329 | deviceProfileId: condition?.deviceProfileId, |
| 331 | replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue, | 330 | replaceValue: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue, |
| 332 | time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue, | 331 | time: condition?.triggerCondition?.condition?.spec?.predicate?.defaultValue, |
| @@ -399,7 +398,6 @@ | @@ -399,7 +398,6 @@ | ||
| 399 | deviceId: action.deviceId, | 398 | deviceId: action.deviceId, |
| 400 | alarm_config: action.alarmProfileId, | 399 | alarm_config: action.alarmProfileId, |
| 401 | alarm_level: action.doContext.alarmLevel, | 400 | alarm_level: action.doContext.alarmLevel, |
| 402 | - deviceType: action.deviceType, | ||
| 403 | }); | 401 | }); |
| 404 | // 如果是设备输出设置脚本值 | 402 | // 如果是设备输出设置脚本值 |
| 405 | if (action.outTarget === 'DEVICE_OUT') { | 403 | if (action.outTarget === 'DEVICE_OUT') { |
| @@ -439,7 +437,6 @@ | @@ -439,7 +437,6 @@ | ||
| 439 | .valueType, | 437 | .valueType, |
| 440 | detail: action.doContext.clearRule[index].triggerCondition.alarmDetails, | 438 | detail: action.doContext.clearRule[index].triggerCondition.alarmDetails, |
| 441 | entityId: action.doContext.clearRule[index].entityId, | 439 | entityId: action.doContext.clearRule[index].entityId, |
| 442 | - deviceType: action.doContext.clearRule[index].entityId?.deviceType, | ||
| 443 | deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId, | 440 | deviceProfileId: action.doContext.clearRule[index]?.deviceProfileId, |
| 444 | replaceValue: | 441 | replaceValue: |
| 445 | action.doContext.clearRule[index].triggerCondition.condition.spec.predicate | 442 | action.doContext.clearRule[index].triggerCondition.condition.spec.predicate |