From 2576d7018d57eadb05ee27145ece1bf5d2b652dd 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 23:48:04 +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/xmFunc/XmFuncSelect.vue     |  2 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   |  4 +--
 .../xm/core/xmMenu/XmEpicFeaturesSelect.vue   |  2 +-
 src/views/xm/core/xmTask/XmPhase.vue          | 25 ++++++++-----------
 src/views/xm/core/xmTask/XmPhaseSelect.vue    |  5 ++--
 .../xm/core/xmTestPlan/XmTestPlanMng.vue      |  2 +-
 6 files changed, 18 insertions(+), 22 deletions(-)

diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index f57e58c0..b446f354 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -17,7 +17,7 @@
 									 
 									<span> {{scope.row.name}}</span> 
  									 <div class="tool-bar"> 
-                                        <el-popover :open-delay="500"
+                                        <el-popover :open-delay=500
                                             placement="top-start"
                                             title="增删改"
                                             width="400"
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index f809ff3b..e19fa79e 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeatures.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
@@ -79,7 +79,7 @@
 			</div>
 			</el-row> 
 		<el-row >
-			<el-table ref="table" row-style="height:46px;" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc"    stripe fit border  :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"
+			<el-table ref="table" :row-style="{height:'46px'}" :cell-style="cellStyleCalc" :expand-row-keys="expandRowKeysCpd" :header-cell-style="cellStyleCalc"    stripe fit border  :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick"
 				element-loading-text="努力加载中"
 				element-loading-spinner="el-icon-loading" 
 			>
@@ -110,7 +110,7 @@
 							<el-popover class="tool-bar" v-if="!disabledMng"  @click.stop
 								placement="top"
 								width="100"  
-								open-delay="500"
+								: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>
 
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index a2fc7704..6d760a54 100644
--- a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
+++ b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
@@ -8,7 +8,7 @@
 			<el-button v-if="showSelect!==false && multi===true" type="primary" @click="selectConfirm()">确认选择</el-button> 
 			</el-row>
 		<el-row>
-			<el-table element-loading-text="努力加载中" row-style="height:46px;" element-loading-spinner="el-icon-loading"    stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
+			<el-table element-loading-text="努力加载中" :row-style="{height:'46px'}" element-loading-spinner="el-icon-loading"    stripe fit border ref="table" :height="maxTableHeight" :data="xmMenusTreeData" current-row-key="menuId" row-key="menuId" :tree-props="{children: 'children'}" @sort-change="sortChange" highlight-current-row v-loading="load.list" @selection-change="selsChange" @row-click="rowClick">
 				<template v-if="showSelect!==false && multi===true">
 					<el-table-column   label="" type="selection"  width="60"  >  
 					</el-table-column> 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 78581125..2fb07617 100644
--- a/src/views/xm/core/xmTask/XmPhase.vue
+++ b/src/views/xm/core/xmTask/XmPhase.vue
@@ -99,7 +99,7 @@
         </el-row>
 
         <el-row> 
-            <el-table class="task-table" row-style="height:46px;"
+            <el-table class="task-table" :row-style="{height:'46px'}"
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
               @sort-change="sortChange"
@@ -147,12 +147,10 @@
                     {{ scope.row.sortLevel }}&nbsp;
                   </span>
                   <span> {{ scope.row.name }}
-                    </span>
-                    <div class="tool-bar" @click.stop> 
-                        <el-popover
+                    </span> 
+                        <el-popover class="tool-bar" @click.stop
                           placement="top-start"
-                          open-delay="500"
-                          title="创建、修改计划" 
+                          :open-delay=500 
                           trigger="hover"
                         >
                           <el-row>
@@ -180,19 +178,16 @@
                           <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-row> 
+                          <el-button type="text" slot="reference" icon="el-icon-setting" size="mini" circle plain></el-button>
+
+                        </el-popover>   
+                  <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></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>
 
                   <el-link
-                    style="border-radius: 30px; float: right;"
+                    style="float: right;line-height: 24px;height: 24px;"
                     :type="scope.row.rate >= 100 ? 'success' : 'warning'"
                     @click.stop="calcProgress(scope.row)"
                     class="el-icon-refresh"
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index 45dab0e4..193fe6da 100644
--- a/src/views/xm/core/xmTask/XmPhaseSelect.vue
+++ b/src/views/xm/core/xmTask/XmPhaseSelect.vue
@@ -7,7 +7,7 @@
         </el-row>
 
         <el-row class="padding-top"> 
-            <el-table class="task-table" row-style="height:46px;"
+            <el-table class="task-table" :row-style="{height:'46px'}" 
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
               @sort-change="sortChange"
@@ -40,7 +40,7 @@
                 min-width="300" show-overflow-tooltip
               >
               
-              <template slot="header">计划名称 &nbsp;<el-button type="text" @click="unselectRow()">取消选中状态</el-button></template>
+              <template slot="header">计划名称</template>
                 <template slot-scope="scope">
                   <div    class="icon" :style="{backgroundColor:  scope.row.ntype==='1'?'#E6A23C':'#409EFF'}">
 									<i :class="scope.row.ntype==='1'?'el-icon-time':'el-icon-s-operation'" ></i>
@@ -48,6 +48,7 @@
                   <span>
                     {{ scope.row.sortLevel }}&nbsp;  {{ scope.row.name }}
                     </span> 
+                    <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.id==scope.row.id" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
                 </template>
               </el-table-column>
               
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
index c0c90414..fc213e84 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanMng.vue
@@ -54,7 +54,7 @@
 				</el-table-column> 
 				<el-table-column prop="totalCases" label="进度" min-width="120" show-overflow-tooltip>
 				    <template slot-scope="scope"> 
-                        <el-tooltip :open-delay="300" :content="'总用例数:'+scope.row.totalCases+'   成功:'+scope.row.okCases +'  失败:'+scope.row.errCases+'  忽略:'+scope.row.igCases+'  阻塞:'+scope.row.blCases">
+                        <el-tooltip open-delay=300 :content="'总用例数:'+scope.row.totalCases+'   成功:'+scope.row.okCases +'  失败:'+scope.row.errCases+'  忽略:'+scope.row.igCases+'  阻塞:'+scope.row.blCases">
                             <el-progress   :stroke-width="22" :text-inside="true"  :status="scope.row.totalCases>0 && scope.row.errCases<=0 ?'success':'exception'" :percentage="scope.row.totalCases>0?parseInt((parseInt(scope.row.okCases)+parseInt(scope.row.igCases)+parseInt(scope.row.errCases)+parseInt(scope.row.blCases))*100/parseInt(scope.row.totalCases)):0"></el-progress>
                         </el-tooltip>  
                      </template>