From eb7e63a212a24ff543f872103d3ae6f7e272a8eb Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 14:01:06 +0800 Subject: [PATCH 01/31] =?UTF-8?q?NEZ-2772=20=20style=EF=BC=9A=20project=20?= =?UTF-8?q?topology=20=E4=B8=AD=20module=20info=20=E5=B1=95=E7=A4=BA?= =?UTF-8?q?=E5=BC=82=E5=B8=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../css/components/common/project/L5/popData/common.scss | 5 +++++ nezha-fronted/src/components/common/project/popData/Info.vue | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss index 92260b40b..f5e2d6e05 100644 --- a/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss +++ b/nezha-fronted/src/assets/css/components/common/project/L5/popData/common.scss @@ -143,6 +143,7 @@ width: 120px; display: inline-block; padding: 3px 0; + vertical-align: middle; } .content-text { width: 175px; @@ -150,6 +151,10 @@ font-size: 12px; display: inline-block; padding: 3px 5px; + vertical-align: middle; + overflow:hidden; + text-overflow:ellipsis; + white-space:nowrap } .module-type { border: 1px solid #DCDCDC; diff --git a/nezha-fronted/src/components/common/project/popData/Info.vue b/nezha-fronted/src/components/common/project/popData/Info.vue index 5c2a24eaa..60fcd2738 100644 --- a/nezha-fronted/src/components/common/project/popData/Info.vue +++ b/nezha-fronted/src/components/common/project/popData/Info.vue @@ -38,7 +38,7 @@
{{ $t('overall.remark') }} - {{moduleInfo.remark?moduleInfo.remark:'--'}} + {{moduleInfo.remark?moduleInfo.remark:'--'}}
From c786269c3948a9cfa229827dadc0be71a72a9b1d Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 14:54:18 +0800 Subject: [PATCH 02/31] =?UTF-8?q?NEZ-2771=20=20fix=EF=BC=9AAlert=20Rule=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E6=8F=90=E7=A4=BA&?= =?UTF-8?q?=E5=9B=BD=E9=99=85=E5=8C=96=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/rightBox/alertRuleBox.scss | 4 +++ .../common/rightBox/alertRuleBox.vue | 25 ++++++++++++++++++- 2 files changed, 28 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 e7c1015e4..2950bb2ab 100644 --- a/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss +++ b/nezha-fronted/src/assets/css/components/common/rightBox/alertRuleBox.scss @@ -31,6 +31,10 @@ .right-box-alert-rule .right-box__container .el-form-item__content .el-input-group--prepend { width: 100%; } + .right-box__container .el-form-item__content .input-box .el-textarea .el-input__count { + right: 6px; + + } .rich-text-editor { line-height: 24px; diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 8032a1a5b..80da14039 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -89,9 +89,10 @@
{{$t('alert.config.when')}} Result - +
+ {{$t('alert.config.enterRegular')}} @@ -354,6 +355,16 @@ export default { richTextEditor }, mixins: [editRigthBox, promqlInputMixin], + computed: { + filterOperators () { + console.log(this.editAlertRule.type) + if (this.editAlertRule.type != 3) { + return this.operators.filter(item => item.value !== '=~') + } else { + return this.operators.filter(item => item.value == '=~') + } + } + }, data () { const nzOid = (rule, value, callback) => { if (this.editAlertRule.type === 3) { @@ -624,6 +635,12 @@ export default { this.$nextTick(() => { this.showSnmpTrap = true }) + // type为1时 不能输入正则 + this.editAlertRule.condition.forEach((item, index) => { + item.operator = '>' + item.value = '' + this.$refs.alertRuleForm.clearValidate('condition.' + index + '.value') // 移除from表单的 condition 验证 + }) } else if (val === 2) { this.showMetrics = false this.expressions = [''] @@ -633,6 +650,12 @@ export default { this.showSnmpTrap = true }) this.$refs.alertRuleForm.clearValidate('expr') // 移除from表单的 expr 验证 + // type为2时 不能输入正则 + this.editAlertRule.condition.forEach((item, index) => { + item.operator = '>' + item.value = '' + this.$refs.alertRuleForm.clearValidate('condition.' + index + '.value') // 移除from表单的 condition 验证 + }) } else if (val === 3) { this.showSnmpTrap = false // showSnmpTrap 为 false 时,展示 OID this.showMetrics = false From e314d978acc7cbec365bdc441113bb5e9451a200 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 14:56:05 +0800 Subject: [PATCH 03/31] =?UTF-8?q?NEZ-2774=20fix=EF=BC=9A=20project=20topol?= =?UTF-8?q?ogy=20=E4=B8=AD=E5=9B=BE=E8=A1=A8=E9=A2=84=E8=A7=88=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/common/project/meta2d/meta2dMain.vue | 1 + .../src/components/common/project/meta2d/meta2dTooltip.vue | 2 ++ 2 files changed, 3 insertions(+) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue index 269d99725..4a9c52b6f 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dMain.vue @@ -69,6 +69,7 @@ > diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue index 26b9d2f23..daba91369 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue @@ -25,6 +25,7 @@ export default { name: 'meta2dTooltip', props: { params: {}, + meta2dId: {} }, mixins: [topoUtil], computed: { @@ -51,6 +52,7 @@ export default { return } this.chartInfo.type = this.params.chartType || 'line' + this.chartInfo.id = this.meta2dId + 'meta2DTooltip' const chartData = [] const elements = [] const obj = {} From 87d776a99d9b3d2112c5beffe0000f5111857bec Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 15:13:26 +0800 Subject: [PATCH 04/31] =?UTF-8?q?style=EF=BC=9A=20project=20topology=20=20?= =?UTF-8?q?text=20legend=20=E4=B8=8B=E6=8B=89=E8=BF=87=E9=95=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/project/meta2d/meta2dElement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 8efa8a93b..19fc6bfc1 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -443,12 +443,12 @@
- +
- +
From b17d7fc3021ef8834d810b67b37d292ddfd425c7 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 15:53:31 +0800 Subject: [PATCH 05/31] =?UTF-8?q?fix:=20=E5=A4=84=E7=90=86topology?= =?UTF-8?q?=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4=E5=8F=96=E5=80=BC=E9=94=99?= =?UTF-8?q?=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/project/meta2d/js/meta2dMain.js | 6 +++--- .../src/components/common/project/meta2d/js/topoUtil.js | 3 ++- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js index fa1f5309b..fe4bac451 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -438,9 +438,9 @@ export default { } }, beforeEdit () { - const endTime = new Date().getTime() - const startTime = endTime - 60 * this.params.timeType * 1000 - this.getQueryValues(this.querysArray, startTime, endTime) + // const endTime = new Date().getTime() + // const startTime = endTime - 60 * this.params.timeType * 1000 + // this.getQueryValues(this.querysArray, startTime, endTime) this.editFlag = true this.contextmenu = { left: null, diff --git a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js index cf7c06035..904ac8b35 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/topoUtil.js @@ -11,7 +11,7 @@ export default { }, initEdit (id) { const endTime = new Date().getTime() - const startTime = endTime - 60 * this.params.timeType * 1000 + const startTime = endTime - 60 * getTopology(id).data().timeType * 1000 const elements = getTopology(id).data().elements || [] this.getQueryValues(elements, startTime, endTime) bus.$emit('changeSelectPens', []) @@ -30,6 +30,7 @@ export default { getTopology(this.meta2dId)._setValue(node) }, getQueryValues (elements, startTime, endTime) { + console.log(elements) this.meta2dLoading = true return new Promise(resolve => { const step = bus.getStep(startTime, endTime) From a698efb75768ed1be424836dd9f70d4eea4769bd Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 15:58:35 +0800 Subject: [PATCH 06/31] =?UTF-8?q?fix=EF=BC=9A=20=E4=BF=AE=E6=94=B9=20toolt?= =?UTF-8?q?ip=20chartData=E4=B8=BA=E7=A9=BA=20=E4=B8=80=E7=9B=B4loading?= =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/project/meta2d/meta2dTooltip.vue | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue index daba91369..8ec16db4e 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dTooltip.vue @@ -81,7 +81,8 @@ export default { elements.push(element) } }) - if (chartData.length && this.$refs.panelChart) { + console.log(chartData) + if (chartData && this.$refs.panelChart) { this.chartInfo.elements = elements this.$refs.panelChart.chartData = chartData this.$refs.panelChart.loading = false From 1da0dc8757056ad08f908f83b26ec73e457d96d1 Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 16:29:40 +0800 Subject: [PATCH 07/31] =?UTF-8?q?NEZ-2775=20fix=EF=BC=9A=20Alert=20Message?= =?UTF-8?q?=20=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2=E6=8E=A5=E5=8F=A3=20sta?= =?UTF-8?q?te=20=E5=8F=82=E6=95=B0=E5=80=BC=E4=B8=8D=E7=AC=A6=E5=90=88?= =?UTF-8?q?=E9=A2=84=E6=9C=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- nezha-fronted/src/components/page/alert/alertMessage.vue | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nezha-fronted/src/components/page/alert/alertMessage.vue b/nezha-fronted/src/components/page/alert/alertMessage.vue index 0a1ec7f2c..0ae72a0d4 100644 --- a/nezha-fronted/src/components/page/alert/alertMessage.vue +++ b/nezha-fronted/src/components/page/alert/alertMessage.vue @@ -18,7 +18,7 @@ - + @@ -869,6 +869,9 @@ export default { }) } }, + dataChange () { + this.getTableData() + }, getTableData (state) { if (state) { this.state = state From 7db4481c58e0210f2618f080b6ae44401ff037de Mon Sep 17 00:00:00 2001 From: zhangyu Date: Fri, 14 Apr 2023 17:18:44 +0800 Subject: [PATCH 08/31] =?UTF-8?q?fix=EF=BC=9A=E5=9B=BD=E9=99=85=E5=8C=96?= =?UTF-8?q?=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/components/common/project/meta2d/meta2dElement.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 19fc6bfc1..49967f396 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -314,7 +314,7 @@
- {{$t('水平反转')}} + {{$t('project.topology.flipX')}}
- {{$t('垂直反转')}} + {{$t('project.topology.flipY')}}
Date: Mon, 17 Apr 2023 11:29:53 +0800 Subject: [PATCH 09/31] =?UTF-8?q?NEZ-2777=20=20fix=EF=BC=9AAlert=20rule=20?= =?UTF-8?q?=E6=96=B0=E5=A2=9E=E9=A1=B5=E9=9D=A2=20=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/assets/css/components/common/project/meta2dMain.scss | 2 +- .../src/assets/css/components/common/project/topology.scss | 2 +- nezha-fronted/src/components/common/rightBox/alertRuleBox.vue | 1 - nezha-fronted/src/components/common/table/nzDataList.vue | 4 ++-- 4 files changed, 4 insertions(+), 5 deletions(-) diff --git a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss index ef2b03d28..fad5a0be0 100644 --- a/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss +++ b/nezha-fronted/src/assets/css/components/common/project/meta2dMain.scss @@ -222,7 +222,7 @@ position: absolute; right: 0; top: 50px; - z-index: 1; + z-index: 11; } .facade-top{ diff --git a/nezha-fronted/src/assets/css/components/common/project/topology.scss b/nezha-fronted/src/assets/css/components/common/project/topology.scss index 8a5cf8b34..a2c9ce50a 100644 --- a/nezha-fronted/src/assets/css/components/common/project/topology.scss +++ b/nezha-fronted/src/assets/css/components/common/project/topology.scss @@ -195,7 +195,7 @@ position: absolute; right: 0; top: 50px; - z-index: 1; + z-index: 11; } .facade-top{ diff --git a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue index 80da14039..5225263b6 100644 --- a/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue +++ b/nezha-fronted/src/components/common/rightBox/alertRuleBox.vue @@ -92,7 +92,6 @@
- {{$t('alert.config.enterRegular')}}
diff --git a/nezha-fronted/src/components/common/table/nzDataList.vue b/nezha-fronted/src/components/common/table/nzDataList.vue index 38d042bc1..690b28ef7 100644 --- a/nezha-fronted/src/components/common/table/nzDataList.vue +++ b/nezha-fronted/src/components/common/table/nzDataList.vue @@ -11,8 +11,8 @@
- - + +