Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bugfix update dashboard alerts cards height not consist #1087

Merged
merged 5 commits into from
Jul 11, 2023
Merged

bugfix update dashboard alerts cards height not consist #1087

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5dab52a
bugfix update dashboard alerts cards height not consist
tomsun28 Jul 9, 2023
51efa2e
bugfix update dashboard alerts cards height not consist
tomsun28 Jul 9, 2023
ac5fdb6
bugfix update dashboard alerts cards height not consist
tomsun28 Jul 9, 2023
f59761d
bugfix update dashboard alerts cards height not consist
tomsun28 Jul 9, 2023
3f394d4
Merge remote-tracking branch 'origin/dashborad-ui-alert' into dashbor…
tomsun28 Jul 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions web-app/src/app/routes/dashboard/dashboard.component.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,9 +111,9 @@
style="width: 100%; height: 400px; margin-top: 1%"
></div>

<div nz-row nzGutter="16" style="margin-top: 25px">
<div nz-col nzXs="24" nzSm="24" nzMd="12" class="mb-md">
<nz-card nzHoverable [nzTitle]="alertCardTitleTemplate" [nzExtra]="extraTemplate">
<div nz-row nzGutter="16" style="margin-top: 25px; height: 320px">
<div nz-col nzXs="24" nzSm="24" nzMd="12" class="mb-md" style="height: 100%">
<nz-card nzHoverable [nzTitle]="alertCardTitleTemplate" [nzExtra]="extraTemplate" style="height: inherit; overflow-y: scroll">
<nz-timeline nzMode="left">
<nz-timeline-item
*ngFor="let alert of alerts; let i = index"
Expand All @@ -139,27 +139,27 @@
</nz-timeline>
</nz-card>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="7" class="mb-md">
<div nz-col nzXs="24" nzSm="12" nzMd="7" class="mb-md" style="height: 100%">
<div
echarts
[options]="alertsEChartOption"
theme="default"
[autoResize]="true"
[loading]="alertsLoading"
(chartInit)="onAlertNumChartInit($event)"
style="width: 100%; height: 300px; padding-left: 30px"
style="width: 100%; height: inherit; padding-left: 30px"
class="ant-card ant-card-bordered ant-card-hoverable"
></div>
</div>
<div nz-col nzXs="24" nzSm="12" nzMd="5" class="mb-md">
<div nz-col nzXs="24" nzSm="12" nzMd="5" class="mb-md" style="height: 100%">
<div
echarts
[options]="alertsDealEChartOption"
theme="default"
[autoResize]="true"
[loading]="alertsDealLoading"
(chartInit)="onAlertRateChartInit($event)"
style="width: 100%; height: 300px"
style="width: 100%; height: inherit"
class="ant-card ant-card-bordered ant-card-hoverable"
></div>
</div>
Expand Down