diff --git a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue index 0bf6742..3091111 100644 --- a/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue +++ b/src/views/abnormalAlarm/alarmCenter/alarmRules/index.vue @@ -607,29 +607,6 @@ export default { editItem(id) { getAction("/alarmRule/findInfo", {alarmRuleId:id}).then(async res => { if (res.success) { - let result_1 = await getAction("/alarmRule/getSources", { souceType: res.result.sourceType }) - if (result_1.success) { - this.sourceOptions = result_1.result.map(item => { - return { - label: item.sourceName, - value: item.sourceId - } - }) - } else { - this.$message.warning("This operation fails. Contact your system administrator") - } - let result_2 = await getAction("/alarmRule/getItems", {sourceName:res.result.sourceName}) - if (result_2.success) { - this.itemOptions = result_2.result.map(item => { - return { - label: item.name, - value: item.itemId, - units:item.units - } - }) - } else { - this.$message.warning("This operation fails. Contact your system administrator") - } this.isAdd = false this.form.sourceType = res.result.sourceType this.form.sourceId = { @@ -648,6 +625,35 @@ export default { this.form.contactId = res.result.contactId this.currId = res.result.id this.visible = true + getAction("/alarmRule/getSources", { souceType: res.result.sourceType }).then(res => { + if (res.success) { + this.sourceOptions = res.result.map(item => { + return { + label: item.sourceName, + value: item.sourceId + } + }) + } else { + this.$message.warning("This operation fails. Contact your system administrator") + } + }).catch(err => { + this.$message.warning("This operation fails. Contact your system administrator") + }) + getAction("/alarmRule/getItems", { sourceName: res.result.sourceName }).then(res => { + if (res.success) { + this.itemOptions = res.result.map(item => { + return { + label: item.name, + value: item.itemId, + units:item.units + } + }) + } else { + this.$message.warning("This operation fails. Contact your system administrator") + } + }).catch(err => { + this.$message.warning("This operation fails. Contact your system administrator") + }) } else { this.$message.warning("This operation fails. Contact your system administrator") }