From 36161bfd842c3e53e17165da273ba44f9c2a3721 Mon Sep 17 00:00:00 2001
From: 13176889840 <13176889840@163.com>
Date: Fri, 25 Mar 2022 14:07:47 +0800
Subject: [PATCH] dd

---
 src/views/modules/base/collect.vue            | 12 ++++++-----
 src/views/modules/base/resi.vue               | 18 ++++++++++++++---
 .../modules/communityParty/elegant/index.vue  | 14 +++++++++++--
 .../communityService/measure/index.vue        | 13 ++++++++++--
 .../modules/communityService/sqzzz/index.vue  |  4 ++--
 src/views/modules/importRecord/index.vue      | 11 ++++++----
 .../difficulty/difficultyList.vue             | 12 ++++++-----
 .../secretaryLog/humanisticCare/careList.vue  | 12 ++++++-----
 .../modules/secretaryLog/workLog/index.vue    |  7 ++++---
 .../serviceMatter/service.vue                 | 12 +++++------
 .../modules/workPc/guidance/categoryList.vue  | 11 +++++++---
 .../modules/workPc/guidance/guidanceList.vue  |  6 ++++--
 src/views/modules/workSys/demandCate.vue      | 14 +++++++++++--
 src/views/modules/workSys/elegantCate.vue     | 20 +++++++++++++------
 src/views/modules/workSys/resiCate.vue        | 14 +++++++++++--
 15 files changed, 127 insertions(+), 53 deletions(-)

diff --git a/src/views/modules/base/collect.vue b/src/views/modules/base/collect.vue
index 8f6c49af..155f675e 100644
--- a/src/views/modules/base/collect.vue
+++ b/src/views/modules/base/collect.vue
@@ -61,7 +61,7 @@
         border
         style="width: 100%"
         class="resi-table"
-        :height="maxTableHeight"
+        :height="tableHeight"
         :span-method="arraySpanMethod"
       >
         <el-table-column label="序号" prop="desc" align="center" width="50" />
@@ -189,10 +189,12 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
-      return this.clientHeight - 360;
-    },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
+    }
   },
   watch: {
     timeRange(val) {
diff --git a/src/views/modules/base/resi.vue b/src/views/modules/base/resi.vue
index 9e35e8d6..95b645a5 100644
--- a/src/views/modules/base/resi.vue
+++ b/src/views/modules/base/resi.vue
@@ -297,7 +297,7 @@ export default {
       currentPage: 1,
       pageSize: 20,
       total: null,
-      tableHeight: 0,
+      searchH: 0,
       conditions: [],
       activeName: '',
       tableData: [],
@@ -336,6 +336,14 @@ export default {
     }
 
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
   async created () {
     if (this.$route.query) {
       let query = this.$route.query
@@ -352,12 +360,16 @@ export default {
     // this.handleSearch()
     // this.getTableData()
     this.pageLoading = true
+    this.searchH = this.$refs.resiSearch.$el.offsetHeight
     console.log('storeoooo----0000', this.$store)
     console.log('resiSearch', this.$refs.resiSearch.$el.offsetHeight)
-    this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    
   },
   mounted () {
-
+    
+    // this.$nextTick(() => {
+    //   this.tableHeight = document.documentElement.clientHeight - this.$refs.resiSearch.$el.offsetHeight - 280 + 'px'
+    // })
     console.log('document.documentElement.clientWidth', document.documentElement.clientHeight)
   },
   methods: {
diff --git a/src/views/modules/communityParty/elegant/index.vue b/src/views/modules/communityParty/elegant/index.vue
index 1366c673..c1cce0ed 100644
--- a/src/views/modules/communityParty/elegant/index.vue
+++ b/src/views/modules/communityParty/elegant/index.vue
@@ -235,6 +235,7 @@
 
 <script>
 import axios from 'axios'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -253,7 +254,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 400,
+      searchH: 0,
       unloadPencent: 0,
       addLevel: '1',
       addType: 'add',
@@ -321,6 +322,14 @@ export default {
         mainDeed: [{ required: true, message: '主要事迹不能为空', trigger: 'blur' }],
       }
     }
+  },
+   computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
   },
   async created() {
     this.customerId = localStorage.getItem('customerId')
@@ -340,10 +349,11 @@ export default {
     
     // this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
   },
+  
   mounted() {
     
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
       console.log('tableHeight', this.tableHeight)
     })
     
diff --git a/src/views/modules/communityService/measure/index.vue b/src/views/modules/communityService/measure/index.vue
index e54a2355..db1af9a5 100644
--- a/src/views/modules/communityService/measure/index.vue
+++ b/src/views/modules/communityService/measure/index.vue
@@ -589,6 +589,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -601,7 +602,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 400,
+      searchH: 0,
       addLevel: "1",
       addType: "add",
       value: "",
@@ -846,6 +847,14 @@ export default {
       },
     };
   },
+  computed: {
+    ...mapGetters(['clientHeight', 'iframeHeight']),
+    tableHeight() {
+      const h = this.clientHeight - this.searchH - 280 + this.iframeHeigh
+      const _h = this.clientHeight - 280 - this.searchH
+      return this.$store.state.inIframe ? h : _h
+    }
+  },
   async created() {
     this.customerId = localStorage.getItem("customerId");
 
@@ -860,7 +869,7 @@ export default {
   },
   mounted() {
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.searchH = this.$refs.searchCard.$el.offsetHeight
       console.log('tableHeight', this.tableHeight)
     })
   },
diff --git a/src/views/modules/communityService/sqzzz/index.vue b/src/views/modules/communityService/sqzzz/index.vue
index 9e347e83..669cbc1b 100644
--- a/src/views/modules/communityService/sqzzz/index.vue
+++ b/src/views/modules/communityService/sqzzz/index.vue
@@ -257,10 +257,10 @@ export default {
   computed: {
     maxTableHeight() {
       return this.$store.state.inIframe
-        ? this.clientHeight - 360 + 120
+        ? this.clientHeight - 360 + this.iframeHeigh
         : this.clientHeight - 360;
     },
-    ...mapGetters(["clientHeight"]),
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
     "fmData.createTime": function (val) {
diff --git a/src/views/modules/importRecord/index.vue b/src/views/modules/importRecord/index.vue
index f4fe8a58..75557687 100644
--- a/src/views/modules/importRecord/index.vue
+++ b/src/views/modules/importRecord/index.vue
@@ -6,7 +6,7 @@
         :data="tableData"
         border
         style="width: 100%"
-         :height="maxTableHeight"
+         :height="tableHeight"
         class="resi-table"
       >
         <el-table-column label="序号" type="index" align="center" width="50" />
@@ -82,10 +82,13 @@ export default {
     };
   },
   computed: {
-    maxTableHeight() {
-      return this.clientHeight - 280;
+    tableHeight () {
+      const h = this.clientHeight - 240 + this.iframeHeigh
+      const _h = this.clientHeight - 240
+      return this.$store.state.inIframe ? h : _h
     },
-    ...mapGetters(["clientHeight"]),
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {},
   mounted() {
diff --git a/src/views/modules/secretaryLog/difficulty/difficultyList.vue b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
index 933474da..3471a317 100644
--- a/src/views/modules/secretaryLog/difficulty/difficultyList.vue
+++ b/src/views/modules/secretaryLog/difficulty/difficultyList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -218,7 +218,7 @@ export default {
         scheduledStartTime: '',//预计处理开始时间yyyy-mm-dd	
         scheduledEndTime: '',//预计处理结束时间	yyyy-mm-dd
       },
-
+      sHeight: 0,
       tableData: [],
 
       //form相关
@@ -239,6 +239,7 @@ export default {
 
     //获取网格下拉框数据
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -473,12 +474,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 380)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/secretaryLog/humanisticCare/careList.vue b/src/views/modules/secretaryLog/humanisticCare/careList.vue
index fcd3354a..15771427 100644
--- a/src/views/modules/secretaryLog/humanisticCare/careList.vue
+++ b/src/views/modules/secretaryLog/humanisticCare/careList.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="div_main">
-    <div class="div_search">
+    <div ref="div_search" class="div_search">
       <el-form :inline="true"
                :model="formData"
                ref="ref_searchform"
@@ -288,7 +288,7 @@ export default {
         scheduledStartTime: '',//预计关怀开始时间	yyyy-mm-dd
         scheduledEndTime: '',//预计关怀结束时间	yyyy-mm-dd
       },
-
+      sHeight: 0,
       tableData: [],
 
       //form相关
@@ -308,6 +308,7 @@ export default {
 
     //获取网格下拉框数据
     await this.loadTable()
+    this.sHeight = this.$refs.div_search.offsetHeight + 270
   },
 
   methods: {
@@ -546,12 +547,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 430)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/secretaryLog/workLog/index.vue b/src/views/modules/secretaryLog/workLog/index.vue
index 3edcfe90..a438e507 100644
--- a/src/views/modules/secretaryLog/workLog/index.vue
+++ b/src/views/modules/secretaryLog/workLog/index.vue
@@ -414,12 +414,13 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - this.sHeight)
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
 
     },
 
-    ...mapGetters(['clientHeight'])
+    ...mapGetters(['clientHeight', 'iframeHeight']),
   },
   watch: {
 
diff --git a/src/views/modules/systemManagement/serviceMatter/service.vue b/src/views/modules/systemManagement/serviceMatter/service.vue
index ce2e0970..cbcaf231 100644
--- a/src/views/modules/systemManagement/serviceMatter/service.vue
+++ b/src/views/modules/systemManagement/serviceMatter/service.vue
@@ -256,14 +256,12 @@ export default {
   },
   computed: {
     tableHeight () {
-
-      return (this.clientHeight - 210)
-
+      const h = this.clientHeight - 210 + this.iframeHeigh
+      const _h = this.clientHeight - 210
+      return this.$store.state.inIframe ? h : _h
     },
-    rowHeight () {
-      return (this.clientHeight - 200) + 'px'
-    },
-    ...mapGetters(['clientHeight'])
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   watch: {
 
diff --git a/src/views/modules/workPc/guidance/categoryList.vue b/src/views/modules/workPc/guidance/categoryList.vue
index d2f8db1e..775ecd42 100644
--- a/src/views/modules/workPc/guidance/categoryList.vue
+++ b/src/views/modules/workPc/guidance/categoryList.vue
@@ -123,6 +123,7 @@
 <script>
 import Sortable from 'sortablejs'
 import { requestPost } from "@/js/dai/request";
+import { mapGetters } from 'vuex'
 
 export default {
   name: 'RoleList',
@@ -164,9 +165,13 @@ export default {
 
   },
   computed: {
-    tableHeight() {
-      return document.documentElement.clientHeight - 220;
-    }
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   methods: {
 
diff --git a/src/views/modules/workPc/guidance/guidanceList.vue b/src/views/modules/workPc/guidance/guidanceList.vue
index 8c5d436d..feed668f 100644
--- a/src/views/modules/workPc/guidance/guidanceList.vue
+++ b/src/views/modules/workPc/guidance/guidanceList.vue
@@ -201,10 +201,12 @@ export default {
   },
   computed: {
     tableHeight () {
-      return this.clientHeight - 360
+      const h = this.clientHeight - 360 + this.iframeHeigh
+      const _h = this.clientHeight - 360
+      return this.$store.state.inIframe ? h : _h
     },
 
-    ...mapGetters(['clientHeight', 'env'])
+    ...mapGetters(['clientHeight', 'iframeHeight', 'env'])
   },
   methods: {
     //重置搜索条件
diff --git a/src/views/modules/workSys/demandCate.vue b/src/views/modules/workSys/demandCate.vue
index 56cd8c45..976e1da7 100644
--- a/src/views/modules/workSys/demandCate.vue
+++ b/src/views/modules/workSys/demandCate.vue
@@ -136,6 +136,7 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
 export default {
   data () {
     return {
@@ -148,7 +149,7 @@ export default {
       pageSize: 20,
       total: null,
       tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
       addLevel: '1',
       addType: 'add',
       value: '',
@@ -192,6 +193,15 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
   async created () {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
@@ -200,7 +210,7 @@ export default {
   },
   mounted () {
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 280 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 280
       console.log('tableHeight', this.tableHeight)
     })
   },
diff --git a/src/views/modules/workSys/elegantCate.vue b/src/views/modules/workSys/elegantCate.vue
index 8c4d4707..bc3af0a0 100644
--- a/src/views/modules/workSys/elegantCate.vue
+++ b/src/views/modules/workSys/elegantCate.vue
@@ -69,6 +69,7 @@
 
 import { requestPost } from '@/js/dai/request'
 import elegantEdit from './elegantEdit.vue'
+import { mapGetters } from 'vuex'
 export default {
 
   data () {
@@ -79,7 +80,7 @@ export default {
       tableParams: {
         customerId: ''
       },
-      tableHeight: 500,
+      // tableHeight: 500,
       search: '',
       dataList: [],
 
@@ -101,7 +102,14 @@ export default {
       }
       console.log('this.dataList', this.dataList)
       return this.dataList
-    }
+    },
+    tableHeight () {
+      const h = this.clientHeight - 220 + this.iframeHeigh
+      const _h = this.clientHeight - 220
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
   },
   components: {
     elegantEdit
@@ -112,10 +120,10 @@ export default {
     this.initData(user.customerId, user.customerName)
   },
   mounted() {
-    this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - 220 + 'px'
-      console.log('tableHeight', this.tableHeight)
-    })
+    // 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 d6594778..4c1914b9 100644
--- a/src/views/modules/workSys/resiCate.vue
+++ b/src/views/modules/workSys/resiCate.vue
@@ -192,6 +192,7 @@
 <script>
 import axios from 'axios'
 import Sortable from 'sortablejs'
+import { mapGetters } from 'vuex'
 export default {
   data() {
     return {
@@ -206,7 +207,7 @@ export default {
       total: null,
       conditions: [],
       tableData: [],
-      tableHeight: 500,
+      sHeight: 0,
       isWarn: null,
       level: null,
       options: [
@@ -286,6 +287,15 @@ export default {
       }
     }
   },
+  computed: {
+    tableHeight () {
+      const h = this.clientHeight - this.sHeight + this.iframeHeigh
+      const _h = this.clientHeight - this.sHeight
+      return this.$store.state.inIframe ? h : _h
+    },
+
+    ...mapGetters(['clientHeight', 'iframeHeight'])
+  },
   async created() {
     this.customerId = localStorage.getItem('customerId')
     this.getTableData()
@@ -294,7 +304,7 @@ export default {
   mounted() {
     this.rowDrop()
     this.$nextTick(() => {
-      this.tableHeight = document.documentElement.clientHeight - this.$refs.searchCard.$el.offsetHeight - 230 + 'px'
+      this.sHeight = this.$refs.searchCard.$el.offsetHeight + 230
       console.log('tableHeight', this.tableHeight)
     })
   },