This is an automated email from the ASF dual-hosted git repository.
zhaoqingran pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
The following commit(s) were added to refs/heads/master by this push:
new 81da126bf [bugfix] fix alarm center tags display error (#1938)
81da126bf is described below
commit 81da126bfce20fadadd561da6d7ab5915e51f002
Author: tomsun28 <[email protected]>
AuthorDate: Thu May 9 12:02:58 2024 +0800
[bugfix] fix alarm center tags display error (#1938)
---
.../src/app/routes/alert/alert-center/alert-center.component.html | 2 +-
web-app/src/app/routes/alert/alert-center/alert-center.component.ts | 2 +-
web-app/src/app/routes/setting/tags/tags.component.html | 6 +-----
3 files changed, 3 insertions(+), 7 deletions(-)
diff --git
a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
index 233459cd1..f85a68787 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.html
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.html
@@ -134,7 +134,7 @@
<td nzAlign="left">{{ data.content }}</td>
<td nzAlign="left">
<span *ngFor="let tag of data?.tmp; let i = index">
- <a [routerLink]="['/monitors/' + tag.value]" *ngIf="tag.name ==
'monitorId'">
+ <a [routerLink]="['/monitors/' + tag.tagValue]" *ngIf="tag.name ==
'monitorId'">
<nz-tag class="hoverClass" nzColor="magenta" style="margin-top:
2px">
<span nz-icon nzType="area-chart"></span>
{{ sliceTagName(tag) }}
diff --git
a/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
b/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
index c4c85a8df..46021a40c 100644
--- a/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
+++ b/web-app/src/app/routes/alert/alert-center/alert-center.component.ts
@@ -81,7 +81,7 @@ export class AlertCenterComponent implements OnInit {
Object.keys(item.tags).forEach(name => {
item.tmp.push({
name: name,
- value: item.tags[name]
+ tagValue: item.tags[name]
});
});
}
diff --git a/web-app/src/app/routes/setting/tags/tags.component.html
b/web-app/src/app/routes/setting/tags/tags.component.html
index e681f1446..e4099bab1 100644
--- a/web-app/src/app/routes/setting/tags/tags.component.html
+++ b/web-app/src/app/routes/setting/tags/tags.component.html
@@ -75,7 +75,6 @@
<th nzAlign="center" nzWidth="15%">{{ 'tag' | i18n }}</th>
<th nzAlign="center" nzWidth="15%">{{ 'tag.name' | i18n }}</th>
<th nzAlign="center" nzWidth="15%">{{ 'tag.value' | i18n }}</th>
- <th nzAlign="center" nzWidth="15%">{{ 'tag.color' | i18n }}</th>
<th nzAlign="center" nzWidth="15%">{{ 'tag.description' | i18n }}</th>
<th nzAlign="center" nzWidth="20%">{{ 'tag.update-time' | i18n }}</th>
<th nzAlign="center" nzWidth="17%">{{ 'common.edit' | i18n }}</th>
@@ -86,16 +85,13 @@
<td nzAlign="center" nzLeft [nzChecked]="checkedTagIds.has(data.id)"
(nzCheckedChange)="onItemChecked(data.id, $event)"></td>
<td nzAlign="center">
<a routerLink="/monitors" [queryParams]="{ tag: formatTagName(data) }">
- <nz-tag [nzColor]="data.color" style="font-weight: bold; font-size:
larger" class="hoverClass">
+ <nz-tag [nzColor]="data.color" style="font-weight: bold; font-size:
larger; border-radius: 3px" class="hoverClass">
{{ formatTagName(data) }}
</nz-tag>
</a>
</td>
<td nzAlign="center">{{ data.name }}</td>
<td nzAlign="center">{{ data.tagValue }}</td>
- <td nzAlign="center">
- <nz-tag [nzColor]="data.color" style="font-weight: bold; font-size:
larger">{{ data.color }}</nz-tag>
- </td>
<td nzAlign="center">{{ data.description }}</td>
<td nzAlign="center">{{ data.gmtUpdate | date : 'YYYY-MM-dd HH:mm:ss'
}}</td>
<td nzAlign="center">
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
