diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index 4fa310488..2b79494a6 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -785,6 +785,10 @@ tableDataSort(item){ this.$emit('tableDataSort',item); }, + pageNo(val) { + this.pageObj.pageNo = val; + this.getTableData(); + }, // label tooltip是否显示 labelToolTipDis(labelType){ switch(labelType){ @@ -844,6 +848,14 @@ }, immediate: true, deep:true, + }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + } + } } }, mounted() { diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 83fe985e4..7ae2919ea 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -21,7 +21,7 @@ - + @@ -426,6 +426,16 @@ } } }, + tableData: { + deep: true, + handler(n) { + if (n.length === 0 && this.pageObj.pageNo > 1) { + this.pageNo(this.pageObj.pageNo-1); + }else if(n.length === 0 && this.pageObj.pageNo === 1){ + this.afterTableListChange(); + } + } + } }, methods: { fullScreen() { @@ -545,7 +555,7 @@ this.$delete("asset?ids=" + asset.id).then(response => { if (response.code === 200) { this.$message({duration: 2000, type: 'success', message: this.$t("tip.deleteSuccess")}); - this.afterTableListChange() + this.getTableData() } else { this.$message.error(response.msg); } @@ -583,7 +593,7 @@ this.rightBox.show = false; this.rightBox.batchShow = false; if (refresh) { - this.afterTableListChange() + this.getTableData() this.loadKeys(); } },