diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index ade63a1b..f7973899 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -110,21 +110,19 @@
 						</div>
 						<span class="hidden-md-and-down">{{scope.row.seqNo}}</span><span>{{scope.row.menuName}} </span>
 						
+						<div class="tool-bar" v-if="!disabledMng" @click.stop>
+							<el-popover 
+								placement="top"
+								width="100"  
+								open-delay="500"
+								trigger="hover"> 
+								<el-button type="primary" style="margin-left:0px;margin-bottom: 10px;"  v-if=" scope.row.dclass==='1' "  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性"  > 新建特性 </el-button>
 
-						<div class="tool-bar hidden-lg-and-up" v-if="!disabledMng">
-								<span class="u-btn">
-									<el-button size="mini"   v-if=" scope.row.dclass==='1' "  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性" circle > </el-button>
-										
-							<el-button  size="mini"    @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle  > </el-button>     
-						</span>
-						</div>
-						<div class="tool-bar hidden-md-and-down" v-if="!disabledMng">
-								<span class="u-btn">
-									<el-button size="mini"   v-if=" scope.row.dclass==='1' "  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性" circle > </el-button>
-										
-							<el-button  size="mini"    @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle  > </el-button>     
-						</span>
-						</div>
+								<el-button style="margin-left:0px;margin-bottom: 10px;"   @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑"   >修改 </el-button>     
+
+ 								<el-button slot="reference" icon="el-icon-setting" circle plain></el-button>
+							</el-popover>  		
+ 						</div>
 						<el-tag style="float:right;" class="hidden-md-and-down" v-for="(item,index) in formatDictsWithClass(dicts,'menuStatus',scope.row.status)" :key="index" :type="item.className">{{item.name}}</el-tag>
 						<span
 							:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue',float:'right'}" 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 9807a306..6e240739 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -148,19 +148,16 @@
                   </span>
                   <span> {{ scope.row.name }}
                     </span>
-                    <div class="tool-bar left">
-                    <span class="u-btn">
+                    <div class="tool-bar" @click.stop> 
                         <el-popover
                           placement="top-start"
-                          title="选择创建计划/任务的方式" 
-                          trigger="click"
+                          open-delay="500"
+                          title="创建、修改计划" 
+                          trigger="hover"
                         >
                           <el-row>
                             <el-row>
-                              
-                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                                <i :class=" 'el-icon-time' " ></i>
-                              </div>  
+                               
                               <el-button 
                                 @click="showEpicFeaturesForCreateSubTask(scope.row)" 
                                 icon="el-icon-plus"
@@ -168,10 +165,7 @@
                               >
                             </el-row>
                             <el-row>
-                              
-                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                                <i :class=" 'el-icon-time' " ></i>
-                              </div>  
+                               
                               <el-button 
                                 @click="showTaskTemplate"
                                 icon="el-icon-plus"
@@ -179,17 +173,21 @@
                               >
                             </el-row>
                             <el-row>
-                              
-                              <div    class="icon" :style="{backgroundColor:   '#E6A23C'}">
-                                <i :class=" 'el-icon-time' " ></i>
-                              </div>  
-                              <el-button   @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>   
+                               
+                              <el-button type="primary"  @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>   
                            </el-row>
                           </el-row> 
-                           <el-button   slot="reference"  icon="el-icon-plus" title="新建子计划" circle plain > </el-button>   
-                        </el-popover> 
-                        <el-button      @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle plain > </el-button>     
-                     </span>
+                          <el-row>
+                             
+                            <el-button      @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑"  > 编辑计划</el-button>     
+                          </el-row>
+                          <el-row>
+                             
+                            <el-button   v-if="editForm && editForm.id==scope.row.id"   @click.stop="unselectRow()" icon="el-icon-close" title="编辑"  > 清除选中状态</el-button>     
+                          </el-row>
+                           <el-button   slot="reference"  icon="el-icon-setting" title="新建\修改计划" circle plain > </el-button>   
+
+                        </el-popover>  
 									</div>
                   <el-tag style="float: right;" class="hidden-md-and-down" v-for="(item,index) in formatDictsWithClass(dicts,'taskState',scope.row.taskState)" :key="index" :type="item.className">{{item.name}}</el-tag>