From 6040bb908350e84e4b17ad3bad4dab22744fbb56 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:30:27 +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                           |  5 ----
 .../xm/core/components/XmProductSelect.vue    |  2 +-
 .../xm/core/components/XmProjectSelect.vue    |  2 +-
 src/views/xm/core/xmFunc/XmFuncSelect.vue     |  2 +-
 src/views/xm/core/xmMenu/XmEpicFeatures.vue   | 25 ++++++++-----------
 .../xm/core/xmMenu/XmEpicFeaturesSelect.vue   |  4 +--
 src/views/xm/core/xmTask/XmPhase.vue          |  8 +++---
 src/views/xm/core/xmTask/XmPhaseSelect.vue    |  4 +--
 8 files changed, 22 insertions(+), 30 deletions(-)

diff --git a/src/styles/mdp.scss b/src/styles/mdp.scss
index 0b1f6038..5af02a52 100644
--- a/src/styles/mdp.scss
+++ b/src/styles/mdp.scss
@@ -238,11 +238,6 @@
 }
 
 .tool-bar{ 
-  z-index: 500;  
-  top: 50%; 
-  right:0%; 
-  transform: translate(-10%, -50%);
-  position:absolute; 
 	visibility: hidden;
 }
 
diff --git a/src/views/xm/core/components/XmProductSelect.vue b/src/views/xm/core/components/XmProductSelect.vue
index 0010adce..197a20ad 100644
--- a/src/views/xm/core/components/XmProductSelect.vue
+++ b/src/views/xm/core/components/XmProductSelect.vue
@@ -20,7 +20,7 @@
           icon="el-icon-circle-close"
           @click="clearSelect"
           title="清空当前选中的产品"
-          >清除选中&nbsp;&nbsp;</el-button
+          >取消选中状态&nbsp;&nbsp;</el-button
         >
 		<el-button
               @click="addProductVisible = true"
diff --git a/src/views/xm/core/components/XmProjectSelect.vue b/src/views/xm/core/components/XmProjectSelect.vue
index 0577cf32..b4cbc600 100644
--- a/src/views/xm/core/components/XmProjectSelect.vue
+++ b/src/views/xm/core/components/XmProjectSelect.vue
@@ -20,7 +20,7 @@
           icon="el-icon-circle-close"
           @click="clearSelect"
           title="清空当前选中的项目"
-          >清除选中&nbsp;&nbsp;</el-button
+          >取消选中状态&nbsp;&nbsp;</el-button
         >
 		<el-button
               @click="addProjectVisible = true"
diff --git a/src/views/xm/core/xmFunc/XmFuncSelect.vue b/src/views/xm/core/xmFunc/XmFuncSelect.vue
index fbe41029..f57e58c0 100644
--- a/src/views/xm/core/xmFunc/XmFuncSelect.vue
+++ b/src/views/xm/core/xmFunc/XmFuncSelect.vue
@@ -12,7 +12,7 @@
 			<el-table ref="xmFuncTable"  element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"  :data="xmFuncsTreeData" :max-height="maxTableHeight" @sort-change="sortChange" highlight-current-row v-loading="load.list" border @selection-change="selsChange" @row-click="rowClick" style="width: 100%;" current-row-key="id" row-key="id" :tree-props="{children: 'children'}" >
 				 
                 <el-table-column prop="name" label="模块" min-width="150" > 
-								<template slot="header"> 模块 &nbsp;<slot name="title-bar"></slot><el-button type="text" @click="unselectRow()">清除选中的行</el-button></template>
+								<template slot="header"> 模块 &nbsp;<slot name="title-bar"></slot><el-button type="text" @click="unselectRow()">取消选中状态</el-button></template>
 								<template slot-scope="scope">
 									 
 									<span> {{scope.row.name}}</span> 
diff --git a/src/views/xm/core/xmMenu/XmEpicFeatures.vue b/src/views/xm/core/xmMenu/XmEpicFeatures.vue
index f7973899..f809ff3b 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" :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" 
 			>
@@ -90,15 +90,12 @@
 				<el-table-column prop="menuName" label="史诗、特性名称" min-width="150" > 
 					<template slot="header">
 						<div style="display:flex;"> 
-							<div style="text-align: center;line-height: 32px;" title="史诗特性名称">史诗、特性</div>
-							&nbsp;&nbsp;
-							<el-button type="text" icon="el-icon-circle-close " class="hidden-md-and-down" @click="unselectRow()" title="清除选中的行">清除选中</el-button>
-							<el-button type="text" icon="el-icon-circle-close " class="hidden-lg-and-up" @click="unselectRow()" title="清除选中的行"></el-button>
-
+							<div style="text-align: center;line-height: 32px;" title="史诗特性名称">史诗、特性</div> 
+ 
 							<el-input v-if=" !xmProduct || !xmProduct.id" v-model="filters.key" style="width:50%;margin-left: auto;"  placeholder="名称模糊查询"  clearable></el-input>  
 						</div>
 					</template>
-					<template slot-scope="scope"> 
+					<template slot-scope="scope">  
 						<div  v-if="scope.row.dclass=='1'" class="icon hidden-md-and-down" style="background-color:  rgb(255, 153, 51);">
 						<i class="el-icon-s-promotion"></i>
 						</div>
@@ -108,10 +105,9 @@
 						<div v-if="scope.row.dclass=='3'" class="icon hidden-md-and-down" style="background-color:  rgb(79, 140, 255);">
 						<i class="el-icon-document"></i>
 						</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 
+						<span class="hidden-md-and-down">{{scope.row.seqNo}}</span>
+						<span>{{scope.row.menuName}} </span>
+							<el-popover class="tool-bar" v-if="!disabledMng"  @click.stop
 								placement="top"
 								width="100"  
 								open-delay="500"
@@ -120,15 +116,16 @@
 
 								<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-button type="text" slot="reference" icon="el-icon-setting" size="mini" circle plain></el-button>
 							</el-popover>  		
- 						</div>
+						 <el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
+
 						<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>  
+						</span>   
 					</template> 
 				</el-table-column> 
 			</el-table>  
diff --git a/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue b/src/views/xm/core/xmMenu/XmEpicFeaturesSelect.vue
index dd7315bd..a2fc7704 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="努力加载中" 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> 
@@ -28,7 +28,7 @@
 						<i class="el-icon-document"></i>
 						</div>
 						<span class="hidden-md-and-down">{{scope.row.seqNo}} &nbsp;</span><span>{{scope.row.menuName}} </span> 
-						<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="清除选中的行" icon="el-icon-circle-close"></el-button>
+						<el-button type="text" size="mini" circle plain v-if="editForm&&editForm.menuId==scope.row.menuId" @click.stop="unselectRow()" title="取消选中状态" icon="el-icon-circle-close"></el-button>
 
 						<span  style="float:right;"
 							:style="{borderRadius: '30px',color:scope.row.finishRate >= 100 ? 'green' : 'blue'}" 
diff --git a/src/views/xm/core/xmTask/XmPhase.vue b/src/views/xm/core/xmTask/XmPhase.vue
index 6e240739..78581125 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" 
+            <el-table class="task-table" row-style="height:46px;"
              element-loading-text="努力加载中" element-loading-spinner="el-icon-loading"
               :data="tasksTreeData"
               @sort-change="sortChange"
@@ -132,8 +132,8 @@
 									<div style="display:flex;">
 										<div style="text-align: center;line-height: 32px;">计划名称</div>
 										&nbsp;&nbsp;
-										<el-button type="text" class="hidden-lg-and-up" icon="el-icon-circle-close" @click="unselectRow()" title="清除选中的行">清除选中</el-button>
-										<el-button type="text" class="hidden-md-and-down" icon="el-icon-circle-close" @click="unselectRow()" title="清除选中的行">清除选中的行</el-button>
+										<el-button type="text" class="hidden-lg-and-up" icon="el-icon-circle-close" @click="unselectRow()" title="取消选中状态">取消选中状态</el-button>
+										<el-button type="text" class="hidden-md-and-down" icon="el-icon-circle-close" @click="unselectRow()" title="取消选中状态">取消选中状态</el-button>
 										<el-input v-if=" !selProject || !selProject.id" v-model="filters.key" style="width:50%;margin-left: auto;"  placeholder="名称模糊查询"  clearable></el-input>  
 									</div>
               </template>
@@ -183,7 +183,7 @@
                           </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-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>   
 
diff --git a/src/views/xm/core/xmTask/XmPhaseSelect.vue b/src/views/xm/core/xmTask/XmPhaseSelect.vue
index b899cd04..45dab0e4 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" 
+            <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">计划名称 &nbsp;<el-button type="text" @click="unselectRow()">取消选中状态</el-button></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>