From 45ee9e6285641115c0a7af135d58e5a752644411 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 21 Aug 2023 16:02:19 +0800 Subject: [PATCH 01/12] =?UTF-8?q?NEZ-3100=20=20fix=EF=BC=9A=20alert=20mess?= =?UTF-8?q?age=E8=AF=A6=E6=83=85Dashboard=E6=A0=87=E7=AD=BE=E9=A1=B5?= =?UTF-8?q?=EF=BC=8C=E6=96=B0=E5=A2=9E=EF=BC=8C=E7=BC=96=E8=BE=91=EF=BC=8C?= =?UTF-8?q?=E5=88=A0=E9=99=A4=EF=BC=8C=E5=A4=8D=E5=88=B6=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E7=82=B9=E5=87=BB=E6=97=A0=E5=8F=8D=E5=BA=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/alert/alertMessageInfo.scss | 6 ++++++ nezha-fronted/src/components/chart/chartHeader.vue | 2 +- .../src/components/common/alert/alertMessageInfoTab.vue | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss index 41df9bbf0..3aae8f015 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss @@ -64,6 +64,12 @@ height: 100%; padding-bottom: 0; } + .message-info-dashboard { + .nz-chart{ + height: calc(100% - 55px); + padding-bottom: 0; + } + } .alert-message-info-tab { height: 61.8%; flex: 1; diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue index 7d50c6b2f..a95a4202a 100644 --- a/nezha-fronted/src/components/chart/chartHeader.vue +++ b/nezha-fronted/src/components/chart/chartHeader.vue @@ -47,7 +47,7 @@ ({{chartData ? chartData.length : 0}} charts)
-
+
diff --git a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue index 3b2a54ef9..d2093dc63 100644 --- a/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue +++ b/nezha-fronted/src/components/common/alert/alertMessageInfoTab.vue @@ -6,7 +6,7 @@
- +
From 097625ae41ff9cdd5a348441fa435061e05f6e45 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 21 Aug 2023 16:06:54 +0800 Subject: [PATCH 02/12] =?UTF-8?q?NEZ-3099=20fix=EF=BC=9AExplore=E8=BE=93?= =?UTF-8?q?=E5=85=A5=E9=94=99=E8=AF=AF=E8=A1=A8=E8=BE=BE=E5=BC=8F=EF=BC=8C?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E6=8F=90=E7=A4=BA=E6=98=BE=E7=A4=BA=E5=BC=82?= =?UTF-8?q?=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/page/dashboard/explore/exploreItem.vue | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue index b90ac26c1..6a2517609 100644 --- a/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue +++ b/nezha-fronted/src/components/page/dashboard/explore/exploreItem.vue @@ -3953,6 +3953,8 @@ export default { } else { if (response.error) { this.$refs['promql-' + promqlIndex][0].setError(response.error) + } else if(response.msg) { + this.$refs['promql-' + promqlIndex][0].setError(response.msg) } else { this.$refs['promql-' + promqlIndex][0].setError(response) } From bd6aeb2a1ae1f442a1be9e0a6ded26498ee93881 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 21 Aug 2023 16:26:14 +0800 Subject: [PATCH 03/12] =?UTF-8?q?fix=EF=BC=9A=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E5=86=85=E5=AE=B9=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/table/asset/assetMetaTable.vue | 92 ++++++++++++++++--- 1 file changed, 80 insertions(+), 12 deletions(-) diff --git a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue index 2610d1669..668feb43b 100644 --- a/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue +++ b/nezha-fronted/src/components/common/table/asset/assetMetaTable.vue @@ -65,17 +65,17 @@
Disabled
-
  TEXT
-
  MULTITEXT
-
  TEXTAREA
-
  RADI0
-
  CHECKBOX
-
  SELECT
-
  INTEGER
-
  DOUBLE
-
  DATETIME
-
  EMAIL
-
  PASSWORD
+
  {{typeData[0].name}}
+
  {{typeData[1].name}}
+
  {{typeData[1].name}}
+
  {{typeData[2].name}}
+
  {{typeData[3].name}}
+
  {{typeData[4].name}}
+
  {{typeData[5].name}}
+
  {{typeData[6].name}}
+
  {{typeData[7].name}}
+
  {{typeData[8].name}}
+
  {{typeData[9].name}}
{{scope.row[item.prop] || '-'}} @@ -177,7 +177,75 @@ export default { minWidth: 200, show: true } - ] + ], + typeData: [ + { + icon: 'nz-icon nz-icon-text', + disabled: true, + value: 'TEXT', + name: this.$t('config.assetLabel.text') + }, + // { + // icon: 'nz-icon nz-icon-multitext', + // disabled: true, + // value: 'MULTITEXT', + // name: this.$t('config.assetLabel.multitext') + // }, + { + icon: 'nz-icon nz-icon-textarea', + disabled: true, + value: 'TEXTAREA', + name: this.$t('config.assetLabel.textarea') + }, + { + icon: 'nz-icon nz-icon-radio', + disabled: true, + value: 'RADIO', + name: this.$t('config.assetLabel.radio') + }, + { + icon: 'nz-icon nz-icon-checkbox', + disabled: true, + value: 'CHECKBOX', + name: this.$t('config.assetLabel.checkbox') + }, + { + icon: 'nz-icon nz-icon-xialaxuanze', + disabled: true, + value: 'SELECT', + name: this.$t('config.assetLabel.select') + }, + { + icon: 'nz-icon nz-icon-integer', + disabled: true, + value: 'INTEGER', + name: this.$t('config.assetLabel.integer') + }, + { + icon: 'nz-icon nz-icon-double', + disabled: true, + value: 'DOUBLE', + name: this.$t('config.assetLabel.double') + }, + { + icon: 'nz-icon nz-icon-password', + disabled: true, + value: 'PASSWORD', + name: this.$t('login.pin') + }, + { + icon: 'nz-icon nz-icon-dingshishijian', + disabled: true, + value: 'DATETIME', + name: this.$t('config.assetLabel.datetime') + }, + { + icon: 'nz-icon nz-icon-email', + disabled: true, + value: 'EMAIL', + name: this.$t('config.assetLabel.email') + } + ], } }, methods: { From 187eb504312b12aeb28d77a6460d949a93d7df77 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 21 Aug 2023 18:39:04 +0800 Subject: [PATCH 04/12] =?UTF-8?q?NEZ-3101=20style=EF=BC=9A=E6=96=B0?= =?UTF-8?q?=E5=A2=9E=E5=91=8A=E8=AD=A6=E8=A7=84=E5=88=99=EF=BC=8C=E6=9C=89?= =?UTF-8?q?=E6=95=88=E6=97=B6=E9=97=B4=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=E6=9C=89=E9=81=AE=E6=8C=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/components/common/rightBox/alertRuleBox.scss | 3 +++ nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss index 7a09d8fc9..5054982d3 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss @@ -202,4 +202,7 @@ display: inline-block; } } + .el-form-item__error { + padding-top: 0; + } } diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 3f12bc19f..bffbf9bff 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -298,7 +298,7 @@ - + Date: Mon, 21 Aug 2023 18:39:23 +0800 Subject: [PATCH 05/12] =?UTF-8?q?NEZ-3104=20fix=EF=BC=9AAdministrations,Li?= =?UTF-8?q?cense=E4=B8=AD=E4=B8=8A=E4=BC=A0license=20file=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=88=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/config/system/license.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue index 97fa5c8bb..4687da4d3 100644 --- a/nezha-fronted/src/components/page/config/system/license.vue +++ b/nezha-fronted/src/components/page/config/system/license.vue @@ -285,6 +285,7 @@ export default { this.$post('/sys/license/upload', form).then(res => { if (res.code == 200) { this.licenseGetStatus() + this.$message.success(this.$t('overall.success')) } else { this.$message.error(res.msg) } From 9f502d8a71f905302ad65fd76ba47397f011c2f8 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Mon, 21 Aug 2023 18:43:24 +0800 Subject: [PATCH 06/12] =?UTF-8?q?NEZ-3104=20fix=EF=BC=9AAdministrations,Li?= =?UTF-8?q?cense=E4=B8=AD=E4=B8=8A=E4=BC=A0license=20file=E5=90=8E?= =?UTF-8?q?=EF=BC=8C=E6=B2=A1=E6=9C=89=E6=8F=90=E7=A4=BA=E4=B8=8A=E4=BC=A0?= =?UTF-8?q?=E6=88=90=E5=8A=9F=E6=88=96=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/config/system/license.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/config/system/license.vue b/nezha-fronted/src/components/page/config/system/license.vue index 4687da4d3..cbc79df5e 100644 --- a/nezha-fronted/src/components/page/config/system/license.vue +++ b/nezha-fronted/src/components/page/config/system/license.vue @@ -285,7 +285,7 @@ export default { this.$post('/sys/license/upload', form).then(res => { if (res.code == 200) { this.licenseGetStatus() - this.$message.success(this.$t('overall.success')) + this.$message.success(this.$t('overall.result.success')) } else { this.$message.error(res.msg) } From c8d1a241cbff453739e764b60ad4adef1ee4a062 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 09:57:56 +0800 Subject: [PATCH 07/12] =?UTF-8?q?NEZ-3102=20fix=EF=BC=9A=E6=89=80=E6=9C=89?= =?UTF-8?q?=E5=88=97=E8=A1=A8=E9=A1=B5=E9=9D=A2=E6=9B=B4=E5=A4=9A=E6=8C=89?= =?UTF-8?q?=E9=92=AE=E9=A1=BA=E5=BA=8F=E7=BB=9F=E4=B8=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/bottomBox/nzBottomDataList.vue | 8 ++++++-- .../src/components/common/table/alert/alertRuleTable.vue | 2 +- .../src/components/common/table/asset/assetTable.vue | 2 +- .../common/table/settings/dashboardTmplTable.vue | 2 +- .../components/common/table/settings/endpointTable.vue | 2 +- .../src/components/common/table/settings/moduleTable.vue | 2 +- .../src/components/common/table/settings/projectTable.vue | 2 +- 7 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue index 781e11ff8..2a6ba2c6d 100644 --- a/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue +++ b/nezha-fronted/src/components/common/bottomBox/nzBottomDataList.vue @@ -6,8 +6,8 @@
- - + +
{{$t('overall.edit')}} - {{$t('config.system.terminal.terminal')}} {{$t('overall.duplicate')}} {{$t('overall.delete')}} + {{$t('config.system.terminal.terminal')}} {{$t('overall.silenceAlert')}} {{$t('overall.topology')}} {{$t('overall.diagnosis')}} diff --git a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue index fc6437ef4..00a7e4d8f 100644 --- a/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue +++ b/nezha-fronted/src/components/common/table/settings/dashboardTmplTable.vue @@ -65,8 +65,8 @@ {{$t('overall.edit')}} - {{$t('overall.delete')}} {{$t('overall.duplicate')}} + {{$t('overall.delete')}} {{$t('overall.syncChart')}} diff --git a/nezha-fronted/src/components/common/table/settings/endpointTable.vue b/nezha-fronted/src/components/common/table/settings/endpointTable.vue index eae28a065..da2564abc 100644 --- a/nezha-fronted/src/components/common/table/settings/endpointTable.vue +++ b/nezha-fronted/src/components/common/table/settings/endpointTable.vue @@ -182,8 +182,8 @@ {{$t('overall.edit')}} - {{$t('overall.delete')}} {{$t('overall.duplicate')}} + {{$t('overall.delete')}} {{$t('overall.silenceAlert')}} {{$t('overall.topology')}} {{$t('overall.diagnosis')}} diff --git a/nezha-fronted/src/components/common/table/settings/moduleTable.vue b/nezha-fronted/src/components/common/table/settings/moduleTable.vue index 1c1ef5bc6..fd30af3e8 100644 --- a/nezha-fronted/src/components/common/table/settings/moduleTable.vue +++ b/nezha-fronted/src/components/common/table/settings/moduleTable.vue @@ -102,8 +102,8 @@ {{$t('overall.edit')}} - {{$t('overall.delete')}} {{$t('overall.duplicate')}} + {{$t('overall.delete')}} {{$t('overall.syncChart')}} {{$t('overall.silenceAlert')}} {{$t('overall.topology')}} diff --git a/nezha-fronted/src/components/common/table/settings/projectTable.vue b/nezha-fronted/src/components/common/table/settings/projectTable.vue index 4398665df..cda1be998 100644 --- a/nezha-fronted/src/components/common/table/settings/projectTable.vue +++ b/nezha-fronted/src/components/common/table/settings/projectTable.vue @@ -89,8 +89,8 @@ {{$t('overall.edit')}} - {{$t('overall.delete')}} {{$t('overall.duplicate')}} + {{$t('overall.delete')}} {{$t('overall.silenceAlert')}} {{$t('overall.topology')}} From ab2e143456fa2d456931855722f55d56387222b7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 10:21:03 +0800 Subject: [PATCH 08/12] =?UTF-8?q?NEZ-3105=20fix=EF=BC=9Aalert=20message=20?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E9=A1=B5=E9=9D=A2=E6=A0=B7=E5=BC=8F=E9=94=99?= =?UTF-8?q?=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../assets/css/components/common/alert/alertMessageInfo.scss | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss index 3aae8f015..499837744 100644 --- a/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/alert/alertMessageInfo.scss @@ -596,6 +596,11 @@ } } } +#viewGraphDialog { + .el-dialog.is-fullscreen { + overflow: hidden; + } +} From 7c421c813595c36f51c86da29734c301660bc7d5 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 13:40:43 +0800 Subject: [PATCH 09/12] =?UTF-8?q?NEZ-3110=20fix=EF=BC=9Aalert=20message=20?= =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=B8=8D=E6=B7=BB=E5=8A=A0=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=9D=A1=E4=BB=B6=E6=83=85=E5=86=B5=E4=B8=8B=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=BB=93=E6=9E=9C=E4=B8=8D=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/common/bottomBox/tabs/alertMessageTabNew.vue | 4 ++-- nezha-fronted/src/components/page/alert/alertMessage.vue | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue index bcb4b2f41..28c7d3ff3 100644 --- a/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue +++ b/nezha-fronted/src/components/common/bottomBox/tabs/alertMessageTabNew.vue @@ -292,7 +292,7 @@ export default { sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'], legend: [], searchTime: [], - searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())))], + searchTimeHeader: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'], searchTimeSelect: bus.getTimezontDateRange(), currentMsg: {}, chartUnit: 5, @@ -313,7 +313,7 @@ export default { if (this.from === fromRoute.alertSilence) { this.searchMsg = this.searchMsgSilence } - this.renderDefaultParams() + this.$route.query.bottomSelectArr && this.renderDefaultParams() }, methods: { renderDefaultParams () { diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 2b1d83695..3b793749f 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -232,7 +232,7 @@ export default { chartDatas: [], sameLabels: ['instance', 'module', 'project', 'asset', 'endpoint', 'datacenter'], legend: [], - searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 30)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'], + searchTime: [bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime())).setHours(new Date(bus.computeTimezone(new Date().getTime())).getHours() - 24 * 7)), bus.timeFormate(new Date(bus.computeTimezone(new Date().getTime()))), '7d'], searchTimeDialog: [], searchTimeSelect: bus.getTimezontDateRange(), currentMsg: {}, From d3f5f7ba8105b49b8b65ac07a1f4386ff5770c03 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 13:59:29 +0800 Subject: [PATCH 10/12] =?UTF-8?q?NEZ-3106=20=20fix=EF=BC=9ADashboard?= =?UTF-8?q?=E4=B8=AD=E5=88=9B=E5=BB=BA=E5=9B=BE=E8=A1=A8=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E9=80=89=E6=8B=A9bits=E6=97=B6=EF=BC=8C=E5=8D=95=E4=BD=8D?= =?UTF-8?q?=E6=8D=A2=E7=AE=97=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/chart/chartDataFormat.js | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartDataFormat.js b/nezha-fronted/src/components/chart/chartDataFormat.js index 59a9c9aa4..34343948b 100644 --- a/nezha-fronted/src/components/chart/chartDataFormat.js +++ b/nezha-fronted/src/components/chart/chartDataFormat.js @@ -10,7 +10,7 @@ function none (value, index) { if (!numberWithEConvent(scientificNotationValue)) { return scientificNotationValue } - if (isNaN(value) || value=== null) { + if (isNaN(value) || value === null) { return value } return keepDoubleNumber(value) @@ -55,12 +55,19 @@ function localFormat (value, index) { return result } function bits (value, index, type = 1, dot = 0) { + const num = value / 8 + if (value < 8) { + return value + 'b' + } + if (num < 1024) { + return num + 'B' + } if (type == 1) { - return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0) + return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 0) } else if (type == -1) { - return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot) + return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], dot) } else { - return asciiCompute(value, 1024, ['b', 'B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2) + return asciiCompute(num, 1024, ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'], 2) } } function bytes (value, index, type = 1, dot) { From 0aee369e23b296d5a91be6fca7ae6d9bd29942f5 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 14:33:40 +0800 Subject: [PATCH 11/12] =?UTF-8?q?NEZ-3102=20fix=EF=BC=9Achart=20header=20?= =?UTF-8?q?=E6=8C=89=E9=92=AE=E9=A1=BA=E5=BA=8F=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/chart/chartHeader.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/chart/chartHeader.vue b/nezha-fronted/src/components/chart/chartHeader.vue index a95a4202a..41ad9b13f 100644 --- a/nezha-fronted/src/components/chart/chartHeader.vue +++ b/nezha-fronted/src/components/chart/chartHeader.vue @@ -80,13 +80,13 @@ {{$t('overall.edit')}} -
  • - - {{$t('overall.delete')}} -
  • {{$t('overall.duplicate')}} +
    • +
  • + + {{$t('overall.delete')}}
  • From 6433b1f002dda4234f01826e7f5d2ea648a777e0 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Tue, 22 Aug 2023 15:50:18 +0800 Subject: [PATCH 12/12] =?UTF-8?q?NEZ-3103=20fix=EF=BC=9Aweb=20terminal=20l?= =?UTF-8?q?og=20=E8=AF=A6=E7=BB=86=E8=A7=86=E5=9B=BE=E9=A1=B5=E9=9D=A2=20?= =?UTF-8?q?=E5=B7=A6=E4=BE=A7=E5=88=97=E8=A1=A8=E7=BC=BA=E5=B0=91=E9=BC=A0?= =?UTF-8?q?=E6=A0=87=E6=82=AC=E6=B5=AE=E6=98=BE=E7=A4=BA=E8=AF=A6=E6=83=85?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/assets/css/common.scss | 14 +- .../common/alert/terminalLogInfo.vue | 223 ++++++++++++++++++ .../terminalLogDetail/terminalLogDetail.vue | 43 +++- .../common/detailView/nzDetailView.vue | 3 +- .../common/mixin/alertLabelMixin.js | 1 + 5 files changed, 263 insertions(+), 21 deletions(-) create mode 100644 nezha-fronted/src/components/common/alert/terminalLogInfo.vue diff --git a/nezha-fronted/src/assets/css/common.scss b/nezha-fronted/src/assets/css/common.scss index 7764073bf..77aa08277 100644 --- a/nezha-fronted/src/assets/css/common.scss +++ b/nezha-fronted/src/assets/css/common.scss @@ -96,25 +96,25 @@ background-color: $--color-primary !important; } .colorffa416 { - color: #ffa416; + color: #ffa416 !important; } .colorfa901c { - color: $--color-primary; + color: $--color-primary !important; } .colorec7f66 { - color: #ec7f66; + color: #ec7f66 !important; } .color535b64 { - color: #535b64; + color: #535b64 !important; } .color999999 { - color: #999999; + color: #999999 !important; } .color23bf9a { - color: #23bf9a; + color: #23bf9a !important; } .color969dea{ - color: #969dea; + color: #969dea !important; } .bgFFECD9{ background: $--color-primary !important; diff --git a/nezha-fronted/src/components/common/alert/terminalLogInfo.vue b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue new file mode 100644 index 000000000..5ffe7e462 --- /dev/null +++ b/nezha-fronted/src/components/common/alert/terminalLogInfo.vue @@ -0,0 +1,223 @@ + + + + diff --git a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue index c43a3ac85..6546c6d4f 100644 --- a/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue +++ b/nezha-fronted/src/components/common/detailView/list/terminalLogDetail/terminalLogDetail.vue @@ -20,10 +20,12 @@
  • @@ -41,6 +43,26 @@
    • + +
    +
    + +
    +
    +     @@ -50,11 +72,16 @@ import detailViewLeftMixin from '@/components/common/mixin/detailViewLeftMixin' import alertLabel from '@/components/common/alert/alertLabel' import { terminalLog } from '@/components/common/js/constants' import { calcDurationByStringTimeB } from '@/components/common/js/tools' +import alertLabelMixin from '@/components/common/mixin/alertLabelMixin' +import terminalLogInfo from '@/components/common/alert/terminalLogInfo' +import nzTooltip from '@/components/common/alert/nzTooltip' export default { name: 'terminalLogDetail', - mixins: [detailViewLeftMixin], + mixins: [detailViewLeftMixin, alertLabelMixin], components: { - alertLabel + alertLabel, + nzTooltip, + terminalLogInfo }, computed: { getStatusText () { @@ -153,16 +180,6 @@ export default { } }, methods: { - // label 鼠标划入 - labelHover (item, type, loading, e) { - if (e) { - const dom = e.currentTarget - const position = dom.getBoundingClientRect() - this.$set(item, 'position', position) - } - this.$set(item, 'loading', loading) - // this.$set(this.tableData,index,item);// 调用父组件 - } } } diff --git a/nezha-fronted/src/components/common/detailView/nzDetailView.vue b/nezha-fronted/src/components/common/detailView/nzDetailView.vue index 3e74d1bab..b6ac26b3b 100644 --- a/nezha-fronted/src/components/common/detailView/nzDetailView.vue +++ b/nezha-fronted/src/components/common/detailView/nzDetailView.vue @@ -107,7 +107,7 @@ import deleteButton from '@/components/common/deleteButton' import diagnosisTab from '@/components/common/diagnosisTab' import configSync from '@/components/common/configSync' export default { - name: 'nzDataList', + name: 'nzDetailView', components: { detailViewRight, panelChart, @@ -181,6 +181,7 @@ export default { return { fromRoute: fromRoute, /* 二级页面相关 */ + api: '', bottomBox: { object: {}, mainResizeShow: true, // dom高度改变时是否展示|隐藏 diff --git a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js index f89311fff..c9bf1f3b6 100644 --- a/nezha-fronted/src/components/common/mixin/alertLabelMixin.js +++ b/nezha-fronted/src/components/common/mixin/alertLabelMixin.js @@ -64,6 +64,7 @@ export default { case 'recordRule': case 'response': case 'params': + case 'other': return false default: return true }