From 8647ca5aae412a688713de45bc40c87e1f6464dc Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 25 Nov 2020 13:42:12 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9flieName?= =?UTF-8?q?=E7=9A=84=E8=8B=B1=E6=96=87=E6=98=BE=E7=A4=BA=20=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E6=94=B9mibBrowser=E7=9A=84=E8=A1=A8=E6=A0=BC?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/en.js | 2 +- .../src/components/page/config/mibBrowser.vue | 24 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index db23db46b..8b412e7c6 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -678,7 +678,7 @@ const en = { }, mib:{ mib:'SNMP MIB', - fileName:'FileName', + fileName:'File name', remark:'Remark', updateUser:'Update user', updateAt:'Update time', diff --git a/nezha-fronted/src/components/page/config/mibBrowser.vue b/nezha-fronted/src/components/page/config/mibBrowser.vue index abdf4514c..b815e7dc5 100644 --- a/nezha-fronted/src/components/page/config/mibBrowser.vue +++ b/nezha-fronted/src/components/page/config/mibBrowser.vue @@ -620,6 +620,16 @@ document.onmousemove = null; } }, + domResize(){ + let scrollTop=this.$refs['resultTable'].$el.querySelector(".el-table__body-wrapper").scrollTop; + this.showTable=false; + this.$nextTick(()=>{ + this.showTable=true; + this.$nextTick(()=>{ + this.$refs['resultTable'].$el.querySelector(".el-table__body-wrapper").scrollTop=scrollTop + }) + }) + }, exportXlsx() { if (this.resultData.length == 0) { return; @@ -641,20 +651,16 @@ ) } catch (e) {} return out - } + }, }, mounted() { this.getWalkData(); this.getModelData(); this.getAssetData(); - window.onresize=()=>{ - console.log(123123,this); - this.showTable=false; - this.$nextTick(()=>{ - this.showTable=true; - // this.$refs['resultTable'].doLayout(); - }) - } + window.addEventListener('resize',this.domResize); + }, + beforeDestroy(){ + window.removeEventListener('resize',this.domResize); } } From 1aa34010546f6ecd8f139c1b74a7762a85cc4f4e Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 25 Nov 2020 15:43:02 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix=EF=BC=9A=E8=B0=83=E6=95=B4system=20?= =?UTF-8?q?=E5=AD=97=E6=AF=8D=E7=9A=84=E5=A4=A7=E5=B0=8F=E5=86=99=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/language/cn.js | 2 +- .../src/components/common/language/en.js | 22 +++++++++---------- .../src/components/page/config/promServer.vue | 2 +- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/nezha-fronted/src/components/common/language/cn.js b/nezha-fronted/src/components/common/language/cn.js index 3f847ab39..858171ecb 100644 --- a/nezha-fronted/src/components/common/language/cn.js +++ b/nezha-fronted/src/components/common/language/cn.js @@ -742,7 +742,7 @@ const cn = { link: { link:'Link', name: "名称", - url: "URL", + url: "Url", operation: "操作", add: "添加", update: "更新", diff --git a/nezha-fronted/src/components/common/language/en.js b/nezha-fronted/src/components/common/language/en.js index 8b412e7c6..e2c1b37a3 100644 --- a/nezha-fronted/src/components/common/language/en.js +++ b/nezha-fronted/src/components/common/language/en.js @@ -50,7 +50,7 @@ const en = { changePwd:'Change password',//修改密码 createChart:'Create chart', createProject:'Create project', - createEndpoint:'Create Endpoint', + createEndpoint:'Create endpoint', createAsset:'Create asset', createAlertRule:'Create alert rule', createAccount:'Create account', @@ -531,7 +531,7 @@ const en = { lastReply:'Ping last reply', modules: 'Endpoint',//'组件' alerts: 'Alerts',//'告警信息' - dataCenter: 'Data Center',//DC + dataCenter: 'Data center',//DC cabinet: 'Cabinet',//'机柜' model: 'Model',//'型号' vendor: 'Vendor',//'厂商' @@ -707,7 +707,7 @@ const en = { systemName:'System name', curUrl:'Current site URL', timezone:'Timezone', - defaultCabinetUsize:'Cabinet U Size', + defaultCabinetUsize:'Cabinet U size', second:'second', day:'day', maxSeries:'Query max series', @@ -732,7 +732,7 @@ const en = { }, terminal:{ terminal:'Terminal', - terminalNum:'Max Terminal Number' + terminalNum:'Max terminal number' }, ldap:{ ldap:'LDAP', @@ -741,13 +741,13 @@ const en = { pwd:'Password', ou:'User OU', filter:'User filter', - map:'LDAP Field Mapping', - active:'LDAP Authentication' + map:'LDAP field mapping', + active:'LDAP authentication' }, link: { link:'Link', name: "Name", - filePath: "FilePath", + url: "Url", operation: "Operation", add: "Add", update: "Update", @@ -917,8 +917,8 @@ const en = { selTwoNode:'Please select two module', save:'save', cancel:'cancel', - addLine:'Add Line', - editLine:'Edit Line', + addLine:'Add line', + editLine:'Edit line', lineName:'Line Name', width:'thickness', dashes:'dotted line', @@ -927,8 +927,8 @@ const en = { color:'color', chartName:'Name', unit:'Unit', - addModule:'Add Module', - editModule:'Edit Module', + addModule:'Add module', + editModule:'Edit module', edit:'edit', refresh:'refresh', endpoint:'Endpoint', diff --git a/nezha-fronted/src/components/page/config/promServer.vue b/nezha-fronted/src/components/page/config/promServer.vue index 43e57f518..0c9a39627 100644 --- a/nezha-fronted/src/components/page/config/promServer.vue +++ b/nezha-fronted/src/components/page/config/promServer.vue @@ -156,7 +156,7 @@ show: true, width: 80 }, { - label: 'Data Center', + label: this.$t("config.dc.dc"), prop: 'idc', show: true, }, { From bbb8254b97f60c2779d7dede2a6a8c4cd47fafeb Mon Sep 17 00:00:00 2001 From: zhangyu Date: Wed, 25 Nov 2020 16:23:35 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=EF=BC=9A=E4=BF=AE=E6=94=B9alertMessage?= =?UTF-8?q?=20=E5=80=BC=E4=B8=BA=E6=97=B6=E9=97=B4=E7=9A=84=E6=97=B6?= =?UTF-8?q?=E5=80=99=E6=98=BE=E7=A4=BA=E4=B8=8D=E6=AD=A3=E5=B8=B8=E7=9A=84?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/charts/chartDataFormat.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/charts/chartDataFormat.js b/nezha-fronted/src/components/charts/chartDataFormat.js index 8dd99c54b..9185438c2 100644 --- a/nezha-fronted/src/components/charts/chartDataFormat.js +++ b/nezha-fronted/src/components/charts/chartDataFormat.js @@ -414,10 +414,10 @@ function timeCompute(value,unit,dot=0){ } function timeFormat34(value) { - return bus.timeFormate(value, "yyyy-MM-dd hh:mm:ss"); + return bus.timeFormate(parseInt(value), "yyyy-MM-dd hh:mm:ss"); } function timeFormat35(value) { - return bus.timeFormate(value, "MM/dd/yyyy h:mm:ss a"); + return bus.timeFormate(parseInt(value), "MM/dd/yyyy h:mm:ss a"); } //unit转化配置信息 /* From f39b8233d3381d2810ebb53263741c5907432897 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Thu, 26 Nov 2020 09:43:51 +0800 Subject: [PATCH 4/6] =?UTF-8?q?feat=EF=BC=9A=E6=B7=BB=E5=8A=A0=E6=B0=94?= =?UTF-8?q?=E6=B3=A1=20=E4=BB=A5=E5=8F=8A=E5=A4=84=E7=90=86css=E8=A2=AB?= =?UTF-8?q?=E8=A6=86=E7=9B=96=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/bottomBox/tabs/endpointQueryTab.vue | 13 ++++++++----- .../src/components/page/config/mibBrowser.vue | 2 +- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue index 5c3ec9f47..0975d810b 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/endpointQueryTab.vue @@ -3,7 +3,7 @@ text-align: center; margin-top: 16px; } - .nz-table /deep/ .el-table{ + .plTableBox.nz-table /deep/ .el-table{ display: block !important; } @@ -61,7 +61,7 @@
+ @selection-change="selectChange" v-if="tableShow && plTableSHow" :border="true" :tooltip-effect="'light'">