diff --git a/src/assets/imgs/dashboard1.png b/src/assets/imgs/dashboard1.png new file mode 100644 index 00000000..1e6eb88f Binary files /dev/null and b/src/assets/imgs/dashboard1.png differ diff --git a/src/assets/imgs/dashboard2.png b/src/assets/imgs/dashboard2.png new file mode 100644 index 00000000..11307654 Binary files /dev/null and b/src/assets/imgs/dashboard2.png differ diff --git a/src/views/report/dashboardPage/dashboard1/index.vue b/src/views/report/dashboardPage/dashboard1/index.vue index 509f05c9..56099e1c 100644 --- a/src/views/report/dashboardPage/dashboard1/index.vue +++ b/src/views/report/dashboardPage/dashboard1/index.vue @@ -304,11 +304,11 @@ main { } .top-card { - top: 6%; + top: 5%; } .bottom-card { - bottom: 5%; + bottom: 4%; } .device-header { @@ -357,7 +357,8 @@ main { } .device-body { - height: 100px; /* 固定高度,内容不足留白,内容多则滚动 */ + min-height: 60px; /* 固定高度,内容不足留白,内容多则滚动 */ + height: 7vh; padding-right: 4px; /* 防止滚动条遮挡内容 */ overflow-y: auto; /* 启用垂直滚动 */ font-size: 12px; @@ -404,7 +405,7 @@ main { .dashboard-center-image { max-width: 100%; - max-height: 100%; + max-height: 75%; object-fit: contain; }