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" > @@ -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 @@