From b3eabb4b925dc2b0e33613bf7880225310a18ae1 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:47:28 +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                                | 12 ++++++++++--
 .../xm/core/xmIterationMenu/XmIterationMenuMng.vue   |  4 ++--
 src/views/xm/core/xmMenu/XmEpicFeatures.vue          |  7 +++----
 src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue    |  5 +++--
 src/views/xm/core/xmMenu/XmMenuMng.vue               |  4 ++--
 5 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/src/common/js/util.js b/src/common/js/util.js
index 206e6a62..090456ad 100644
--- a/src/common/js/util.js
+++ b/src/common/js/util.js
@@ -82,8 +82,16 @@ export default {
     var defaultInnerHeight=616;  
     var pageHeight=32/defaultInnerHeight*innerHeight 
     var top=148/defaultInnerHeight*innerHeight;
-    var bottomHeight=32/defaultInnerHeight*innerHeight
-    if(table!=null){
+    var bottomHeight=38/defaultInnerHeight*innerHeight
+    if(innerHeight>=916){
+      bottomHeight=20/defaultInnerHeight*innerHeight
+    }else if(innerHeight>=800){
+      bottomHeight=28/defaultInnerHeight*innerHeight
+    }else if(innerHeight>=700){
+      bottomHeight=32/defaultInnerHeight*innerHeight
+    }
+    
+    if(table!=null){  
       var rect=table.getBoundingClientRect()    
       if(rect && rect.top!=0){ 
         top=rect.top;
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index 8612a119..45df8896 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -1,6 +1,6 @@
 <template>
 	<section>
-		<el-row  class="padding-top">
+		<el-row>
 			<el-col :span="8">
 				<xm-epic-features-select :xm-product="{id:xmIteration.productId,name:''}" :show-select="false" @row-click="onEpicFeatureSelect"></xm-epic-features-select>
 			</el-col>
@@ -18,7 +18,7 @@
 							</span>
 
 						</el-row>
-						<el-row class="page-main padding-top padding-left">
+						<el-row class="page-main padding-left">
 							<!--列表 XmIterationMenu 迭代定义-->
 							<el-table ref="table" :height="maxTableHeight" :data="xmIterationMenusTreeData"  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  type="selection" width="45"></el-table-column>
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index 5c03eb85..5f7db170 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -115,8 +115,8 @@
 									</div>
   								</template> 
 							</el-table-column> 
-						</el-table>
-
+						</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>
 				<!--编辑 XmMenu xm_project_menu界面-->
@@ -136,8 +136,7 @@
 				</el-drawer>
 			</el-col>
 		</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>
-
+		
  			<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
 			</tag-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="filters.xmProduct" @user-confirm="onGroupUserSelect">
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index 53b20a8c..bc448f87 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -43,11 +43,12 @@
 							</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-col>
 		</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>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index dcaaee45..67de43b7 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -341,6 +341,7 @@
 							</el-table-column>
 							</template>
 						</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-row>
@@ -379,8 +380,7 @@
 				</el-drawer>
 			</el-col>
 		</el-row>
-		<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>
-
+		
  			<tag-dialog ref="tagDialog" :tagIds="filters.tags?filters.tags.map(i=>i.tagId):[]" :jump="true" @select-confirm="onTagSelected">
 			</tag-dialog>
  			<xm-group-dialog ref="xmGroupDialog" :isSelectSingleUser="true" :sel-project="selProject" :xm-product="filters.xmProduct" @user-confirm="onGroupUserSelect">