修改页面高度

src/assets/styles/public.scss

@@ -651,4 +651,10 @@
       }
     }
   }
+}
+.el-table::before {
+  height: 0;
+}
+.el-table__fixed::before,.el-table__fixed-right::before {
+  height: 0;
 }

src/components/Breadcrumb/index.vue

@@ -1,11 +1,3 @@
-<!--
- * @Descripttion: 
- * @version: 
- * @Author: JC9527
- * @Date: 2024-03-25 09:07:08
- * @LastEditors: JC9527
- * @LastEditTime: 2024-03-28 11:04:55
--->
 <template>
   <div class="my-L-breadcrumb">
     <el-breadcrumb class="app-breadcrumb" separator="/">

src/layout/components/FixedHeader/index.vue

@@ -52,6 +52,7 @@ export default {
   data() {
     return {
       systemTitle: process.env.VUE_APP_TITLE,
+      username: ""
     };
   },
   computed: {
@@ -60,6 +61,9 @@ export default {
       return variables;
     },
   },
+  mounted(){
+    this.username = this.$store.state.user.nickName
+  },
   methods: {
     async logout() {
       this.$confirm("确定注销并退出系统吗？", "提示", {
@@ -115,7 +119,7 @@ export default {
         .user-avatar {
           height: 40px;
           width: 40px;
-          border-radius: 10px;
+          border-radius: 20px;
         }
         .user-name {
           padding: 0 10px;

src/store/modules/user.js

@@ -9,7 +9,11 @@ const user = {
     avatar: '',
     roles: [],
     permissions: [],
-    expires_in: ''
+    expires_in: '',
+    enterpriseId: '',
+    nickName: '',
+    userType: '',
+    deptId: '',
   },
 
   mutations: {
@@ -33,6 +37,18 @@ const user = {
     },
     SET_PERMISSIONS: (state, permissions) => {
       state.permissions = permissions
+    },
+    SET_ENTERPRISEID: (state, enterpriseId) => {
+      state.enterpriseId = enterpriseId
+    },
+    SET_NICKNAME: (state, nickName) => {
+      state.nickName = nickName
+    },
+    SET_USERTYPE: (state, userType) => {
+      state.userType = userType
+    },
+    SET_DEPTID: (state, deptId) => {
+      state.deptId = deptId
     }
   },
 
@@ -75,6 +91,10 @@ const user = {
           }
           commit('SET_ID', user.userId)
           commit('SET_NAME', user.userName)
+          commit('SET_ENTERPRISEID', user.enterpriseId)
+          commit('SET_NICKNAME', user.nickName)
+          commit('SET_USERTYPE', user.userType)
+          commit('SET_DEPTID', user.deptId)
           commit('SET_AVATAR', avatar)
           resolve(res)
         }).catch(error => {

src/views/onlineDeclaration/declarationManagement/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="模版名称" prop="templateName">
         <el-input
           v-model="queryParams.templateName"
@@ -45,7 +45,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -61,6 +61,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="InfoList"
+      :height="tabHeader"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
@@ -110,6 +111,7 @@
       </el-table-column>
     </el-table>
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -201,13 +203,33 @@ export default {
         templateId: [
           { required: true, message: "请选择申报表单模版", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询菜单列表 */
     getList() {
       this.loading = true;

src/views/onlineDeclaration/enterpriseDirectory/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="企业名录分类" prop="enterpriseDirectory">
         <el-input
           v-model="queryParams.enterpriseDirectory"
@@ -32,7 +32,7 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" class="btn">查询</el-button>
       </el-form-item>
     </el-form>
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -48,6 +48,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="contentList"
+      :height="tabHeader"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
@@ -104,6 +105,7 @@
       </el-table-column>
     </el-table>
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -311,13 +313,33 @@ export default {
       },
       fileList: [],
       excelData: [],
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
     this.getTemplateList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询菜单列表 */
     getList() {
       this.loading = true;

src/views/onlineDeclaration/pendingReview/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true">
       <el-form-item label="项目名称" prop="projectName">
         <el-input
           v-model="queryParams.projectName"
@@ -30,7 +30,7 @@
         <el-button type="primary" icon="el-icon-search" size="mini" @click="handleQuery" class="btn">查询</el-button>
       </el-form-item>
     </el-form>
-    <el-row class="mb8">
+    <el-row class="mb8" id="I-rowOne">
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -61,6 +61,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="checkList"
+      :height="tabHeader"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
@@ -126,6 +127,7 @@
       </el-table-column>
     </el-table>
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -225,13 +227,33 @@ export default {
         ],
       },
       fileList: [],
-      uploadList: []
+      uploadList: [],
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询审批列表 */
     getList() {
       this.loading = true;

src/views/onlineDeclaration/records/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="模版名称" prop="templateName">
         <el-input
           v-model="queryParams.templateName"
@@ -35,7 +35,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row :gutter="10" id="I-rowOne" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -78,7 +78,7 @@
         >导出申报记录清单</el-button>
       </el-col>
     </el-row>
-    <el-row v-if="userType == '02'">
+    <el-row id="I-rowTwo" v-if="userType == '02'">
       <el-col :span="1.5">
         <el-button
           type="info"
@@ -134,7 +134,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="menuList"
-      
+      :height="tabHeader"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
@@ -218,6 +218,7 @@
       </el-table-column>
     </el-table>
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -357,14 +358,42 @@ export default {
         fileList: [
           { required: true, message: "请选择申报表单模版", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     console.log(this.$store.state.user.enterpriseId);
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      if(this.userType == '02') {
+        const headerThree = document.getElementById('I-rowTwo'); // 通过元素的 ID 获取元素
+        const headerTHeight = headerThree.offsetHeight;
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - headerTHeight - paginationtHeight - 140;
+      } else {
+        this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+      }
+      
+    },
     routerGo() {
       this.$router.push({ name: 'supplementaryNew' }).catch(()=>{});
     },

src/views/onlineDeclaration/template/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true">
+  <div class="app-container" id="app-container">
+    <el-form :model="queryParams" id="I-form" ref="queryForm" size="small" :inline="true">
       <el-form-item label="模版名称" prop="templateName">
         <el-input
           v-model="queryParams.templateName"
@@ -49,6 +49,7 @@
       v-if="refreshTable"
       v-loading="loading"
       :data="InfoList"
+      :height="tabHeader"
     >
       <el-table-column label="序号" align="center" width="50" fixed>
         <template slot-scope="scope">
@@ -98,6 +99,7 @@
       </el-table-column>
     </el-table>
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -131,12 +133,30 @@ export default {
         pageNum: 1,
         pageSize: 20,
       },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - paginationtHeight - 140;
+    },
     /** 查询模版列表 */
     getList() {
       this.loading = true;

src/views/system/config/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="参数名称" prop="configName">
         <el-input
           v-model="queryParams.configName"
@@ -46,7 +46,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -102,7 +102,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
+    <el-table :height="tabHeader" v-loading="loading" :data="configList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="参数主键" align="center" prop="configId" />
       <el-table-column label="参数名称" align="center" prop="configName" :show-overflow-tooltip="true" />
@@ -140,6 +140,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -229,13 +230,33 @@ export default {
         configValue: [
           { required: true, message: "参数键值不能为空", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询参数列表 */
     getList() {
       this.loading = true;

src/views/system/dept/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="部门名称" prop="deptName">
         <el-input
           v-model="queryParams.deptName"
@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -216,13 +216,31 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - 40;
+    },
     /** 查询部门列表 */
     getList() {
       this.loading = true;

src/views/system/dict/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="字典名称" prop="dictName">
         <el-input
           v-model="queryParams.dictName"
@@ -51,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -107,7 +107,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
+    <el-table :height="tabHeader" v-loading="loading" :data="typeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="字典编号" align="center" prop="dictId" />
       <el-table-column label="字典名称" align="center" prop="dictName" :show-overflow-tooltip="true" />
@@ -150,6 +150,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -233,13 +234,33 @@ export default {
         dictType: [
           { required: true, message: "字典类型不能为空", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询字典类型列表 */
     getList() {
       this.loading = true;

src/views/system/logininfor/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="登录地址" prop="ipaddr">
         <el-input
           v-model="queryParams.ipaddr"
@@ -51,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -97,7 +97,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table :height="tabHeader" ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="访问编号" align="center" prop="infoId" />
       <el-table-column label="用户名称" align="center" prop="userName" :show-overflow-tooltip="true" sortable="custom" :sort-orders="['descending', 'ascending']" />
@@ -116,6 +116,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -160,13 +161,33 @@ export default {
         ipaddr: undefined,
         userName: undefined,
         status: undefined
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询登录日志列表 */
     getList() {
       this.loading = true;

src/views/system/menu/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="菜单名称" prop="menuName">
         <el-input
           v-model="queryParams.menuName"
@@ -25,7 +25,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -53,6 +53,7 @@
       v-loading="loading"
       :data="menuList"
       row-key="menuId"
+      :height="tabHeader"
       :default-expand-all="isExpandAll"
       :tree-props="{children: 'children', hasChildren: 'hasChildren'}"
     >
@@ -319,13 +320,31 @@ export default {
         path: [
           { required: true, message: "路由地址不能为空", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - 40;
+    },
     // 选择图标
     selected(name) {
       this.form.icon = name;

src/views/system/notice/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="公告标题" prop="noticeTitle">
         <el-input
           v-model="queryParams.noticeTitle"
@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -69,7 +69,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
+    <el-table :height="tabHeader" v-loading="loading" :data="noticeList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="序号" align="center" prop="noticeId" width="100" />
       <el-table-column
@@ -115,6 +115,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -213,13 +214,33 @@ export default {
         noticeType: [
           { required: true, message: "公告类型不能为空", trigger: "change" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询公告列表 */
     getList() {
       this.loading = true;

src/views/system/operlog/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="系统模块" prop="title">
         <el-input
           v-model="queryParams.title"
@@ -66,7 +66,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="danger"
@@ -101,7 +101,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
+    <el-table :height="tabHeader" ref="tables" v-loading="loading" :data="list" @selection-change="handleSelectionChange" :default-sort="defaultSort" @sort-change="handleSortChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="日志编号" align="center" prop="operId" />
       <el-table-column label="系统模块" align="center" prop="title" />
@@ -137,6 +137,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -224,13 +225,33 @@ export default {
         operName: undefined,
         businessType: undefined,
         status: undefined
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询登录日志 */
     getList() {
       this.loading = true;

src/views/system/post/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form" :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch" label-width="68px">
       <el-form-item label="岗位编码" prop="postCode">
         <el-input
           v-model="queryParams.postCode"
@@ -33,7 +33,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -79,7 +79,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
+    <el-table :height="tabHeader" v-loading="loading" :data="postList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="岗位编号" align="center" prop="postId" />
       <el-table-column label="岗位编码" align="center" prop="postCode" />
@@ -116,6 +116,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -203,13 +204,33 @@ export default {
         postSort: [
           { required: true, message: "岗位顺序不能为空", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询岗位列表 */
     getList() {
       this.loading = true;

src/views/system/role/index.vue

@@ -1,6 +1,6 @@
 <template>
-  <div class="app-container">
-    <el-form :model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
+  <div class="app-container" id="app-container">
+    <el-form id="I-form":model="queryParams" ref="queryForm" size="small" :inline="true" v-show="showSearch">
       <el-form-item label="角色名称" prop="roleName">
         <el-input
           v-model="queryParams.roleName"
@@ -51,7 +51,7 @@
       </el-form-item>
     </el-form>
 
-    <el-row :gutter="10" class="mb8">
+    <el-row id="I-rowOne" :gutter="10" class="mb8">
       <el-col :span="1.5">
         <el-button
           type="primary"
@@ -97,7 +97,7 @@
       <right-toolbar :showSearch.sync="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
 
-    <el-table v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
+    <el-table :height="tabHeader" v-loading="loading" :data="roleList" @selection-change="handleSelectionChange">
       <el-table-column type="selection" width="55" align="center" />
       <el-table-column label="角色编号" prop="roleId" width="120" />
       <el-table-column label="角色名称" prop="roleName" :show-overflow-tooltip="true" width="150" />
@@ -148,6 +148,7 @@
     </el-table>
 
     <pagination
+      id="L-pagination"
       v-show="total>0"
       :total="total"
       :page.sync="queryParams.pageNum"
@@ -338,13 +339,33 @@ export default {
         roleSort: [
           { required: true, message: "角色顺序不能为空", trigger: "blur" }
         ]
-      }
+      },
+      tabHeader: undefined,
     };
   },
+  mounted() {
+    this.cancalDebounce();
+    window.addEventListener('resize', this.cancalDebounce);
+  },
+  destroyed() {
+    window.removeEventListener('resize', this.cancalDebounce);
+  },
   created() {
     this.getList();
   },
   methods: {
+    // 屏幕尺寸变化
+    cancalDebounce(){
+      const element = document.getElementById('app-container'); // 通过元素的 ID 获取元素
+      const header = document.getElementById('I-form'); // 通过元素的 ID 获取元素
+      const headerTwo = document.getElementById('I-rowOne'); // 通过元素的 ID 获取元素
+      const pagination = document.getElementById('L-pagination'); // 通过元素的 ID 获取元素
+      const elementHeight = element.offsetHeight;
+      const headerHeight = header.offsetHeight;
+      const headerOHeight = headerTwo.offsetHeight;
+      const paginationtHeight = pagination.offsetHeight;
+      this.tabHeader = elementHeight - headerHeight - headerOHeight - paginationtHeight - 140;
+    },
     /** 查询角色列表 */
     getList() {
       this.loading = true;

src/views/system/user/index.vue

@@ -294,6 +294,34 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="用户类型" prop="userType">
+              <el-select v-model="form.userType" placeholder="请选择用户类型" clearable style="width: 100%">
+                  <el-option
+                    v-for="dict in dict.type.bms_user_type"
+                    :key="dict.value"
+                    :label="dict.label"
+                    :value="dict.value"
+                  />
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="24">
+            <el-form-item label="企业信息" prop="enterpriseId">
+              <el-select v-model="form.enterpriseId" placeholder="请选择企业信息" clearable style="width: 100%">
+                <el-option
+                  v-for="item in enterpriseList"
+                  :key="item.id"
+                  :label="item.enterpriseName"
+                  :value="item.id"
+                  ></el-option>
+                </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
         <el-row>
           <el-col :span="24">
             <el-form-item label="备注">
@@ -342,13 +370,14 @@
 
 <script>
 import { listUser, getUser, delUser, addUser, updateUser, resetUserPwd, changeUserStatus, deptTreeSelect } from "@/api/system/user";
+import { listEnterpriseBasicInfo } from "@/api/system/enterpriseBasicInfo";
 import { getToken } from "@/utils/auth";
 import Treeselect from "@riophae/vue-treeselect";
 import "@riophae/vue-treeselect/dist/vue-treeselect.css";
 
 export default {
   name: "User",
-  dicts: ['sys_normal_disable', 'sys_user_sex'],
+  dicts: ['sys_normal_disable', 'sys_user_sex', 'bms_user_type'],
   components: { Treeselect },
   data() {
     return {
@@ -431,6 +460,12 @@ export default {
         nickName: [
           { required: true, message: "用户昵称不能为空", trigger: "blur" }
         ],
+        userType: [
+          { required: true, message: "请选择用户类型", trigger: "blur" }
+        ],
+        enterpriseId: [
+          { required: true, message: "请选择企业信息", trigger: "blur" }
+        ],
         password: [
           { required: true, message: "用户密码不能为空", trigger: "blur" },
           { min: 5, max: 20, message: '用户密码长度必须介于 5 和 20 之间', trigger: 'blur' },
@@ -450,7 +485,9 @@ export default {
             trigger: "blur"
           }
         ]
-      }
+      },
+      // 企业数组
+      enterpriseList: [],
     };
   },
   watch: {
@@ -465,6 +502,9 @@ export default {
     this.getConfigKey("sys.user.initPassword").then(response => {
       this.initPassword = response.msg;
     });
+    listEnterpriseBasicInfo({}).then((response) => {
+      this.enterpriseList = response.rows
+    })
   },
   methods: {
     /** 查询用户列表 */