From 7c71b9d79abf73a39a26e5e73b0286042d297f77 Mon Sep 17 00:00:00 2001
From: lxc Mac <lxcby@lxcdeMacBook-Pro.local>
Date: Sun, 25 Jul 2021 17:30:40 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=8F=E6=8D=B7=E7=9C=8B=E6=9D=BF03?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmTask/XmTaskAgileKanban.vue | 5 ++---
 src/views/xm/core/xmTask/XmTaskMng.vue         | 5 +++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
index e4b9e0d9..4900a0ef 100644
--- a/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
+++ b/src/views/xm/core/xmTask/XmTaskAgileKanban.vue
@@ -259,10 +259,9 @@ export default {
 </script>
 <style lang='scss' scoped>
 .menu-box {
-	height: auto;
+	height: 100%;
   width: 100%;
-  overflow: scroll;
-	padding: 0 20px;
+  overflow: hidden;
 }
 .row {
   width: 2000px;
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index b00a1204..86c76589 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -226,7 +226,7 @@
 								</template>
 							</el-table-column>
 						</el-table>
-						<el-pagination layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
+						<el-pagination ref="pagination" layout="total, sizes, prev, pager, next" @current-change="handleCurrentChange" @size-change="handleSizeChange" :page-sizes="[10,20, 50, 100, 500]" :current-page="pageInfo.pageNum" :page-size="pageInfo.pageSize"  :total="pageInfo.total" style="float:right;"></el-pagination>
 					</template>
 						<xm-gantt v-if="gstcVisible" :tree-data="tasksTreeData" :project-phase="{startTime: currentProjectPhase.beginDate, endTime: currentProjectPhase.endDate}" :useRealTime="true"></xm-gantt>
 
@@ -1750,9 +1750,10 @@ XmTaskAgileKanban
 			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;
+				this.tableHeight =  window.innerHeight -clientRect.y - this.$refs.table.$el.offsetTop-subHeight - pagination;
 				// 监听窗口大小变化
 				/**
 				let self = this;