From 83dabad9b1eebc345a9eb670f715060cece97891 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Tue, 13 Jul 2021 16:53:34 +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/xmIteration/XmIterationSelect.vue | 2 +-
 src/views/xm/core/xmMenu/XmMenuMng.vue              | 2 +-
 src/views/xm/core/xmProduct/XmProductMng.vue        | 2 +-
 src/views/xm/core/xmProduct/XmProductSelect.vue     | 2 +-
 src/views/xm/core/xmProject/XmProjectInfo.vue       | 9 ++++-----
 5 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 7717c3bb..c062b842 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -59,7 +59,7 @@
 						 {{scope.row.seqNo}} &nbsp;&nbsp;{{scope.row.iterationName}}<br>
 						 <font class="font-class">{{formatterDate(scope.row,null,scope.row.startTime)}}~{{formatterDate(scope.row,null,scope.row.endTime)}} </font> 
 						 <el-tag type="warning">{{!scope.row.iphase?'未开始':scope.row.iphase}}</el-tag>
-						 <el-tooltip content="点击统计进度"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmIterationState( scope.row)"></el-button></el-tooltip>
+						 <el-tooltip content="点击统计进度，由任务汇总"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmIterationState( scope.row)"></el-button></el-tooltip>
   						 <div class="progress">
 						  <el-progress  :percentage="calcFinishRate(scope.row)"></el-progress>
 						 </div>
diff --git a/src/views/xm/core/xmMenu/XmMenuMng.vue b/src/views/xm/core/xmMenu/XmMenuMng.vue
index d4a171e8..0486c2f7 100644
--- a/src/views/xm/core/xmMenu/XmMenuMng.vue
+++ b/src/views/xm/core/xmMenu/XmMenuMng.vue
@@ -85,7 +85,7 @@
 									<el-button size="mini" v-if=" batchEditVisible==false "  @click="handleExport" icon="el-icon-download">导出</el-button> 
 									<el-button size="mini"  v-if=" batchEditVisible==true "  type="success" @click="showImportFromMenuTemplate" icon="el-icon-upload2">由模板快速导入</el-button> 
 									
-									<el-button size="mini"  v-if=" batchEditVisible==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">刷新统计数据</el-button>  
+									<el-button size="mini"  v-if=" batchEditVisible==false "       @click="loadTasksToXmMenuState" icon="el-icon-s-marketing">由任务汇总统计数据</el-button>  
 								</el-col> 
 							</el-row> 
 							<el-button  slot="reference" icon="el-icon-more" circle></el-button>
diff --git a/src/views/xm/core/xmProduct/XmProductMng.vue b/src/views/xm/core/xmProduct/XmProductMng.vue
index a43c607d..c5816cd3 100644
--- a/src/views/xm/core/xmProduct/XmProductMng.vue
+++ b/src/views/xm/core/xmProduct/XmProductMng.vue
@@ -101,7 +101,7 @@
 						<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag>
 						
 						<el-tooltip content="产品经理"><el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag></el-tooltip>
-						<el-tooltip content="点击统计进度"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
+						<el-tooltip content="点击统计进度，由任务汇总"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
 
 						</font>
 					</template>
diff --git a/src/views/xm/core/xmProduct/XmProductSelect.vue b/src/views/xm/core/xmProduct/XmProductSelect.vue
index 475e5417..b2fe7c33 100644
--- a/src/views/xm/core/xmProduct/XmProductSelect.vue
+++ b/src/views/xm/core/xmProduct/XmProductSelect.vue
@@ -71,7 +71,7 @@
 						<font class="align-right"><el-tag :type="scope.row.finishRate>=100?'success':'warning'">{{scope.row.finishRate}}%</el-tag>
 						
 						<el-tooltip content="产品经理"><el-tag v-if="scope.row.pmUsername">{{scope.row.pmUsername}}</el-tag></el-tooltip>
-						<el-tooltip content="点击统计进度"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
+						<el-tooltip content="点击统计进度，由任务进度汇总而成"><el-button size="mini" icon="el-icon-video-play" @click.stop="loadTasksToXmProductState( scope.row)"></el-button></el-tooltip>
 
 						</font>
 					</template>
diff --git a/src/views/xm/core/xmProject/XmProjectInfo.vue b/src/views/xm/core/xmProject/XmProjectInfo.vue
index 33889112..b25be9c0 100644
--- a/src/views/xm/core/xmProject/XmProjectInfo.vue
+++ b/src/views/xm/core/xmProject/XmProjectInfo.vue
@@ -2,14 +2,13 @@
 	<section  class="page-container page-full-height">
 		<el-row>   
 			<el-menu :default-active="'项目概览'"   mode="horizontal"  @select="setInfotype"   class="menus" background-color="#545c64" text-color="#fff" active-text-color="#ffd04b">
-				<el-menu-item  index="返回" > 
-					<span slot="title" @click.stop="goBack"><i class="el-icon-back" ></i></span>
-				</el-menu-item>
+ 
 				<el-menu-item  index="项目概览" > 
 					<span slot="title" >
+						<span slot="title" @click.stop="goBack"><i class="el-icon-back" ></i></span>
 						<i class="el-icon-s-data"></i>
-						<el-tag type="danger" v-if="selProject.name.length>=10">{{selProject.name.substring(0,10)}}</el-tag>
-						<el-tag type="danger" v-else>{{selProject.name}}</el-tag>
+						<font v-if="selProject.name.length>=10">{{selProject.name.substring(0,10)}}</font>
+						<font type="danger" v-else>{{selProject.name}}</font>
 						概览
 					</span> 
 				</el-menu-item>