From 3386cfd4645b1f424a40016496fbb8f8b6a4da23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 12 Jul 2022 10:01:05 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/common/js/util.js                  | 14 +++++++-------
 src/views/xm/core/xmTask/XmPhase.vue   |  6 +++---
 src/views/xm/core/xmTask/XmPlan.vue    |  6 +-----
 src/views/xm/core/xmTask/XmTaskMng.vue |  6 +++---
 4 files changed, 14 insertions(+), 18 deletions(-)

diff --git a/src/common/js/util.js b/src/common/js/util.js
index c487b105..206e6a62 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -77,19 +77,19 @@ export default {
     var table=cssSelector;
     if(typeof cssSelector == 'string'){
       table=document.querySelector(cssSelector);
-    }
-    debugger;
+    } 
     var innerHeight=window.innerHeight  
-    var defaultInnerHeight=913;  
-    var pageHeight=90/defaultInnerHeight*innerHeight 
-    var top=200/defaultInnerHeight*innerHeight; 
+    var defaultInnerHeight=616;  
+    var pageHeight=32/defaultInnerHeight*innerHeight 
+    var top=148/defaultInnerHeight*innerHeight;
+    var bottomHeight=32/defaultInnerHeight*innerHeight
     if(table!=null){
       var rect=table.getBoundingClientRect()    
-      if(rect && rect.top!=0){
+      if(rect && rect.top!=0){ 
         top=rect.top;
       } 
     } 
-    var maxTableHeight =innerHeight-top-pageHeight;  
+    var maxTableHeight =innerHeight-top-pageHeight-bottomHeight;  
     return maxTableHeight;
   }, 
   getPositionTop(node) { 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 4f489c39..0643156c 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -152,12 +152,12 @@
                 >
               </el-col>
             </el-row> 
-            <el-button style="margin-top: 10px;" slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
+            <el-button slot="reference" @click="moreVisible=!moreVisible">更多</el-button>
           </el-popover> 
           </span>
         </el-row>
 
-        <el-row class="padding-top"> 
+        <el-row> 
             <el-table class="task-table" 
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
@@ -263,7 +263,7 @@
               :current-page="pageInfo.pageNum"
               :page-size="pageInfo.pageSize"
               :total="pageInfo.total"
-              style="float: right; margin-top: 10px;"
+              style="float: right;"
             ></el-pagination>  
         </el-row>
       </el-col>
diff --git a/src/views/xm/core/xmTask/XmPlan.vue b/src/views/xm/core/xmTask/XmPlan.vue
index e78dcce1..da549fc9 100644
--- a/src/views/xm/core/xmTask/XmPlan.vue
+++ b/src/views/xm/core/xmTask/XmPlan.vue
@@ -56,9 +56,5 @@
 </script> 
 
 <style lang="less" scoped> 
-.box{
-	.left{
-		background-color:#f4f5f8;
-	}
-}
+ 
 </style>
\ No newline at end of file
diff --git a/src/views/xm/core/xmTask/XmTaskMng.vue b/src/views/xm/core/xmTask/XmTaskMng.vue
index 86dcf8ea..45853e91 100644
--- a/src/views/xm/core/xmTask/XmTaskMng.vue
+++ b/src/views/xm/core/xmTask/XmTaskMng.vue
@@ -6,7 +6,7 @@
         class="padding-left"
         :class="{ 'flex-box': displayType == 'agil' }"
       >
-        <el-row class="padding-top">    
+        <el-row>    
           <xm-project-select style="display:inline;" v-if="!selProject||!selProject.id" :auto-select="isTaskCenter?false:true"  :link-iteration-id="xmIteration?xmIteration.id:null" :link-product-id="xmProduct?xmProduct.id:null"  @row-click="onProjectRowClick" @clear="onProjectClear" ></xm-project-select>
 
 					<el-select style="width: 100px" v-model="filters.taskState" placeholder="状态" clearable class="hidden-md-and-down">
@@ -304,7 +304,7 @@
           </span>
         </el-row>
 
-        <el-row class="padding-top">
+        <el-row>
           <template v-if="displayType != 'grant'">
             <xm-task-agile-kanban
               :tableHeight="tableHeight"
@@ -539,7 +539,7 @@
               :current-page="pageInfo.pageNum"
               :page-size="pageInfo.pageSize"
               :total="pageInfo.total"
-              style="float: right; margin-top: 10px;"
+              style="float: right;"
             ></el-pagination>
           </template>
           <xm-gantt