diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 4f90892b0..500da90db 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -48,6 +48,7 @@ const cn = { downloadButtonTitle:'下载', filePath:'文件路径', }, + pageSize: '条/页', login: { username: '登录名', password: '密码', diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 289e0c6f7..7526bebcc 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -64,6 +64,7 @@ const en = { failedDetail:'Failed Detail' } }, + pageSize: '/page', webshell:{ shellTitle:'Local Shell', upload:'Upload', diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue index 6ae0849f4..aeed641ef 100644 --- a/nezha-fronted/src/components/common/pagination.vue +++ b/nezha-fronted/src/components/common/pagination.vue @@ -8,7 +8,7 @@ @current-change="current" :current-page="pageObj.pageNo" :page-sizes="pageSizes?pageSizes:[20, 50, 100]" - :page-size="20" + :page-size="pageSize" layout="total, prev, pager, next,sizes,jumper" :total="this.pageObj.total" > @@ -18,9 +18,11 @@ diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index cccd4fd50..b32017198 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -84,7 +84,7 @@ - + @@ -107,6 +107,7 @@ name: "alert-config", data() { return { + tableId: 'alertRuleTable', //需要分页的table的id,用于记录每页数量 showTopBtn: false, searchMsg: { //给搜索框子组件传递的信息 zheze_none: true, @@ -355,6 +356,7 @@ }, pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); }, search: function (searchObj) { @@ -407,6 +409,12 @@ } }, mounted() { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.getTableData(); this.$nextTick(() => { //绑定滚动条事件,控制top按钮 diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index be8b65fc7..cc6a03dd0 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -91,7 +91,7 @@ - + @@ -114,6 +114,7 @@ name: "alertList", data() { return { + tableId: 'alertListTable', //需要分页的table的id,用于记录每页数量 showTopBtn: false, pageObj: { pageNo: 1, @@ -294,6 +295,7 @@ }, pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getAlertList(); this.$nextTick(() => { this.gutterHandler(".nz-table"); @@ -358,6 +360,12 @@ } }, mounted() { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.getAlertList(); this.$nextTick(() => { //绑定滚动条事件,控制top按钮 diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 0c3eb6892..76b040812 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -181,7 +181,7 @@ - + @@ -215,6 +215,7 @@ }, data() { return { + tableId: 'assetTable', //需要分页的table的id,用于记录每页数量 searchMsg: { //给搜索框子组件传递的信息 zheze_none: true, searchLabelList: [{ @@ -708,6 +709,7 @@ , pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getAssetData() }, getPrincipalName(data) { @@ -772,6 +774,12 @@ this.getIDCOptionData(); }, mounted() { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.$nextTick(() => { //左侧dc列表初始选中状态 if (this.$store.state.assetData.selectedData.length > 0) { diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index 93d570173..4145475a1 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -86,7 +86,7 @@ - + @@ -177,6 +177,7 @@ name: "account", data() { return { + tableId: 'accountTable', //需要分页的table的id,用于记录每页数量 showTopBtn: false, rightBox: { //弹出框相关 show: false, @@ -492,6 +493,7 @@ }, pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); }, search: function (searchObj) { @@ -513,6 +515,12 @@ } }, mounted() { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.getTableData(); this.initReceiverData(); this.$nextTick(() => { diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index 415d7a38f..656710f78 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -69,7 +69,7 @@ :data="tableData" border v-scrollBar:el-table - height="calc(100% - 125px)" + :height="$tableHeight.normal" ref="dcTable" style="width: 100%;"> - + - + @@ -90,6 +90,7 @@ name: "model", data() { return { + tableId: 'modelTable', //需要分页的table的id,用于记录每页数量 showTopBtn: false, model: { id: '', @@ -248,6 +249,7 @@ }, pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); }, search: function (searchObj) { @@ -274,6 +276,12 @@ } }, mounted: function () { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.getTableData(); this.$nextTick(() => { //绑定滚动条事件,控制top按钮 diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 8d9eecbcb..b9003be72 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -77,7 +77,7 @@ - + @@ -198,6 +198,7 @@ name: "prom", data() { return { + tableId: 'promTable', //需要分页的table的id,用于记录每页数量 showTopBtn: false, rightBox: { //弹出框相关 show: false, @@ -559,6 +560,7 @@ }, pageSize(val) { this.pageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getTableData(); }, search: function (searchObj) { @@ -643,6 +645,12 @@ }, }, mounted: function () { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.pageObj.pageSize = pageSize + } + this.getIdcData(); this.getUserData(); this.$nextTick(() => { diff --git a/nezha-fronted/src/components/page/dashboard/chartBox.vue b/nezha-fronted/src/components/page/dashboard/chartBox.vue index 1e9239058..36aaa2dca 100644 --- a/nezha-fronted/src/components/page/dashboard/chartBox.vue +++ b/nezha-fronted/src/components/page/dashboard/chartBox.vue @@ -784,7 +784,6 @@ } } } - console.info(data); callback(data); }, diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index b9f6b66cf..21f7fc40a 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -168,7 +168,7 @@ - + @@ -347,6 +347,7 @@ data() { let temp=this; return { + tableId: 'projectTable', //需要分页的table的id,用于记录每页数量 tableShow: 1, // 1.endpoint; 2.metrics showTopBtn1: false, showTopBtn2: false, @@ -954,6 +955,7 @@ }, endpointPageSize(val) { this.endpointPageObj.pageSize = val; + localStorage.setItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId, val); this.getEndpointTableData(); this.$nextTick(() => { this.gutterHandler(".endpoint-table"); @@ -1608,6 +1610,12 @@ this.getMetricsTableData(); }, mounted() { + //是否存在分页缓存 + let pageSize = localStorage.getItem('nz-pageSize-' + localStorage.getItem('nz-username') + '-' + this.tableId); + if (pageSize) { + this.endpointPageObj.pageSize = pageSize + } + this.getPanelData(); setTimeout(()=>{ this.getEndpointTableData();