diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index d26be2f34..76b0000f9 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -88,7 +88,7 @@ - --> - @@ -536,8 +536,7 @@ this.searchMsg.searchLabelList = this.searchMsg.searchLabelList.filter((item, index) => { return item.label != "alertType" && item.label != "asset" }); - this.searchLabel.type = 3; - this.searchLabel.linkId = n.id; + this.searchLabel.assetId = n.id; } if (n.alertNum) { this.defaultSearchValue = 1; diff --git a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue index 4f951a4be..d868b3641 100644 --- a/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertConfigBox.vue @@ -124,12 +124,6 @@ alertName:[ {required:true,message:this.$t('validate.required'),trigger:'blur'} ], - type:[ - {required:true,message:this.$t('validate.required'),trigger:'change'} - ], - linkId:[ - {required:true,message:this.$t('validate.required'),trigger:"change"} - ], expr:[ {required:true,message:this.$t('validate.required'),trigger:'blur'} ], @@ -243,7 +237,7 @@ } }) }, - changeType(type) { + /*changeType(type) { this.alertRule.linkId = ''; if (type == 1) { this.getProjectList(); @@ -252,7 +246,7 @@ } else if (type == 3) { this.getAssetList(); } - }, + },*/ del: function() { this.$confirm(this.$t("tip.confirmDelete"), { confirmButtonText: this.$t("tip.yes"), diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 7afecea67..b4cca15dd 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -391,8 +391,6 @@ this.alertRule = { id: '', alertName: '', - type: '', - linkId: '', linkObject: {id: '', name: ''}, expr: '', last: '', diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 3d5821192..1061fdd11 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -102,7 +102,7 @@ diff --git a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue index 6ae070f56..780f74d96 100644 --- a/nezha-fronted/src/components/page/dashboard/overview/overview2.vue +++ b/nezha-fronted/src/components/page/dashboard/overview/overview2.vue @@ -93,7 +93,7 @@