From 029dc5ba6dc092bea19bc26cf42e68c274aeac4d 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, 10 Feb 2023 00:30:21 +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/components/XmIterationSelect.vue  |  9 +++++----
 src/views/xm/core/components/XmProductSelect.vue    | 12 +++---------
 src/views/xm/core/components/XmProjectSelect.vue    |  2 +-
 .../xm/core/xmIterationMenu/XmIterationMenuMng.vue  | 13 ++++---------
 4 files changed, 13 insertions(+), 23 deletions(-)

diff --git a/src/views/xm/core/components/XmIterationSelect.vue b/src/views/xm/core/components/XmIterationSelect.vue
index a29610ea..55bf8789 100644
--- a/src/views/xm/core/components/XmIterationSelect.vue
+++ b/src/views/xm/core/components/XmIterationSelect.vue
@@ -11,9 +11,8 @@
 				icon="el-icon-refresh"
 				@click="refreshSelect"
 				title="重新从后台刷新数据回来"
-				>刷新</el-button>&nbsp;&nbsp;
-				<el-button v-if="clearable!==false && editForm && editForm.id" type="text" icon="el-icon-circle-close" @click="clearSelectIteration" title="清空当前选中的迭代">清空&nbsp;&nbsp;</el-button> 
-				
+				>刷新</el-button> 
+ 				
 				<el-button
 					@click="addIterationVisible = true"
 					icon="el-icon-plus"
@@ -112,6 +111,8 @@
  					<el-table-column prop="iterationName" label="迭代" > 
 						<template slot-scope="scope"> 
 							<div class="icon" style="background-color:#409eff"><i class="el-icon-connection" ></i></div>{{scope.row.iterationName}}  <font   :color="calcFinishRate(scope.row)==100?'green':'#FF8C00'">{{calcFinishRate(scope.row)}}%</font>
+							<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelectIteration()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
+
 						</template>
 					</el-table-column> 
 				</el-table>
@@ -135,7 +136,7 @@
 									}} 
 									</div>
 							</el-link>
-							 <el-button v-if="editForm&&editForm.id" type="text"  icon="el-icon-circle-close" @click.stop="clearSelectIteration"></el-button>&nbsp;
+							 <el-button type="text" size="mini" title="取消选中状态" circle plain  v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelectIteration"></el-button>&nbsp;
 							</slot>
 					</div>
 				</slot>
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 197a20ad..68da108e 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -13,14 +13,6 @@
           @click="refreshSelect"
           title="重新从后台刷新数据回来"
           >刷新</el-button
-        >&nbsp;&nbsp;
-        <el-button
-          v-if="editForm && editForm.id"
-          type="text"
-          icon="el-icon-circle-close"
-          @click="clearSelect"
-          title="清空当前选中的产品"
-          >取消选中状态&nbsp;&nbsp;</el-button
         >
 		<el-button
               @click="addProductVisible = true"
@@ -167,6 +159,8 @@
             <template slot="header" slot-scope="scope"> 产品名称 </template>
             <template slot-scope="scope">
               <div class="icon" style="background-color:#409eff"><i class="el-icon-s-opportunity" ></i></div><font>{{ scope.row.productName }}</font>
+              <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="clearSelect()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
+
             </template>
           </el-table-column>
         </el-table>
@@ -204,7 +198,7 @@
               }} 
               </div>
               </el-link> 
-              <el-button v-if="editForm&&editForm.id" type="text" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
+              <el-button  type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
             </slot>
               </div>
             
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 8256d82b..360a6cea 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -200,7 +200,7 @@
               }} 
               </div>
               </el-link>
-              <el-button v-if="editForm&&editForm.id" type="text" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
+              <el-button type="text" size="mini" title="取消选中状态" circle plain v-if="editForm&&editForm.id" icon="el-icon-circle-close" @click.stop="clearSelect"></el-button>&nbsp;
             </slot>
               </span>
         </slot>
diff --git a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
index f32d721e..45d76170 100644
--- a/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
+++ b/src/views/xm/core/xmIterationMenu/XmIterationMenuMng.vue
@@ -25,7 +25,7 @@
 
 								<el-table-column prop="menuName" label="已加入迭代的用户故事" min-width="140" >
 									<template slot-scope="scope">
-
+										<div style="display:flex;">
 									<div  v-if="scope.row.dclass=='1'" class="icon" style="background-color:  rgb(255, 153, 51);">
 										<i class="el-icon-s-promotion"></i>
 										</div>
@@ -35,14 +35,9 @@
 										<div v-if="scope.row.dclass=='3'" class="icon" style="background-color:  rgb(79, 140, 255);">
 										<i class="el-icon-document"></i>
 									</div>
-										<span class="vlink" type="primary">{{scope.row.seqNo}}
-										&nbsp;&nbsp;{{scope.row.menuName}}
-										</span>
-										<div class="tool-bar">
-											<span class="u-btn"> 
-												<el-button      @click="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle plain > </el-button>     
-											</span>
-										</div>
+										 <el-link @click="showEdit( scope.row,scope.$index)" >{{scope.row.seqNo}}
+										&nbsp;&nbsp;{{scope.row.menuName}}</el-link>  
+									</div>
 									</template>
 								</el-table-column> 
 								<el-table-column prop="finishRate" label="进度" width="100" show-overflow-tooltip sortable>