diff --git a/src/common/js/util.js b/src/common/js/util.js index 64947143..2522d575 100644 --- a/src/common/js/util.js +++ b/src/common/js/util.js @@ -14,15 +14,19 @@ function padding(s, len) { export default { - calcTableMaxHeight(cssSelector) { + calcTableMaxHeight(cssSelector) { var table=document.querySelector(cssSelector); - var top=this.getPositionTop(table) - var defaultInnerHeight=913; - var innerHeight=window.innerHeight - if(top==0){ - top=100/defaultInnerHeight*innerHeight - } - var maxTableHeight = innerHeight - top-80/defaultInnerHeight*innerHeight; + var innerHeight=window.innerHeight + var defaultInnerHeight=913; + var pageHeight=80/defaultInnerHeight*innerHeight; + var top=100/defaultInnerHeight*innerHeight; + if(table!=null){ + var rect=table.getBoundingClientRect() + if(rect && rect.top!=0){ + top=rect.top; + } + } + var maxTableHeight =innerHeight-top-pageHeight; return maxTableHeight; }, getPositionTop(node) { diff --git a/src/views/xm/core/xmTask/XmTaskList.vue b/src/views/xm/core/xmTask/XmTaskList.vue index 9bb2d711..5f003174 100644 --- a/src/views/xm/core/xmTask/XmTaskList.vue +++ b/src/views/xm/core/xmTask/XmTaskList.vue @@ -468,13 +468,8 @@ }, mounted() { this.filters.selProject=this.selProject - this.$nextTick(()=>{ - var clientRect=this.$refs.taskTable.$el.getBoundingClientRect(); - var subHeight=85/1000 * window.innerHeight; - if(this.selProject){ - subHeight=100/1000 * window.innerHeight; - } - this.tableHeight = window.innerHeight -clientRect.y - this.$refs.taskTable.$el.offsetTop-subHeight; + this.$nextTick(()=>{ + this.tableHeight = util.calcTableMaxHeight('el-table'); this.getXmTasks(); }); listOption([{categoryId:'all',itemCode:'planType'},{categoryId:'all',itemCode:'taskType'},{categoryId:'all',itemCode:'urgencyLevel'},{categoryId:'all',itemCode:'priority'}]).then(res=>{ diff --git a/src/views/xm/core/xmTask/XmTaskListForMenu.vue b/src/views/xm/core/xmTask/XmTaskListForMenu.vue index dc8c7ebf..1903d811 100644 --- a/src/views/xm/core/xmTask/XmTaskListForMenu.vue +++ b/src/views/xm/core/xmTask/XmTaskListForMenu.vue @@ -401,12 +401,7 @@ //在下面添加其它组件 }, mounted() { - this.$nextTick(()=>{ - - var subHeight=70/1000 * window.innerHeight; - if(this.isTaskCenter){ - subHeight=50/1000 * window.innerHeight; - } + this.$nextTick(()=>{ this.tableHeight = util.calcTableMaxHeight('el-table'); this.getXmTasks(); }); diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue index 9bd8cbe5..25e7d92d 100644 --- a/src/views/xm/core/xmTask/XmTaskMng.vue +++ b/src/views/xm/core/xmTask/XmTaskMng.vue @@ -2440,23 +2440,8 @@ export default { this.filters.product = this.xmProduct; } this.$nextTick(() => { - this.getXmTasks(); - var pagination = this.$refs.pagination.$el.offsetHeight; - var clientRect = this.$refs.table.$el.getBoundingClientRect(); - var subHeight = (70 / 1000) * window.innerHeight; - this.tableHeight = - window.innerHeight - - clientRect.y - - this.$refs.table.$el.offsetTop - - subHeight - - pagination; - // 监听窗口大小变化 - /** - let self = this; - window.onresize = function() { - self.tableHeight = util.calcTableMaxHeight('el-table'); - } - */ + this.getXmTasks(); + this.tableHeight = util.calcTableMaxHeight('el-table'); listOption([ { categoryId: "all", itemCode: "planType" }, { categoryId: "all", itemCode: "taskType" }, diff --git a/src/views/xm/core/xmTask/XmTaskMngBatch.vue b/src/views/xm/core/xmTask/XmTaskMngBatch.vue index 810d899c..03d1d749 100644 --- a/src/views/xm/core/xmTask/XmTaskMngBatch.vue +++ b/src/views/xm/core/xmTask/XmTaskMngBatch.vue @@ -1666,17 +1666,8 @@ export default { if (this.visible == true) { this.getXmTasks(); } - this.$nextTick(() => { - var clientRect = this.$refs.table.$el.getBoundingClientRect(); - var subHeight = (70 / 1000) * window.innerHeight; - if (this.isTaskCenter) { - subHeight = (50 / 1000) * window.innerHeight; - } - this.tableHeight = - window.innerHeight - - clientRect.y - - this.$refs.table.$el.offsetTop - - subHeight; + this.$nextTick(() => { + this.tableHeight = util.calcTableMaxHeight('el-table'); listOption([ { categoryId: "all", itemCode: "planType" }, { categoryId: "all", itemCode: "taskType" },