diff --git a/src/views/modules/base/epidemic/antiInfo.vue b/src/views/modules/base/epidemic/antiInfo.vue index 866daaaa..8388bc4d 100644 --- a/src/views/modules/base/epidemic/antiInfo.vue +++ b/src/views/modules/base/epidemic/antiInfo.vue @@ -341,7 +341,7 @@ export default { this.getGridList() this.getValiheList() await this.loadTable() - this.sHeight = this.$refs.div_search.offsetHeight + 240 + this.sHeight = this.$refs.div_search.offsetHeight + 230 }, methods: { @@ -605,12 +605,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/base/epidemic/travel.vue b/src/views/modules/base/epidemic/travel.vue index bf63e0e6..9091d65d 100644 --- a/src/views/modules/base/epidemic/travel.vue +++ b/src/views/modules/base/epidemic/travel.vue @@ -1,6 +1,6 @@ @@ -206,7 +206,7 @@ export default { pageSize: 10, pageNo: 0, tableLoading: false, - + sHeight: 0, agencyId: '', timeRange: [], @@ -241,6 +241,7 @@ export default { await this.loadTable() + this.sHeight = this.$refs.div_search.offsetHeight + 270 }, methods: { @@ -540,14 +541,13 @@ export default { }, computed: { tableHeight () { - - return (this.clientHeight - 360) + const h = this.clientHeight - this.sHeight + this.iframeHeigh + const _h = this.clientHeight - this.sHeight + return this.$store.state.inIframe ? h : _h }, - rowHeight () { - return (this.clientHeight - 200) + 'px' - }, - ...mapGetters(['clientHeight']) + + ...mapGetters(['clientHeight', 'iframeHeight']) }, watch: {