From 1cee389fe020d4fa71e418d4d3eeadf63d8dfc7f 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, 23 Mar 2022 17:29:54 +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/xmProduct/XmProductMng.vue  | 50 ++++++++---------
 src/views/xm/core/xmProject/XmProjectMng.vue  | 53 ++++++++++---------
 .../xm/core/xmQuestion/XmQuestionEdit.vue     |  2 +-
 .../xm/core/xmQuestion/XmQuestionMng.vue      |  6 +--
 4 files changed, 57 insertions(+), 54 deletions(-)

diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index 321c9220..f89e57a8 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -4,7 +4,7 @@
 		<el-col :span="6" v-if="templateVisible"> 
 			<xm-product-tpl-mng @copy="searchXmProducts" ref="xmProductTplMngRef" show-type="simple"></xm-product-tpl-mng>
 		</el-col> 
-		<el-col :span="templateVisible?18:24" class="padding-top padding-left border">
+		<el-col :span="templateVisible?18:24" class="padding-top padding-left border padding-right">
 			<el-row >
 				<el-row>
 					<el-select   v-model="filters.queryScope"    placeholder="产品查询范围">
@@ -22,29 +22,6 @@
 					</el-input>
 					<el-button type="primary" v-loading="load.list" :disabled="load.list==true" v-on:click="searchXmProducts" icon="el-icon-search">查询</el-button>
 					
-					<el-popover style="padding-left:10px;"  
-							placement="top-start"
-							width="450" 
-							trigger="click" > 
-							<el-row> 
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="都适用">
-									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新产品</el-button> 
-									</el-badge>
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="进阶">
-									<el-button type="primary" icon="el-icon-plus" >通过【产品-复制】一键创建新的产品</el-button> 
-									</el-badge>
-								</el-col> 
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="新手">
-									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的产品</el-button> 
-									</el-badge>
-								</el-col> 
-							</el-row>   
- 							<el-button type="primary" slot="reference"  icon="el-icon-plus" v-if="!xmIteration" id="guider-one" >产品</el-button>
-					</el-popover>
 					<el-popover
 						placement="top-start"
 						title=""
@@ -116,6 +93,31 @@
 						</el-row>
 						<el-button  slot="reference"   icon="el-icon-more" id="guider-two"></el-button>
 					</el-popover>
+					<span style="float:right;">
+					<el-popover style="padding-left:10px;"  
+							placement="top-start"
+							width="450" 
+							trigger="click" > 
+							<el-row> 
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="都适用">
+									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新产品</el-button> 
+									</el-badge>
+								</el-col>  
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="进阶">
+									<el-button type="primary" icon="el-icon-plus" >通过【产品-复制】一键创建新的产品</el-button> 
+									</el-badge>
+								</el-col> 
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="新手">
+									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的产品</el-button> 
+									</el-badge>
+								</el-col> 
+							</el-row>   
+ 							<el-button type="primary" slot="reference"  icon="el-icon-plus" v-if="!xmIteration" id="guider-one" round>产品</el-button>
+					</el-popover>
+					</span>
 				</el-row>
 				<el-row  class="page-main "  v-show="showType">
 					<!--列表 XmProject xm_project-->
diff --git a/src/views/xm/core/xmProject/XmProjectMng.vue b/src/views/xm/core/xmProject/XmProjectMng.vue
index 14410632..ba837542 100644
--- a/src/views/xm/core/xmProject/XmProjectMng.vue
+++ b/src/views/xm/core/xmProject/XmProjectMng.vue
@@ -6,7 +6,7 @@
 					<xm-project-tpl-mng @copy="searchXmProjects" :show-type="'simple'" ref="xmProjectTplMngRef"></xm-project-tpl-mng>
 				</el-row>
 			</el-col> 
-			<el-col :span="templateVisible?18:24" class="border padding-top"> 
+			<el-col :span="templateVisible?18:24" class="border padding-top padding-right"> 
 				<el-row class="padding-left"> 
 					<el-select v-model="menukey" @change="handleSelect" clearable>
 						<el-option value="all" label="全部"></el-option>
@@ -31,31 +31,7 @@
 					<el-input class="hidden-md-and-down" placeholder="选择产品" v-model="filters.productName" @click.native="productSelectVisible=true" clearable @clear="onProductClose"  style="width:15%;"></el-input>
  					<el-input v-model="filters.key" style="width:15%;" placeholder="项目名称模糊查询" clearable>
 					</el-input>
-					<el-button  type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button>
-						<el-popover style="padding-left:10px;"  
-							placement="top-start"
-							width="450" 
-							trigger="click" > 
-							<el-row> 
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="都适用">
-									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新项目</el-button> 
-									</el-badge>
-								</el-col>  
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="进阶">
-									<el-button type="primary" icon="el-icon-plus">通过【产品-复制】一键创建新的项目</el-button> 
-									</el-badge>
-								</el-col> 
-								<el-col :span="24" style="padding-top:5px;">
-									<el-badge value="新手">
-									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的项目</el-button> 
-									</el-badge>
-								</el-col> 
-							</el-row>   
- 							<el-button id="prj-plus-btn" type="primary" slot="reference"  icon="el-icon-plus">项目</el-button>
-							</el-popover>  
-					
+					<el-button  type="primary" icon="el-icon-search" @click="searchXmProjects">查询</el-button> 
 						<el-popover
 							placement="top-start"
 							title="更多查询条件或操作"
@@ -96,6 +72,31 @@
 							</el-row>
 							<el-button  slot="reference" icon="el-icon-more" id="prj-more-btn"></el-button>
 						</el-popover>
+						<span style="float:right;">
+						<el-popover style="padding-left:10px;"  
+							placement="top-start"
+							width="450" 
+							trigger="click" > 
+							<el-row> 
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="都适用">
+									<el-button   @click="showAdd" icon="el-icon-plus">直接添加新项目</el-button> 
+									</el-badge>
+								</el-col>  
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="进阶">
+									<el-button type="primary" icon="el-icon-plus">通过【产品-复制】一键创建新的项目</el-button> 
+									</el-badge>
+								</el-col> 
+								<el-col :span="24" style="padding-top:5px;">
+									<el-badge value="新手">
+									<el-button type="warning" @click="templateVisible=!templateVisible" icon="el-icon-plus">通过【模板-复制】一键创建新的项目</el-button> 
+									</el-badge>
+								</el-col> 
+							</el-row>   
+ 							<el-button id="prj-plus-btn" type="primary" slot="reference"  icon="el-icon-plus" round>项目</el-button>
+							</el-popover>  
+						</span>
 				</el-row> 
 				<el-row  class="page-main"> 
 					<!--列表 XmProject xm_project-->
diff --git a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
index 405ac488..88f72614 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionEdit.vue
@@ -25,7 +25,7 @@
 			</el-row> 
 			<el-divider></el-divider>
 			<el-row>
-				<el-form :model="editForm"  :rules="editFormRules" ref="editForm"> 
+				<el-form :model="editForm" label-width="120px" :rules="editFormRules" ref="editForm"> 
 						<el-row> 
 							<el-col  :span="12">
 								<el-form-item label="归属任务" prop="taskName"> 
diff --git a/src/views/xm/core/xmQuestion/XmQuestionMng.vue b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
index f134c396..235a0f93 100644
--- a/src/views/xm/core/xmQuestion/XmQuestionMng.vue
+++ b/src/views/xm/core/xmQuestion/XmQuestionMng.vue
@@ -20,9 +20,6 @@
 				<el-input style="width:200px;" v-model="filters.key" placeholder="缺陷名称" clearable> 
 				</el-input>
 				<el-button @click="searchXmQuestions" type="primary" icon="el-icon-search"></el-button> 
-				<span style="float:right;">
-				<el-button type="primary" icon="el-icon-plus" @click="showAdd">
-				</el-button>
 				<el-popover
 					placement="top-start"
 					title="更多查询条件或操作"
@@ -122,6 +119,9 @@
 					</el-row>
 					<el-button  slot="reference" icon="el-icon-more"></el-button>
 				</el-popover> 
+				<span style="float:right;">
+				<el-button type="primary" icon="el-icon-plus" @click="showAdd" round>
+				</el-button> 
 				</span>
 			 </el-row> 
 			 <el-row class="padding-top">