From 920c02f0d55cc32af6fdcf20f1acdb6dcd6ae9f3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Thu, 9 Feb 2023 02:55:33 +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/styles/mdp.scss                         |  2 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue | 23 ++++++++-----
 src/views/xm/core/xmTask/XmPhase.vue        | 37 ++++++++++++---------
 3 files changed, 36 insertions(+), 26 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 69a0475d..72c5d548 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -238,7 +238,7 @@
 }
 
 .tool-bar{ 
-  z-index: 10000;  
+  z-index: 500;  
   top: 50%; 
   right:0%; 
   transform: translate(-10%, -50%);
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index b48817d6..2c48c008 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -110,19 +110,20 @@
 						</div>
 						<span class="hidden-md-and-down">{{scope.row.seqNo}}</span><span>{{scope.row.menuName}} </span>
 						
-						<span
-							:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
-						>
-							{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
-						</span>  
-							<el-tag 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>
-							<div class="tool-bar" v-if="!disabledMng">
+
+							<div class="tool-bar left" v-if="!disabledMng">
 						<span class="u-btn">
-									<el-button  v-if=" scope.row.dclass==='1' "  @click.stop="showSubAdd( scope.row,scope.$index)" icon="el-icon-plus" title="新建特性" circle plain > </el-button>
+									<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      @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle plain > </el-button>     
+							<el-button  size="mini"    @click.stop="showEdit( scope.row,scope.$index)" icon="el-icon-edit" title="编辑" circle  > </el-button>     
 						</span>
 						</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'}" 
+						>
+							{{ (scope.row.finishRate != null ? scope.row.finishRate : 0) + "%" }}
+						</span>  
 					</template> 
 				</el-table-column> 
 			</el-table>  
@@ -741,6 +742,10 @@
 .align-right{
 	float: right;
 }
+.tool-bar.left{  
+  
+  transform: translate(-100%, -50%);
+}
 </style>
 
 <style lang="scss">
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 129a10cb..d976139c 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -126,8 +126,7 @@
               <el-table-column 
                 prop="name"
                 class-name="title" 
-                label="计划名称"
-                min-width="300"
+                label="计划名称" 
               > 
               <template slot="header"> 
 									<div style="display:flex;">
@@ -145,23 +144,15 @@
 									</div>  
                   -->
                   <span class="hidden-md-and-down">
-                    {{ scope.row.sortLevel }}&nbsp;</span><span> {{ scope.row.name }}
+                    {{ scope.row.sortLevel }}&nbsp;
+                  </span>
+                  <span> {{ scope.row.name }}
                     </span>
-                  <el-link  
-                    style="border-radius: 30px"
-                    :type="scope.row.rate >= 100 ? 'success' : 'warning'"
-                    @click.stop="calcProgress(scope.row)"
-                    class="el-icon-refresh"
-                  >
-                    {{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
-                  </el-link> 
-                   <el-tag 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>
-									<div class="tool-bar">
+                    <div class="tool-bar left">
                     <span class="u-btn">
                         <el-popover
                           placement="top-start"
-                          title="选择创建计划/任务的方式"
-                          width="300"
+                          title="选择创建计划/任务的方式" 
                           trigger="click"
                         >
                           <el-row>
@@ -195,11 +186,22 @@
                               <el-button   @click.stop="showSubAdd( scope.row,scope.$index,'1')" icon="el-icon-plus" title="新建子计划">直接创建子计划 </el-button>   
                            </el-row>
                           </el-row> 
-                           <el-button   slot="reference"  :style="{backgroundColor:  '#E6A23C'}"   icon="el-icon-plus" title="新建子计划" circle plain > </el-button>   
+                           <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>
 									</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>
+
+                  <el-link
+                    style="border-radius: 30px; float: right;"
+                    :type="scope.row.rate >= 100 ? 'success' : 'warning'"
+                    @click.stop="calcProgress(scope.row)"
+                    class="el-icon-refresh"
+                  >
+                    {{ (scope.row.rate != null ? scope.row.rate : 0) + "%" }}
+                  </el-link> 
+									
                 </template>
               </el-table-column>    
             </el-table>
@@ -1141,5 +1143,8 @@ export default {
   overflow-x: auto;
   overflow-y: hidden;
 }
+.tool-bar.left{  
   
+  transform: translate(-160%, -50%);
+}
 </style>