diff --git a/src/mixins/SimpleListMixin.js b/src/mixins/SimpleListMixin.js index 568fbcac..995bfad2 100644 --- a/src/mixins/SimpleListMixin.js +++ b/src/mixins/SimpleListMixin.js @@ -5,6 +5,7 @@ */ import { filterObj } from '@/utils/util' import { getAction, postAction } from '@/api/manage' +import { mapGetters } from 'vuex' export const SimpleListMixin = { data () { @@ -45,7 +46,20 @@ export const SimpleListMixin = { /* 高级查询条件 */ superQueryParams: '', /** 高级查询拼接方式 */ - superQueryMatchType: 'and' + superQueryMatchType: 'and', + isBackTitle: false // 是否是详情页有返回的标题 + } + }, + computed: { + ...mapGetters(['defaultHeight']), + yScrollHeight () { + /** + * 前几个使用变量是为了配合iframe嵌套,算出页面显示范围的高度 + * 48px:分页器的高度 + * 48px:a-card的padding(上24+下24) + * 54px:表头行的高度 + */ + return `calc(100vh - ${this.defaultHeight['user-info-height']} - ${this.defaultHeight['breadcrumb-height']} - ${this.defaultHeight.oneLineSearchHeight} - ${this.defaultHeight.oneLineOperationHeight} - 48px - 48px - 54px - ${this.isBackTitle ? '56px' : '0px'})` } }, created () { diff --git a/src/views/system/DepartList.vue b/src/views/system/DepartList.vue index 399fa4ea..86952f76 100644 --- a/src/views/system/DepartList.vue +++ b/src/views/system/DepartList.vue @@ -1,5 +1,5 @@