From 98c87425af199d27b61195a1453b14e1f3fa95ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=8D=E5=81=9A=E7=A0=81=E5=86=9C?= <599854767@qq.com>
Date: Mon, 25 Sep 2023 13:53:20 +0800
Subject: [PATCH] =?UTF-8?q?:bug:fix=E8=8F=9C=E5=8D=95=E7=AE=A1=E7=90=86?=
 =?UTF-8?q?=E5=9B=BE=E6=A0=87=E5=88=97=E6=98=BE=E7=A4=BA=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/system/menu/index.vue | 24 ++++++++++++++----------
 1 file changed, 14 insertions(+), 10 deletions(-)

diff --git a/src/views/system/menu/index.vue b/src/views/system/menu/index.vue
index 210822f..9b9bade 100644
--- a/src/views/system/menu/index.vue
+++ b/src/views/system/menu/index.vue
@@ -45,7 +45,7 @@
     </el-row>
 
     <vxe-table
-      height="600"
+      :height="tableHeight"
       show-overflow
       ref="listRef"
       :loading="loading"
@@ -57,9 +57,12 @@
       :scroll-y="{ enabled: true, gt: 20 }"
       :data="menuList">
       <vxe-column field="menuName" :title="$t('m.menuName')" tree-node width="160"> </vxe-column>
-      <vxe-column field="menuId" :title="$t('m.menuid')"></vxe-column>
-      <vxe-column field="icon" :title="$t('m.icon')" align="center" width="60"> </vxe-column>
-
+      <vxe-column field="menuId" :title="$t('m.menuid')" width="90"></vxe-column>
+      <vxe-column field="icon" :title="$t('m.icon')" align="center" width="60">
+        <template #default="{ row }">
+          <svg-icon :name="row.icon"></svg-icon>
+        </template>
+      </vxe-column>
       <vxe-column field="menuType" :title="$t('m.menuType')" align="center" width="80">
         <template #default="scope">
           <el-tag type="danger" v-if="scope.row.menuType == 'M' && scope.row.isFrame == 1">{{ $t('m.link') }}</el-tag>
@@ -367,6 +370,7 @@ proxy.getDicts(dictParams).then((response) => {
   })
 })
 
+const tableHeight = ref(document.documentElement.scrollHeight - 245 + 'px')
 const { queryParams, form, rules, sys_show_hide, sys_normal_disable } = toRefs(state)
 
 /** 查询菜单列表 */
@@ -540,12 +544,12 @@ function handleChangeSort(info) {
     })
 }
 // ******************自定义编辑 end **********************
-const loadMenu = (row, treeNode, resolve) => {
-  listMenuById(row.menuId).then((res) => {
-    loadNodeMap.set(row.menuId, { row, treeNode, resolve })
-    resolve(res.data)
-  })
-}
+// const loadMenu = (row, treeNode, resolve) => {
+//   listMenuById(row.menuId).then((res) => {
+//     loadNodeMap.set(row.menuId, { row, treeNode, resolve })
+//     resolve(res.data)
+//   })
+// }
 // 刷新懒加载后的数据
 function refreshMenu(pid) {
   loading.value = true