diff --git a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss index 42072090f..3401ad5e1 100644 --- a/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss +++ b/nezha-fronted/src/assets/css/components/common/globalSearch/searchItemInfo.scss @@ -111,3 +111,11 @@ border-bottom: none; } } +.alert-label-value-prioity { + display: inline-block; + text-align: center; + padding: 2px 5px; + border-radius: 2px; + margin-right: 5px; + width: 80px +} diff --git a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue index f877ca8cf..4611b63ac 100644 --- a/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue +++ b/nezha-fronted/src/components/common/alert/alertRuleInfo2.vue @@ -43,9 +43,8 @@
{{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}} diff --git a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue index 15e0fd33f..d09b3c9eb 100644 --- a/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue +++ b/nezha-fronted/src/components/common/globalSearch/searchItemInfo.vue @@ -70,9 +70,8 @@
{{priority.name}} {{position.operator || '>'}} {{priority.value || '-'}} 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 ee7b048fe..9aa23576e 100644 --- a/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js +++ b/nezha-fronted/src/components/common/project/meta2d/js/meta2dMain.js @@ -213,7 +213,7 @@ export default { pen.visible = pen.visible || true pen.isNz = true pen.locked = pen.locked || 0 - pen.isBottom = false + pen.isBottom = true if (pen.rect) { pen.x = pen.rect.x pen.y = pen.rect.y @@ -284,7 +284,7 @@ export default { pen.isNz = pen.isNz || true pen.visible = pen.visible || true pen.locked = pen.locked || 0 - pen.isBottom = false + pen.isBottom = true pen.autoPlay = false }, pensActive (pens, e) { // 选中节点 diff --git a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue index 3b333d3a4..1f20f0eb7 100644 --- a/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue +++ b/nezha-fronted/src/components/common/project/meta2d/meta2dElement.vue @@ -964,7 +964,7 @@ -
+
{{$t('project.topology.tooltip')}} {{$t('project.topology.legends')}}
-
+
@@ -1030,6 +1030,7 @@
+
{{$t('overall.addTooltipLegend')}} @@ -1328,6 +1329,9 @@ export default { alias: '' }) }, + removeTooltipLegend (index) { + this.pen.data.tooltip.legends.splice(index, 1) + }, nzColorUpdate () { this.refsArr.forEach(item => { if (this.$refs[item]) {