From 74e6cb18b18ee1c21b7a63a051fd5b3ea00513f1 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Thu, 10 Mar 2022 15:00:51 +0800
Subject: [PATCH] dd2

---
 src/views/modules/importRecord/index.vue  |  8 ++++----
 src/views/modules/workSys/demandCate.vue  | 15 +++++++++++----
 src/views/modules/workSys/elegantCate.vue |  8 ++++++++
 src/views/modules/workSys/resiCate.vue    | 22 ++++++++++++++++------
 4 files changed, 39 insertions(+), 14 deletions(-)

diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index 978ab1d3..a2043311 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-card class="resi-card-table">
+    <el-card>
       <div class="resi-row-btn">
         <h2 type="success" size="small">导入记录</h2>
       </div>
@@ -8,8 +8,8 @@
         :data="tableData"
         border
         style="width: 100%"
+         :height="maxTableHeight"
         class="resi-table"
-        :max-height="maxTableHeight"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
         <el-table-column prop="originFileName" label="文件名">
@@ -45,7 +45,7 @@
           :current-page.sync="pageNo"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="parseInt(pageSize)"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -85,7 +85,7 @@ export default {
   },
   computed: {
     maxTableHeight() {
-      return this.clientHeight - 300;
+      return this.clientHeight - 280;
     },
     ...mapGetters(["clientHeight"]),
   },
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index e51e1ee2..12d75d2d 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+    <el-card  ref="searchCard" class="search-card">
+      <div>
         <el-form :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="需求分类">
             <el-select v-model="form.firstCategoryCode" filterable placeholder="请选择" clearable>
@@ -18,6 +18,8 @@
           </el-form-item>
         </el-form>
       </div>
+    </el-card>
+    <el-card class="resi-card-table">
       <div class="resi-row-btn">
         <el-button type="success" @click="handleAdd('1', 'add')">新增分类</el-button>
       </div>
@@ -27,7 +29,7 @@
         row-key="categoryId"
         v-loading="tableLoading"
         border
-        max-height="800"
+        :height="tableHeight"
         style="width: 100%"
         class="resi-table"
       >
@@ -80,7 +82,7 @@
           :current-page.sync="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="pageSize"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -135,6 +137,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
+      tableHeight: 500,
       addLevel: '1',
       addType: 'add',
       value: '',
@@ -185,6 +188,10 @@ export default {
     this.pageLoading = true
   },
   mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      console.log('tableHeight', this.tableHeight)
+    })
   },
   methods: {
     handleSizeChange(val) {
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
index 8dfa0a9b..d0a5320d 100644
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -12,6 +12,7 @@
                   :default-expand-all="false"
                   row-key="categoryId"
                   :cell-style="cellStyle"
+                  :height="tableHeight"
                   border
                   style="width: 100%;" class="resi-table">
           <el-table-column prop="categoryName"
@@ -77,6 +78,7 @@ export default {
       tableParams: {
         customerId: ''
       },
+      tableHeight: 500,
       search: '',
       dataList: [],
 
@@ -108,6 +110,12 @@ export default {
     console.log('user----', user)
     this.initData(user.customerId, user.customerName)
   },
+  mounted() {
+    this.$nextTick(() => {
+      this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
+      console.log('tableHeight', this.tableHeight)
+    })
+  },
   methods: {
     cellStyle ({ row, column, rowIndex, columnIndex }) {
       // 状态列字体颜色
diff --git a/src/views/modules/workSys/resiCate.vue b/src/views/modules/workSys/resiCate.vue
index f5643218..4dfde7e2 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -1,7 +1,7 @@
 <template>
   <div v-if="pageLoading" class="resi-container">
-    <el-card class="resi-card-table">
-      <div class="resi-row-btn">
+    <el-card ref="searchCard" class="search-card">
+      <div >
         <el-form :inline="true" :model="form" class="demo-form-inline">
           <el-form-item label="是否预警">
             <el-select
@@ -40,11 +40,15 @@
           </el-form-item>
         </el-form>
       </div>
+    </el-card>
+    <el-card class="resi-card-table">
+      
       <el-table
         :data="tableData"
         row-key="id"
         v-loading="tableLoading"
         border
+        :height="tableHeight"
         style="width: 100%"
         class="resi-table"
       >
@@ -93,7 +97,7 @@
           :current-page.sync="currentPage"
           :page-sizes="[20, 50, 100, 200]"
           :page-size="pageSize"
-          layout="sizes, prev, pager, next"
+          layout="sizes, prev, pager, next, total"
           :total="total"
         >
         </el-pagination>
@@ -103,12 +107,13 @@
     <el-dialog
       title="居民类别配置"
       :visible.sync="dialogVisible"
-      width="40%"
+      width="50%"
       append-to-body
+      class="dialog-h"
       :close-on-click-modal="false"
       :before-close="handlerCancle"
     >
-      <el-form label-width="100px" :model="form" :rules="rules" ref="ruleForm">
+      <el-form label-width="150px" :model="form" :rules="rules" ref="ruleForm" class="dialog-h-content scroll-h">
         <el-form-item label="类别名称">
           <el-input v-model="form.label" size="small" style="width: 180px;" disabled></el-input>
         </el-form-item>
@@ -196,6 +201,7 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
+      tableHeight: 500,
       isWarn: null,
       level: null,
       options: [
@@ -282,6 +288,10 @@ export default {
   },
   mounted() {
     this.rowDrop()
+    this.$nextTick(() => {
+      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 230 + 'px'
+      console.log('tableHeight', this.tableHeight)
+    })
   },
   methods: {
     rowDrop() {
@@ -501,7 +511,7 @@ export default {
             return this.$message.error(res.msg)
           } else {
             this.tableData = res.data
-            this.total = res.data.total
+            this.total = res.data.length
           }
         })
         .catch(() => {