From f96e412a27d8f18bbcddba7a7fcb401dec3ebecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 17 Feb 2023 18:03:01 +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/views/xm/core/xmFunc/XmFuncSelect.vue                 | 2 +-
 src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue         | 5 +++--
 src/views/xm/core/xmMenu/XmMenuSelect.vue                 | 6 +++---
 src/views/xm/core/xmTask/XmPhaseSelect.vue                | 2 +-
 src/views/xm/core/xmTestCase/XmTestCaseSelect.vue         | 4 ++--
 src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue | 4 ++--
 6 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index 40abd98a..10ae75a1 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -327,7 +327,7 @@ export default {
             initDicts(this);
             this.initData()
             this.loadDatasFirstCache();
-            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmFuncTable.$el)
+            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmFuncTable.$el)-40
 
         });
     }
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index aac74c5d..4d45373c 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -48,8 +48,9 @@
 				</el-table-column> 
 				</template>
 			</el-table>  
+			<el-pagination  layout="total, sizes, prev,  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-row>   
-		<el-pagination  layout="total, sizes, prev,  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>
 
 	</section>
 </template>
@@ -329,7 +330,7 @@
 			})
 			this.filters.product=this.xmProduct 
 			this.$nextTick(() => {
-				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el); 
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el)-40; 
 				this.loadDatasFirstCache(); 
 				
           });
diff --git a/src/views/xm/core/xmMenu/XmMenuSelect.vue b/src/views/xm/core/xmMenu/XmMenuSelect.vue
index 4d08f536..cb9991ef 100644
--- a/src/views/xm/core/xmMenu/XmMenuSelect.vue
+++ b/src/views/xm/core/xmMenu/XmMenuSelect.vue
@@ -136,8 +136,8 @@
 					
 					<el-button  style="float:right;" type="primary" v-if="multi"  v-on:click="multiSelectedConfirm">确认</el-button>
 				</el-row>   
-				<el-row  ref="table" class="padding-top">
-					<el-table  element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"  class="menu-table"   :height="maxTableHeight" :data="xmMenusTreeData"   row-key="menuId"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
+				<el-row   class="padding-top">
+					<el-table ref="table" element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"  class="menu-table"   :height="maxTableHeight" :data="xmMenusTreeData"   row-key="menuId"  @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;">
 						<el-table-column v-if="multi" type="selection" width="50"></el-table-column>  
 						
 						<el-table-column prop="menuName" label="需求名称" min-width="140" > 
@@ -586,7 +586,7 @@ XmEpicFeatures,
 			})
 			this.$nextTick(() => {
 				
-				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el);   
+				this.maxTableHeight =  util.calcTableMaxHeight(this.$refs.table.$el)-40;   
 				if(this.iterationFilterType){
 					this.filters.iterationFilterType=this.iterationFilterType
 				}
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 30831c76..57d54210 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -456,7 +456,7 @@ export default {
       if(this.isTaskCenter ||(this.selProject && this.selProject.id)){
         this.getXmTasks();
       } 
-      this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el);
+      this.tableHeight = this.source == 'GZT' ? this.tableHeight : util.calcTableMaxHeight(this.$refs.table.$el)-40;
  
     });
   },
diff --git a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
index 4380b212..14f8986a 100644
--- a/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
+++ b/src/views/xm/core/xmTestCase/XmTestCaseSelect.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-        <el-row>
+        <el-row :gutter="10">
             
             <el-col :span="6">
                 <xm-func-select v-if="xmTestCasedb && xmTestCasedb.productId" class="padding-right padding-left" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" @row-click="onXmFuncRowClick"> 
@@ -340,7 +340,7 @@ export default {
             initDicts(this);
             this.initData()
             this.searchXmTestCases();
-            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestCaseTable.$el)
+            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestCaseTable.$el)-40
 
         });
     }
diff --git a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
index af04d6e6..ced3a891 100644
--- a/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
+++ b/src/views/xm/core/xmTestPlanCase/XmTestPlanCaseSelect.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-        <el-row> 
+        <el-row :gutter="10"> 
             <el-col :span="6" v-if="!xmTestCase||!xmTestCase.id">
                 <xm-func-select  :xm-product="xmProductCpd" @row-click="onXmFuncRowClick"> 
                 </xm-func-select>
@@ -262,7 +262,7 @@ export default {
             initDicts(this);
             this.initData()
             this.searchXmTestPlanCases();
-            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestPlanCaseTable.$el)
+            this.maxTableHeight = util.calcTableMaxHeight(this.$refs.xmTestPlanCaseTable.$el)-40
 
         });
     }