diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index b76c38262..a6643fe8c 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -295,16 +295,19 @@ label: 'alertName', disabled: false }, { + id:20, name: this.$t('project.project.project'), type: 'project', label: 'project', disabled: false }, { + id:21, name: this.$t('project.module.module'), type: 'module', label: 'module', disabled: false }, { + id:22, name: this.$t('project.endpoint.endpoint'), type: 'input', label: 'endpointId', diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 17e6362f4..8e96fd2cb 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -1061,8 +1061,7 @@ }*/ this.searchMsg.searchLabelList.forEach((val, key) => { if (this.select_list[ind].id == val.id) { - this.searchLabelList.splice(key + 1, 0, val); - + this.searchLabelList.splice(key , 1, val); this.Iskeywords(ind) } }); diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index a58ffa841..e4c516301 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -332,7 +332,7 @@ searchMsg: { //给搜索框子组件传递的信息 zheze_none: true, searchLabelList: [{ - id: 2, + id: 1, name: this.$t('alert.alertName'), type: 'input', label: 'alertName', @@ -344,34 +344,37 @@ label: 'alertType', disabled: false }, */{ - id: 4, + id: 20, name: this.$t('alert.severity'), type: 'selectString', label: 'severity', disabled: false }, { - id: 11, + id: 21, name: this.$t('asset.asset'), type: 'asset', label: 'asset', disabled: false }, { + id:22, name: this.$t('project.project.project'), type: 'project', label: 'project', disabled: false }, { + id:23, name: this.$t('project.module.module'), type: 'module', label: 'module', disabled: false }, { + id:24, name: this.$t('project.endpoint.endpoint'), type: 'input', label: 'endpointId', disabled: false }, { - id: 12, + id:25, name: this.$t('alert.list.state'), type: 'select', label: 'alertMessageState', diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 3187e1417..3a68d1934 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -327,7 +327,7 @@ label: 'assetState', disabled: false },{ - id: 22, + id: 23, name: "pingStatus", type: 'select', label: 'pingStatus',