From fc659e6be6caada06d4b990c903b73272b36195a Mon Sep 17 00:00:00 2001
From: GGJ <357021191@qq.com>
Date: Tue, 27 Aug 2024 16:17:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E5=BA=95=E9=83=A8?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/layouts/LayoutTransverse/index.vue    |  6 ++---
 .../src/layouts/components/Footer/index.scss  |  4 ++-
 .../src/layouts/components/Footer/index.vue   | 27 +++++++++++++++++--
 .../src/layouts/components/Main/index.vue     |  5 ++--
 4 files changed, 33 insertions(+), 9 deletions(-)

diff --git a/frontend/src/layouts/LayoutTransverse/index.vue b/frontend/src/layouts/LayoutTransverse/index.vue
index 7f975d1..ed49c78 100644
--- a/frontend/src/layouts/LayoutTransverse/index.vue
+++ b/frontend/src/layouts/LayoutTransverse/index.vue
@@ -44,10 +44,8 @@
       </el-menu>
       <ToolBarRight />
     </el-header>
-    <Main class="111" style="height: calc(100vh - 150px);overflow-y:auto; overflow-x:hidden;"/>
-    <!-- <div>
-      123
-    </div> -->
+    <Main />
+
   </el-container>
 </template>
 
diff --git a/frontend/src/layouts/components/Footer/index.scss b/frontend/src/layouts/components/Footer/index.scss
index 912823c..28e3a66 100644
--- a/frontend/src/layouts/components/Footer/index.scss
+++ b/frontend/src/layouts/components/Footer/index.scss
@@ -1,5 +1,5 @@
 .footer {
-  height: 30px;
+  height: 40px;
   background-color: var(--el-bg-color);
   border-top: 1px solid var(--el-border-color-light);
   a {
@@ -8,4 +8,6 @@
     text-decoration: none;
     letter-spacing: 0.5px;
   }
+
+
 }
diff --git a/frontend/src/layouts/components/Footer/index.vue b/frontend/src/layouts/components/Footer/index.vue
index e13a7d9..7f73907 100644
--- a/frontend/src/layouts/components/Footer/index.vue
+++ b/frontend/src/layouts/components/Footer/index.vue
@@ -1,9 +1,32 @@
 <template>
-  <div class="footer flx-center">
-    <a href="http://www.shining-electric.com/" target="_blank"> 2024 © 南京灿能电力自动化股份有限公司 </a>
+  <div class="footer flx-align-center pl10">
+    <el-dropdown>
+    <!-- <span class="el-dropdown-link">
+      {{ title }}
+      <el-icon class="el-icon--right">
+        <arrow-down />
+      </el-icon>
+    </span> -->
+    <el-button type="primary">
+       {{ title }}<el-icon class="el-icon--right"><arrow-down /></el-icon>
+      </el-button>
+    <template #dropdown>
+      <el-dropdown-menu>
+        <el-dropdown-item @click="title='模拟式模式'">模拟式模式</el-dropdown-item>
+        <el-dropdown-item @click="title='数字式模式'">数字式模式</el-dropdown-item>
+        <el-dropdown-item @click="title='对比式模式'">对比式模式</el-dropdown-item>
+       
+      </el-dropdown-menu>
+    </template>
+  </el-dropdown>
+    <!-- <a href="http://www.shining-electric.com/" target="_blank"> 2024 © 南京灿能电力自动化股份有限公司 </a> -->
   </div>
 </template>
+<script lang="ts" setup>
+import { ref, reactive, computed } from "vue";
+const title=ref('模拟式模式')
 
+</script>
 <style scoped lang="scss">
 @import "./index.scss";
 </style>
diff --git a/frontend/src/layouts/components/Main/index.vue b/frontend/src/layouts/components/Main/index.vue
index 7f1f7ef..baf9c96 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 }" >
+    <router-view v-slot="{ Component, route }" style="height: calc(100vh - 157px);overflow-y:auto; overflow-x:hidden;">
       <transition appear name="fade-transform" mode="out-in">
         <keep-alive :include="keepAliveName">
           <component
@@ -14,7 +14,8 @@
       </transition>
     </router-view>
   </el-main>
-  <el-footer v-show="footer">
+  <el-footer >
+    <!-- v-show="footer" -->
     <Footer />
   </el-footer>
 </template>