From 2eb346e4c86dbea5822c8df726e310b1f876d923 Mon Sep 17 00:00:00 2001
From: zhujiyan <17812234322@163.com>
Date: Tue, 27 Aug 2024 16:38:26 +0800
Subject: [PATCH] =?UTF-8?q?=E9=AB=98=E5=BA=A6=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/layouts/components/Main/index.vue |  2 +-
 frontend/src/views/home/index.vue              |  7 ++++---
 frontend/src/views/home/tabs/dashboard.vue     |  2 +-
 frontend/src/views/home/tabs/model.vue         | 10 +++++-----
 frontend/src/views/plan/planList/index.vue     |  2 +-
 5 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/frontend/src/layouts/components/Main/index.vue b/frontend/src/layouts/components/Main/index.vue
index baf9c96..20185ab 100644
--- a/frontend/src/layouts/components/Main/index.vue
+++ b/frontend/src/layouts/components/Main/index.vue
@@ -2,7 +2,7 @@
   <Maximize v-show="maximize" />
   <Tabs v-if="tabs && showMenuFlag" />
   <el-main>
-    <router-view v-slot="{ Component, route }" style="height: calc(100vh - 157px);overflow-y:auto; overflow-x:hidden;">
+    <router-view v-slot="{ Component, route }" style="height: calc(100vh - 157px);overflow-y:auto; overflow-x:hidden;" :style='{height:showMenuFlag?"calc(100vh - 157px)":" calc(100vh - 120px)"}'>
       <transition appear name="fade-transform" mode="out-in">
         <keep-alive :include="keepAliveName">
           <component
diff --git a/frontend/src/views/home/index.vue b/frontend/src/views/home/index.vue
index c141ba2..bd1195e 100644
--- a/frontend/src/views/home/index.vue
+++ b/frontend/src/views/home/index.vue
@@ -1,8 +1,9 @@
 <template>
-  <div class="home">
+      <div class="homeView" style=" height: calc(100vh - 120px) !important;">
     <model v-if="!authStore.showMenuFlag"></model>
     <dashboard v-if="authStore.showMenuFlag"></dashboard>
   </div>
+
   <!-- <div class="main">
     <div class="main_container">
       <div class="mode" v-for="(item, index) in modeList" :key="index">
@@ -79,8 +80,8 @@ onMounted(() => {
 });
 </script>
 <style lang="scss" scoped>
-.home{
+.homeView{
   width: 100%;
-  height: 100%;
+  height: calc(100vh - 120px);
 }
 </style>
diff --git a/frontend/src/views/home/tabs/dashboard.vue b/frontend/src/views/home/tabs/dashboard.vue
index 27ba439..30032a2 100644
--- a/frontend/src/views/home/tabs/dashboard.vue
+++ b/frontend/src/views/home/tabs/dashboard.vue
@@ -417,7 +417,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .static {
   width: 100%;
-  height: calc(100vh - 120px);
+  height: calc(100vh - 165px);
   display: flex;
   justify-content: space-between;
   background-color: #eee;
diff --git a/frontend/src/views/home/tabs/model.vue b/frontend/src/views/home/tabs/model.vue
index 08b729b..cab0fb3 100644
--- a/frontend/src/views/home/tabs/model.vue
+++ b/frontend/src/views/home/tabs/model.vue
@@ -5,8 +5,8 @@
       class="main_container"
       :style="{
         height: authStore.showMenuFlag
-          ? 'calc(100vh - 120px)'
-          : 'calc(100vh - 80px)',
+          ? 'calc(100vh - 165px)'
+          : 'calc(100vh - 125px)',
       }"
     >
       <div class="mode" v-for="(item, index) in modeList" :key="index">
@@ -82,7 +82,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .main_container {
   width: 100%;
-  height: calc(100vh - 120px);
+  height: calc(100vh - 165px);
   // overflow-y: auto;
   display: flex;
   justify-content: space-between;
@@ -94,7 +94,7 @@ onMounted(() => {
     //   height: 100%;
     flex: none;
     width: 32.5%;
-    height: 100%;
+    height: 100% !important;
     border: 1px solid #eee;
     display: flex;
     flex-direction: column;
@@ -102,7 +102,7 @@ onMounted(() => {
     // justify-content: space-around;
     background: #fff;
     border-radius: 6px;
-    margin-bottom: 20px;
+    // margin-bottom: 20px;
     background: linear-gradient(
       180deg,
       rgba(0, 153, 255, 1) 0%,
diff --git a/frontend/src/views/plan/planList/index.vue b/frontend/src/views/plan/planList/index.vue
index 9255ca3..6dde125 100644
--- a/frontend/src/views/plan/planList/index.vue
+++ b/frontend/src/views/plan/planList/index.vue
@@ -447,7 +447,7 @@ onMounted(() => {
 <style lang="scss" scoped>
 .planList {
   width: 100%;
-  height: calc(100vh - 120px);
+  height: calc(100vh - 165px);
 }
 ::v-deep .el-select {
   width: 150px !important;