From fb764c453372ca71fe4bf7c84b0c860dd253ab1e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Wed, 13 Jul 2022 17:57:09 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=AD=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/core/xmMenu/XmEpicFeatures.vue | 19 +++++++++++--------
 src/views/xm/core/xmMenu/XmMenuMng.vue      | 14 ++++++++++++--
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index fe6efe25..aed67e2b 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -48,6 +48,16 @@
 							trigger="manual"
 							v-model="moreVisible"
 						>
+							<el-row> 
+								<el-col :span="24"> 
+									<el-button  style="float:right;"
+									icon="el-icon-close"
+									@click="moreVisible=false"
+									type="text"
+									>关闭</el-button
+									>
+								</el-col>
+							</el-row> 
 							<el-row>
 							<el-col :span="24" style="padding-top: 5px" v-if="editForm && editForm.menuId">
 								<font class="more-label-font">当前选中的史诗、特性:</font> 
@@ -65,14 +75,7 @@
 								>
 								<el-button          @click="loadTasksToXmMenuState" icon="el-icon-s-marketing" title="汇总进度">汇总进度</el-button> 
  
-							</el-col>
-							<el-col :span="24" style="padding-top: 5px"> 
-							 	<el-button  
-								icon="el-icon-close"
-								@click="moreVisible=false"
-								>关闭</el-button
-								>
-							</el-col>
+							</el-col> 
 							</el-row> 
 							<el-button slot="reference" @click="moreVisible=!moreVisible" icon="el-icon-more"></el-button>
 						</el-popover> 
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index 1b996940..9d328624 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -21,6 +21,17 @@
 							width="400"
 							v-model="moreVisible"
 							trigger="manual" >
+							
+							<el-row> 
+								<el-col :span="24"> 
+									<el-button  style="float:right;"
+									icon="el-icon-close"
+									@click="moreVisible=false"
+									type="text"
+									>关闭</el-button
+									>
+								</el-col>
+							</el-row> 
 							<el-row>
 								<el-col  :span="24"  style="padding-top:5px;" >
 									<font class="more-label-font">标签条件:</font>
@@ -131,8 +142,7 @@
 									<el-input v-model="filters.productId" style="width: 220px;" placeholder="产品编号查询" clearable></el-input>
 								</el-col>
 								<el-col  :span="24"  style="padding-top:5px;">
-									<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button>
-									<el-button  @click="moreVisible=false" icon="el-icon-close" >关闭</el-button>
+									<el-button type="primary"  @click="searchXmMenus" icon="el-icon-search">查询</el-button> 
  								</el-col>
 								<el-col  :span="24"  style="padding-top:5px;">
 									<el-button    @click="handleExport" icon="el-icon-download">导出</el-button>