From 3c529b79ae550703234c5f497a48e9798995c4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E7=A8=9A=E5=B1=BF?= <1491182878@qq.com>
Date: Wed, 29 Sep 2021 13:12:49 +0000
Subject: [PATCH] =?UTF-8?q?=E8=A1=A8=E6=A0=BC=E9=AB=98=E5=BA=A6=E6=9C=80?=
 =?UTF-8?q?=E5=A4=A7=E5=8C=96=E8=87=AA=E9=80=82=E5=BA=94=20=E7=94=B1?=
 =?UTF-8?q?=E4=BA=8E=E6=8B=85=E5=BF=83=E5=BC=95=E8=B5=B7=E4=BB=A3=E7=A0=81?=
 =?UTF-8?q?=E5=86=B2=E7=AA=81=EF=BC=8C=E5=B0=B1=E6=9A=82=E6=97=B6=E5=8F=AA?=
 =?UTF-8?q?=E5=86=99=E4=BA=86=E7=94=A8=E6=88=B7=E9=A1=B5=E9=9D=A2=E3=80=82?=
 =?UTF-8?q?=E5=A6=82=E6=9C=89=E9=9C=80=E8=A6=81=EF=BC=8C=E5=85=B6=E4=BB=96?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2=E4=BB=A5=E5=8F=8A=E4=BB=A3=E7=A0=81=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=8F=AF=E4=BB=A5=E6=A0=B9=E6=8D=AE=E5=85=B6=E8=BF=9B?=
 =?UTF-8?q?=E8=A1=8C=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ruoyi-ui/src/views/system/user/index.vue | 26 ++++++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/ruoyi-ui/src/views/system/user/index.vue b/ruoyi-ui/src/views/system/user/index.vue
index 4f20b0872..ae561ba87 100644
--- a/ruoyi-ui/src/views/system/user/index.vue
+++ b/ruoyi-ui/src/views/system/user/index.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="app-container">
+  <div class="app-container" :style="containerStyle">
     <el-row :gutter="20">
       <!--部门数据-->
       <el-col :span="4" :xs="24">
@@ -139,7 +139,7 @@
           <right-toolbar :showSearch.sync="showSearch" @queryTable="getList" :columns="columns"></right-toolbar>
         </el-row>
 
-        <el-table v-loading="loading" :data="userList" @selection-change="handleSelectionChange">
+        <el-table v-loading="loading" :data="userList" :height="tableHeight" @selection-change="handleSelectionChange">
           <el-table-column type="selection" width="50" align="center" />
           <el-table-column label="用户编号" align="center" key="userId" prop="userId" v-if="columns[0].visible" />
           <el-table-column label="用户名称" align="center" key="userName" prop="userName" v-if="columns[1].visible" :show-overflow-tooltip="true" />
@@ -392,6 +392,13 @@ export default {
       roleOptions: [],
       // 表单参数
       form: {},
+      // 表格高度
+      tableHeight: 0,
+      // 页面样式
+      containerStyle: {
+        height: null,
+        'overflow-y': 'hidden'
+      },
       defaultProps: {
         children: "children",
         label: "label"
@@ -467,6 +474,7 @@ export default {
     }
   },
   created() {
+    this.loadTableHeight();
     this.getList();
     this.getTreeselect();
     this.getConfigKey("sys.user.initPassword").then(response => {
@@ -474,6 +482,20 @@ export default {
     });
   },
   methods: {
+    /** 加载表格高度 */
+    loadTableHeight() {
+      const self = this
+      const windowHeight = window.document.documentElement.clientHeight
+      self.containerStyle.height = windowHeight - 85 + 'px' // 设置页面高度
+      // self.cardBodyStyle.height = windowHeight - 130 + 'px' // 卡片body高度
+      self.tableHeight = windowHeight - 330 // 设置表格高度
+      window.onresize = function () {
+        const wHeight = window.document.documentElement.clientHeight
+        self.containerStyle.height = wHeight - 85 + 'px' // 设置页面高度
+        // self.cardBodyStyle.height = wHeight - 130 + 'px' // 卡片高度
+        self.tableHeight = wHeight - 330 // 设置表格高度
+      }
+    },
     /** 查询用户列表 */
     getList() {
       this.loading = true;