From b0d9ebdb5b57de6733a95fefca95eaad630b046b Mon Sep 17 00:00:00 2001 From: danshihao Date: Fri, 26 Jan 2024 14:39:17 +0800 Subject: [PATCH] fix 80320 --- src/views/dashboard/Analysis.vue | 18 +++--------------- src/views/dashboard/modules/FriendLinkCard.vue | 6 ------ .../dashboard/modules/SearchAndWarningCard.vue | 8 +------- 3 files changed, 4 insertions(+), 28 deletions(-) diff --git a/src/views/dashboard/Analysis.vue b/src/views/dashboard/Analysis.vue index d2256898..7b90960e 100644 --- a/src/views/dashboard/Analysis.vue +++ b/src/views/dashboard/Analysis.vue @@ -30,7 +30,7 @@ export default { .all-wrapper { display: flex; flex-direction: column; - height: calc(100vh - 116px); + height: calc(100vh - 83px); flex-wrap: wrap; } .flex-item { @@ -39,7 +39,7 @@ export default { // 检索和预警 .search-warning-wrapper { width: calc(70% - 20px); - height: calc(80% - 20px); + height: calc(100% - 20px - 162px); } // 快捷入口 .quick-enter-wrapper { @@ -49,7 +49,7 @@ export default { // 友情链接 .friend-link-wrapper { width: calc(70% - 20px); - height: calc(20% - 20px); + height: 142px; } // 待办任务 .to-do-task-wrapper { @@ -93,18 +93,6 @@ export default { } // 1366屏幕 @media screen and (max-width: 1366px) { - .all-wrapper { - height: calc(100vh - 78px); - } - // 检索和预警 - .search-warning-wrapper { - height: calc(74% - 20px); - } - // 友情链接 - .friend-link-wrapper { - height: calc(26% - 20px); - } - /deep/ .top-wrapper { .left-p { font-size: 16px; diff --git a/src/views/dashboard/modules/FriendLinkCard.vue b/src/views/dashboard/modules/FriendLinkCard.vue index 8dc201e1..44685d85 100644 --- a/src/views/dashboard/modules/FriendLinkCard.vue +++ b/src/views/dashboard/modules/FriendLinkCard.vue @@ -83,10 +83,4 @@ export default { background-image: url('../../../assets/image/dashboardLinkBack.png'); cursor: pointer; } -@media screen and (max-width: 1366px) { - .content-div { - height: 40px; - line-height: 40px; - } -} diff --git a/src/views/dashboard/modules/SearchAndWarningCard.vue b/src/views/dashboard/modules/SearchAndWarningCard.vue index 563e44c8..1fe917e8 100644 --- a/src/views/dashboard/modules/SearchAndWarningCard.vue +++ b/src/views/dashboard/modules/SearchAndWarningCard.vue @@ -283,12 +283,6 @@ export default { } // 通过媒体查询覆盖表格高度 .table /deep/ .ant-table-scroll .ant-table-body { - max-height: calc(70vh - 250px) !important; -} - -@media screen and (max-width: 1366px) { - .table /deep/ .ant-table-scroll .ant-table-body { - max-height: calc(70vh - 280px) !important; - } + max-height: calc(100vh - 20px - 162px - 310px) !important; }