diff --git a/nezha-fronted/src/components/charts/chart-alert-list.vue b/nezha-fronted/src/components/charts/chart-alert-list.vue index 2c559c608..dcfb2152a 100644 --- a/nezha-fronted/src/components/charts/chart-alert-list.vue +++ b/nezha-fronted/src/components/charts/chart-alert-list.vue @@ -164,13 +164,13 @@ export default { errorContent:'', pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, loadingTable:false,// 表格数据加载loading screenPageObj:{ pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, storedTableData:[], diff --git a/nezha-fronted/src/components/charts/chart-table.vue b/nezha-fronted/src/components/charts/chart-table.vue index 2c8b79b2e..60a549ff6 100644 --- a/nezha-fronted/src/components/charts/chart-table.vue +++ b/nezha-fronted/src/components/charts/chart-table.vue @@ -159,12 +159,12 @@ pageSizes: [20, 50, 100], pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, screenPageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, storedTableDataOld: [],//原始信息 diff --git a/nezha-fronted/src/components/charts/chartPreview.vue b/nezha-fronted/src/components/charts/chartPreview.vue index a86b36949..c073f78d5 100644 --- a/nezha-fronted/src/components/charts/chartPreview.vue +++ b/nezha-fronted/src/components/charts/chartPreview.vue @@ -149,7 +149,7 @@ - + @@ -207,10 +207,9 @@ errorContent:'', serieSingleStat:'', seriesItemScreen:[], - pageSizes:[50,100,200], screenPageObj:{ pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, unit:{}, diff --git a/nezha-fronted/src/components/common/alert/alertMessageTable.vue b/nezha-fronted/src/components/common/alert/alertMessageTable.vue index e844115c6..9fe9a3da8 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageTable.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageTable.vue @@ -283,7 +283,7 @@ chartUnit: 5, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index cb7774eb3..75e5b2150 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -122,7 +122,7 @@ loading: false, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, diff --git a/nezha-fronted/src/components/common/js/constants.js b/nezha-fronted/src/components/common/js/constants.js index 29d510e45..d08d77ffe 100644 --- a/nezha-fronted/src/components/common/js/constants.js +++ b/nezha-fronted/src/components/common/js/constants.js @@ -1,5 +1,7 @@ import i18n from "../i18n"; +export const defaultPageSize = 20; + export const staticMenus = { settings: { title: i18n.t('overall.config'), diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 2e44a0050..4c781a55a 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -47,6 +47,7 @@ const cn = { createAsset: "新增资产", createAlertRule: "新增告警规则", createAccount: "新增用户名", + createRole: '新增角色', createPrometheusServer: "新增prometheus服务", createDatacenter: "新增数据中心", active: "活跃", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 24f063b66..65dc4296a 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -54,6 +54,7 @@ const en = { createAsset:'Create asset', createAlertRule:'Create alert rule', createAccount:'Create account', + createRole: 'Create role', createPrometheusServer:'Create prometheus server', createDatacenter:'Create Data Center', createCabinet:'Create cabinet', diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue index 8e96702cc..ffa4febba 100644 --- a/nezha-fronted/src/components/common/pagination.vue +++ b/nezha-fronted/src/components/common/pagination.vue @@ -7,7 +7,7 @@ @next-click="next" @current-change="current" :current-page="pageObj.pageNo" - :page-sizes="pageSizes?pageSizes:[50, 100, 200]" + :page-sizes="pageSizes?pageSizes:[20, 50, 100]" :page-size="Number(pageObj.pageSize)" layout="total, prev, pager, next, slot" :total="this.pageObj.total" @@ -33,8 +33,12 @@ export default { }, data() { return { - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, pageSizes:[ + { + label:'20'+this.$t('pageSize'), + value:20 + }, { label:'50'+this.$t('pageSize'), value:50 @@ -43,10 +47,6 @@ export default { label:'100'+this.$t('pageSize'), value:100 }, - { - label:'200'+this.$t('pageSize'), - value:200 - }, ] }; }, diff --git a/nezha-fronted/src/components/common/project/popData/alertTable.vue b/nezha-fronted/src/components/common/project/popData/alertTable.vue index 1a24ccd9d..c7e6b8fcf 100644 --- a/nezha-fronted/src/components/common/project/popData/alertTable.vue +++ b/nezha-fronted/src/components/common/project/popData/alertTable.vue @@ -219,7 +219,7 @@ return{ pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/common/project/popData/assetTable.vue b/nezha-fronted/src/components/common/project/popData/assetTable.vue index b11d8ef37..74318a2c5 100644 --- a/nezha-fronted/src/components/common/project/popData/assetTable.vue +++ b/nezha-fronted/src/components/common/project/popData/assetTable.vue @@ -154,7 +154,7 @@ return{ pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, mainTableHeight:'100%', diff --git a/nezha-fronted/src/components/common/project/popData/endpointTable.vue b/nezha-fronted/src/components/common/project/popData/endpointTable.vue index 0539d4e0e..be6419661 100644 --- a/nezha-fronted/src/components/common/project/popData/endpointTable.vue +++ b/nezha-fronted/src/components/common/project/popData/endpointTable.vue @@ -139,7 +139,7 @@ return{ pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, mainTableHeight:'100%', diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index 4bed55f60..fae4ac7ea 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -225,7 +225,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index f5f8397a6..46fccc799 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -160,7 +160,7 @@ tableId: 'alertListTable', //需要分页的table的id，用于记录每页数量 pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 0be5f568c..63a7d974f 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -175,7 +175,7 @@
- +
@@ -383,7 +383,7 @@ pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0, idcId: '', idcIds: '' diff --git a/nezha-fronted/src/components/page/config/account.vue b/nezha-fronted/src/components/page/config/account.vue index e3ace8c47..7cfc53cae 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -199,7 +199,7 @@ }, pageObj: { //分页对象 pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ //原table列 diff --git a/nezha-fronted/src/components/page/config/dc.vue b/nezha-fronted/src/components/page/config/dc.vue index fe7303a07..1994b0703 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -201,7 +201,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index 6fbc1330a..417686a2b 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -146,7 +146,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 74c886489..3a649e10c 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -153,7 +153,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue index 5a4847c88..025753c29 100644 --- a/nezha-fronted/src/components/page/config/operationlog.vue +++ b/nezha-fronted/src/components/page/config/operationlog.vue @@ -101,7 +101,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 5170e7ce4..8d8617931 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -145,7 +145,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/roles.vue b/nezha-fronted/src/components/page/config/roles.vue index f163d31a1..d57eaaedd 100644 --- a/nezha-fronted/src/components/page/config/roles.vue +++ b/nezha-fronted/src/components/page/config/roles.vue @@ -14,7 +14,7 @@
- @@ -141,7 +141,7 @@ }, pageObj: { //分页对象 pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ //原table列 diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index 2f8ea6985..ba4003415 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -120,7 +120,7 @@ }, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/dashboard/explore/explore.vue b/nezha-fronted/src/components/page/dashboard/explore/explore.vue index e79d5c3cf..235aef34c 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue @@ -249,7 +249,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c tableVisible: true, pageObj: { pageNo: 1, - pageSize: 50, + pageSize: this.$CONSTANTS.defaultPageSize, total: 0 }, tableData: [], diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index e9fca6015..1379c5889 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -340,9 +340,9 @@ ], endpointTableData:[], endpointPageObj:{ - pageNo:1, - pageSize:50, - total:0 + pageNo: 1, + pageSize: this.$CONSTANTS.defaultPageSize, + total: 0 }, currentProjectTitle:'', diff --git a/nezha-fronted/src/main.js b/nezha-fronted/src/main.js index 9b26e9617..a8675e73a 100644 --- a/nezha-fronted/src/main.js +++ b/nezha-fronted/src/main.js @@ -92,68 +92,68 @@ Vue.prototype.$tableHeight = { //列表页表格的高度 }; Vue.mixin({ - methods: { - utcTimeToTimezone:function(time){ - if(time){ - return bus.UTCTimeToConfigTimezone(time) - } - }, - utcTimeToTimezoneStr:function(time,format='yyyy-MM-dd hh:mm:ss'){ - if(time){ - return bus.timeFormate(bus.UTCTimeToConfigTimezone(time),format) - }else{ - return '-' - } - }, - timezoneToUtcTime:function(time){ - if(time){ - return bus.configTimezoneToUTCTime(time) - } - }, - timezoneToUtcTimeStr:function(time,format='yyyy-MM-dd hh:mm:ss'){ - if(time){ - return bus.timeFormate(this.timezoneToUtcTime(time),format) - } - }, - tableTitleReset:function(src,dist){ - dist.forEach(item=>{ - let title=src.find(t=>t.prop == item.prop) - if(title&&title.label){ - item.label=title.label; - } - }) - }, - hasButton(code) { - return hasButton(this.$store.getters.buttonList, code); - }, - toTop(wrap) { - let currentTop = wrap.scrollTop; - let interval = currentTop/10; - let intervalFunc = setInterval(function(){ //花200ms分10次回到顶部，模拟动画效果 - if (currentTop == 0) { - clearInterval(intervalFunc); - } else { - currentTop = (currentTop - interval) < interval*0.5 ? 0 : currentTop - interval; - wrap.scrollTop = currentTop; - } - }, 20); - }, - toTopBtnHandler(wrap) { - let vm = this; - wrap.addEventListener('scroll', bus.debounce(function() { - vm.tools.showTopBtn = wrap.scrollTop > 50; - vm.tools.tableHover = wrap.scrollTop > 50; - }, 100)); + methods: { + utcTimeToTimezone:function(time){ + if(time){ + return bus.UTCTimeToConfigTimezone(time) } }, - computed: { - getMenuList() { - return this.$store.state.user.menuList; - }, - getButtonList() { - return this.$store.state.buttonList; + utcTimeToTimezoneStr:function(time,format='yyyy-MM-dd hh:mm:ss'){ + if(time){ + return bus.timeFormate(bus.UTCTimeToConfigTimezone(time),format) + }else{ + return '-' } + }, + timezoneToUtcTime:function(time){ + if(time){ + return bus.configTimezoneToUTCTime(time) + } + }, + timezoneToUtcTimeStr:function(time,format='yyyy-MM-dd hh:mm:ss'){ + if(time){ + return bus.timeFormate(this.timezoneToUtcTime(time),format) + } + }, + tableTitleReset:function(src,dist){ + dist.forEach(item=>{ + let title=src.find(t=>t.prop == item.prop) + if(title&&title.label){ + item.label=title.label; + } + }) + }, + hasButton(code) { + return hasButton(this.$store.getters.buttonList, code); + }, + toTop(wrap) { + let currentTop = wrap.scrollTop; + let interval = currentTop/10; + let intervalFunc = setInterval(function(){ //花200ms分10次回到顶部，模拟动画效果 + if (currentTop == 0) { + clearInterval(intervalFunc); + } else { + currentTop = (currentTop - interval) < interval*0.5 ? 0 : currentTop - interval; + wrap.scrollTop = currentTop; + } + }, 20); + }, + toTopBtnHandler(wrap) { + let vm = this; + wrap.addEventListener('scroll', bus.debounce(function() { + vm.tools.showTopBtn = wrap.scrollTop > 50; + vm.tools.tableHover = wrap.scrollTop > 50; + }, 100)); } + }, + computed: { + getMenuList() { + return this.$store.state.user.menuList; + }, + getButtonList() { + return this.$store.state.buttonList; + } + } });