From 196236908e55ce60eda53ea7d7e66f4ffb75b476 Mon Sep 17 00:00:00 2001
From: From-wh <from-wh@hotmail.com>
Date: Thu, 23 Feb 2023 09:40:30 +0800
Subject: [PATCH] =?UTF-8?q?improve:=20=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?/=E6=B5=AE=E7=AA=97=E8=B7=B3=E8=BD=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/components/side-menu/collapsed-menu.vue          | 1 +
 .../components/main/components/side-menu/side-menu.vue    | 8 ++++++--
 template/admin/src/components/main/main.less              | 4 ++--
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/template/admin/src/components/main/components/side-menu/collapsed-menu.vue b/template/admin/src/components/main/components/side-menu/collapsed-menu.vue
index bf3834eda..34a3575cc 100644
--- a/template/admin/src/components/main/components/side-menu/collapsed-menu.vue
+++ b/template/admin/src/components/main/components/side-menu/collapsed-menu.vue
@@ -66,6 +66,7 @@ export default {
   },
   methods: {
     handleClick(name) {
+      console.log(name)
       this.$emit('on-click', name);
     },
     handleMousemove(event, children) {
diff --git a/template/admin/src/components/main/components/side-menu/side-menu.vue b/template/admin/src/components/main/components/side-menu/side-menu.vue
index 5427cf1ff..ccc00545f 100644
--- a/template/admin/src/components/main/components/side-menu/side-menu.vue
+++ b/template/admin/src/components/main/components/side-menu/side-menu.vue
@@ -69,7 +69,7 @@
       <template v-for="item in menuList">
         <collapsed-menu
           v-if="item.children && item.children.length > 0"
-          @on-click="handleSelect"
+          @on-click="collHandleSelect"
           :hide-title="true"
           :activeMenuPath="activeMenuPath"
           :root-icon-size="rootIconSize"
@@ -80,7 +80,7 @@
         ></collapsed-menu>
         <Tooltip transfer v-else :content="item.title" placement="right" :key="`drop-menu-${item.path}`">
           <a
-            @click="handleSelect(item)"
+            @click="collHandleSelect(item)"
             class="drop-menu-a"
             :class="{ on: item.path == activeMenuPath }"
             :style="{ textAlign: 'center' }"
@@ -196,6 +196,7 @@ export default {
         }
       });
     },
+
     handleSelect(name, type) {
       this.childOptions = [];
       this.menuList.map((e) => {
@@ -241,6 +242,9 @@ export default {
     handleChildSelect(name) {
       this.turnToPage(name);
     },
+    collHandleSelect(name) {
+      this.turnToPage(name);
+    },
     turnToPage(route, all) {
       let { path, name, params, query } = {};
       if (typeof route === 'string' && !all) path = route;
diff --git a/template/admin/src/components/main/main.less b/template/admin/src/components/main/main.less
index 438ca38ba..bb4114771 100644
--- a/template/admin/src/components/main/main.less
+++ b/template/admin/src/components/main/main.less
@@ -18,11 +18,11 @@
     line-height: 50px;
   }
   .main-layout-con {
-    height: 100%;
+    height: calc(~"100vh - 60px");
     overflow: hidden;
   }
   .main-content-con {
-    height: ~'calc(100% - 70px)';
+    height: ~'calc(100vh - 60px)';
     overflow: hidden;
   }
   .tag-nav-wrapper {