diff --git a/nezha-fronted/src/assets/stylus/main.scss b/nezha-fronted/src/assets/stylus/main.scss index 0dea33179..260921ea3 100644 --- a/nezha-fronted/src/assets/stylus/main.scss +++ b/nezha-fronted/src/assets/stylus/main.scss @@ -498,6 +498,7 @@ li{ align-items : center; position: relative; flex-direction: row-reverse; + z-index: 10; } .top-tools>div { margin-top: 2px; @@ -990,6 +991,9 @@ li{ .new-search .el-scrollbar__bar.is-horizontal { height: 4px; } +.new-search .el-scrollbar__view { + height: calc(100% - 4px); +} .app>.el-scrollbar__bar.is-vertical { width: 5px; } diff --git a/nezha-fronted/src/components/common/bottomBox/alertMessageBox.vue b/nezha-fronted/src/components/common/bottomBox/alertMessageBox.vue index aacfaa226..967fad835 100644 --- a/nezha-fronted/src/components/common/bottomBox/alertMessageBox.vue +++ b/nezha-fronted/src/components/common/bottomBox/alertMessageBox.vue @@ -232,15 +232,18 @@ } }, methods: { - getAlertList: function () { + getAlertList() { + this.tableData = []; + this.loading = true; this.$set(this.searchLabel, "pageNo", this.pageObj.pageNo); this.$set(this.searchLabel, "pageSize", this.pageObj.pageSize); this.$get('alert/message', this.searchLabel).then(response => { if (response.code == 200) { - this.tableData = response.data.list - this.pageObj.total = response.data.total + this.loading = false; + this.tableData = response.data.list; + this.pageObj.total = response.data.total; } - }) + }); }, pageNo(val) { this.pageObj.pageNo = val; @@ -364,6 +367,21 @@ } - diff --git a/nezha-fronted/src/components/common/searchInput.vue b/nezha-fronted/src/components/common/searchInput.vue index 685139c57..2071feb92 100644 --- a/nezha-fronted/src/components/common/searchInput.vue +++ b/nezha-fronted/src/components/common/searchInput.vue @@ -27,7 +27,7 @@