From 66b15c12adb1d10255db0f8af9c3dc555a4212f8 Mon Sep 17 00:00:00 2001 From: wangwenrui Date: Mon, 13 Jul 2020 17:26:06 +0800 Subject: [PATCH] =?UTF-8?q?perf:=E4=B8=AD=E6=96=87=E7=BF=BB=E8=AF=91?= =?UTF-8?q?=E8=A1=A5=E5=85=85&=E5=88=86=E9=A1=B5=E9=80=89=E6=8B=A9?= =?UTF-8?q?=E9=A1=B5=E6=95=B0=E7=BB=9F=E4=B8=80&panel=20Y=20=E8=BD=B4?= =?UTF-8?q?=E6=A0=BC=E5=BC=8F=E5=8C=96=E5=8F=96=E6=B6=88=E5=B0=8F=E6=95=B0?= =?UTF-8?q?=E7=82=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/charts/line-chart-block.vue | 2 +- .../common/bottomBox/tabs/alertMessageTab.vue | 2 +- nezha-fronted/src/components/common/language/cn.js | 5 ++++- nezha-fronted/src/components/common/pagination.vue | 13 ++++++------- .../src/components/common/rightBox/assetBox.vue | 2 +- nezha-fronted/src/components/page/alert/config.vue | 2 +- nezha-fronted/src/components/page/alert/list.vue | 2 +- nezha-fronted/src/components/page/asset/asset.vue | 2 +- .../src/components/page/asset/assetEditUnit.vue | 2 +- .../src/components/page/config/account.vue | 2 +- nezha-fronted/src/components/page/config/dc.vue | 2 +- nezha-fronted/src/components/page/config/mib.vue | 2 +- nezha-fronted/src/components/page/config/model.vue | 2 +- .../src/components/page/config/operationlog.vue | 2 +- .../src/components/page/config/promServer.vue | 2 +- .../src/components/page/config/terminallog.vue | 2 +- .../components/page/dashboard/explore/explore.vue | 2 +- .../src/components/page/project/project.vue | 2 +- 18 files changed, 26 insertions(+), 24 deletions(-) diff --git a/nezha-fronted/src/components/charts/line-chart-block.vue b/nezha-fronted/src/components/charts/line-chart-block.vue index 78e69a9ad..09a66cfe1 100644 --- a/nezha-fronted/src/components/charts/line-chart-block.vue +++ b/nezha-fronted/src/components/charts/line-chart-block.vue @@ -703,7 +703,7 @@ chartUnit=chartUnit?chartUnit:2; let unit=chartDataFormat.getUnit(chartUnit); //console.info(value, chartUnit, unit.compute(value,index)) - return unit.compute(value,index,2); + return unit.compute(value,index); }, }, //boundaryGap:[0,0.2] diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue index f9178513d..a1e1d4886 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTab.vue @@ -225,7 +225,7 @@ loading: false, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index f84448920..b71a71322 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -37,6 +37,7 @@ const cn = { available: "可用", createChart: "新增图表", createProject: "新增业务系统", + createEndpoint:'新增Endpoint', createAsset: "新增资产", createAlertRule: "新增告警规则", createAccount: "新增用户名", @@ -74,9 +75,11 @@ const cn = { noData:'没有数据', tag: '标签', syncChart:'同步图表', + placeHolder: "请输入", toolBox:{ zoom:'区域缩放', - back:'区域缩放还原' + back:'区域缩放还原', + stack: "查看堆叠图", } }, webshell: { diff --git a/nezha-fronted/src/components/common/pagination.vue b/nezha-fronted/src/components/common/pagination.vue index 6309bf9bc..15550a237 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:[20, 50, 100]" + :page-sizes="pageSizes?pageSizes:[50, 100, 200]" :page-size="pageSize" layout="total, prev, pager, next, slot" :total="this.pageObj.total" @@ -33,12 +33,8 @@ export default { }, data() { return { - pageSize: 20, + pageSize: 50, pageSizes:[ - { - label:'20'+this.$t('pageSize'), - value:20 - }, { label:'50'+this.$t('pageSize'), value:50 @@ -47,6 +43,10 @@ export default { label:'100'+this.$t('pageSize'), value:100 }, + { + label:'200'+this.$t('pageSize'), + value:200 + }, ] }; }, @@ -181,7 +181,6 @@ export default { .pagination .el-pagination { max-height: 42px; padding-right: 0; - overflow-x: hidden; } .pagination-size-select .el-input--mini .el-input__inner{ height: 20px; diff --git a/nezha-fronted/src/components/common/rightBox/assetBox.vue b/nezha-fronted/src/components/common/rightBox/assetBox.vue index 268e4f670..fca2fc071 100644 --- a/nezha-fronted/src/components/common/rightBox/assetBox.vue +++ b/nezha-fronted/src/components/common/rightBox/assetBox.vue @@ -316,7 +316,7 @@ pageObj: { id: '', pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0, idcId: '', idcIds: '' diff --git a/nezha-fronted/src/components/page/alert/config.vue b/nezha-fronted/src/components/page/alert/config.vue index f486f5e83..40f0a67f2 100644 --- a/nezha-fronted/src/components/page/alert/config.vue +++ b/nezha-fronted/src/components/page/alert/config.vue @@ -191,7 +191,7 @@ dropCol: [], pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, severityData: [ diff --git a/nezha-fronted/src/components/page/alert/list.vue b/nezha-fronted/src/components/page/alert/list.vue index 7e1dde121..c087196bf 100644 --- a/nezha-fronted/src/components/page/alert/list.vue +++ b/nezha-fronted/src/components/page/alert/list.vue @@ -268,7 +268,7 @@ showTopBtn: false, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/asset/asset.vue b/nezha-fronted/src/components/page/asset/asset.vue index 00b645dba..cd87c21cc 100644 --- a/nezha-fronted/src/components/page/asset/asset.vue +++ b/nezha-fronted/src/components/page/asset/asset.vue @@ -385,7 +385,7 @@ pageObj: { id: '', pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0, idcId: '', idcIds: '' diff --git a/nezha-fronted/src/components/page/asset/assetEditUnit.vue b/nezha-fronted/src/components/page/asset/assetEditUnit.vue index 8376d3dfa..ac4cb6b97 100644 --- a/nezha-fronted/src/components/page/asset/assetEditUnit.vue +++ b/nezha-fronted/src/components/page/asset/assetEditUnit.vue @@ -468,7 +468,7 @@ pageObj: { id: '', pageNo: 1, - pageSize: 20, + pageSize: 50, 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 6ad9bc71a..f40aeece5 100644 --- a/nezha-fronted/src/components/page/config/account.vue +++ b/nezha-fronted/src/components/page/config/account.vue @@ -237,7 +237,7 @@ }, pageObj: { //分页对象 pageNo: 1, - pageSize: 20, + pageSize: 50, 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 02d10f3cb..f5fd23f2f 100644 --- a/nezha-fronted/src/components/page/config/dc.vue +++ b/nezha-fronted/src/components/page/config/dc.vue @@ -187,7 +187,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/mib.vue b/nezha-fronted/src/components/page/config/mib.vue index c6da6280d..ba419b08d 100644 --- a/nezha-fronted/src/components/page/config/mib.vue +++ b/nezha-fronted/src/components/page/config/mib.vue @@ -157,7 +157,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/model.vue b/nezha-fronted/src/components/page/config/model.vue index 3fc1dd805..81209315f 100644 --- a/nezha-fronted/src/components/page/config/model.vue +++ b/nezha-fronted/src/components/page/config/model.vue @@ -142,7 +142,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, loading: false, diff --git a/nezha-fronted/src/components/page/config/operationlog.vue b/nezha-fronted/src/components/page/config/operationlog.vue index 20eb1a4ad..cc9ccc6db 100644 --- a/nezha-fronted/src/components/page/config/operationlog.vue +++ b/nezha-fronted/src/components/page/config/operationlog.vue @@ -126,7 +126,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index b0a06ce29..b96fcd066 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -243,7 +243,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, tableTitle: [ diff --git a/nezha-fronted/src/components/page/config/terminallog.vue b/nezha-fronted/src/components/page/config/terminallog.vue index fe901ef4b..55339ea5b 100644 --- a/nezha-fronted/src/components/page/config/terminallog.vue +++ b/nezha-fronted/src/components/page/config/terminallog.vue @@ -143,7 +143,7 @@ }, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, 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 5989ec042..162e2ea8a 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/explore.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/explore.vue @@ -244,7 +244,7 @@ instance_cpu_time_ns{app="fox", proc="widget", rev="4d3a513", env="prod", job="c tableVisible: true, pageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total: 0 }, dropCol: [], diff --git a/nezha-fronted/src/components/page/project/project.vue b/nezha-fronted/src/components/page/project/project.vue index 6229cb8ca..8351f05e8 100644 --- a/nezha-fronted/src/components/page/project/project.vue +++ b/nezha-fronted/src/components/page/project/project.vue @@ -265,7 +265,7 @@ endpointTableData: [], endpointPageObj: { pageNo: 1, - pageSize: 20, + pageSize: 50, total:0 }, curEndpoint: {},