From 506c3e3a0d4b7905d08d1e7b52bf96886e7bdad2 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, 20 Jul 2021 00:53:53 +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

---
 .../xmIteration/XmIterationForProjectComplex.vue | 16 ++++++++--------
 .../xm/core/xmIteration/XmIterationSelect.vue    |  3 +--
 src/views/xm/core/xmProject/XmProjectComplex.vue |  4 ++--
 3 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
index 616476d3..16f16a15 100644
--- a/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForProjectComplex.vue
@@ -5,27 +5,27 @@
 				<xm-iteration-select :sel-project="selProject" :product-id="xmProduct?xmProduct.id:null"  @row-click="onIterationRowClick" @clear-select="onIterationClearSelect"></xm-iteration-select>
 			</el-col>  
 			<el-col :span="iterationVisible==true?21:24" >  
-				<el-tabs type="border-card"  :v-model="showPanel" activate-name="iterationOverview" @tab-click="tabClick">  
+				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">  
 					
 					<el-tab-pane label="迭代概览" lazy  name="iterationOverview">
 						<span v-show="iterationVisible==true" slot="label" ><i class="el-icon-d-arrow-left" @click.stop="iterationVisible=false"></i> 迭代概览</span>
 						<span v-show="iterationVisible==false" slot="label" ><i class="el-icon-d-arrow-right" @click.stop="iterationVisible=true"></i> 迭代概览</span> 
-						<xm-iteration-state-show v-show="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-state-show>
+						<xm-iteration-state-show v-if="xmIteration && showPanel=='iterationOverview'"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-state-show>
 					</el-tab-pane> 
 					<el-tab-pane label="产品、战略"   name="products" v-if="!xmProduct">    
-						 <xm-product-mng  v-show="xmIteration && showPanel=='products' && !xmProduct"    :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-mng>
+						 <xm-product-mng  v-if="xmIteration && showPanel=='products' && !xmProduct"    :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-mng>
  					</el-tab-pane>  
 					<el-tab-pane label="项目"   name="projects" v-if="!selProject">    
-  						<xm-project-for-link v-show="xmIteration && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-project-for-link>
+  						<xm-project-for-link v-if="xmIteration && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-project-for-link>
 					</el-tab-pane> 
 					<el-tab-pane label="故事" lazy name="menus" >  
-						<xm-menu-mng v-show="xmIteration && showPanel=='menus'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-menu-mng>
+						<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="selProject"></xm-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="任务" lazy name="tasks" >
-						<xm-task-mng v-show="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
+						<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-task-mng>
 					</el-tab-pane>
 					<el-tab-pane label="缺陷" lazy name="bugs" > 
-						<xm-question-mng v-show="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
+						<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
 					</el-tab-pane>
 				</el-tabs>
 				<el-row>
@@ -70,7 +70,7 @@
 		data() {
 			 return{
 				xmIteration:null,
-				showPanel:'products',//menus,tasks,bugs,iterationStateShow
+				showPanel:'iterationOverview',//menus,tasks,bugs,iterationStateShow
 				topModules:
 				[ 
 					{
diff --git a/src/views/xm/core/xmIteration/XmIterationSelect.vue b/src/views/xm/core/xmIteration/XmIterationSelect.vue
index 67d55240..6353cd65 100644
--- a/src/views/xm/core/xmIteration/XmIterationSelect.vue
+++ b/src/views/xm/core/xmIteration/XmIterationSelect.vue
@@ -58,8 +58,7 @@
 					 <template slot-scope="scope">
 						 {{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-tag type="warning">{{!scope.row.iphase?'未开始':scope.row.iphase}}</el-tag> 
   						 <div class="progress">
 						  <el-progress  :percentage="calcFinishRate(scope.row)"></el-progress>
 						 </div>
diff --git a/src/views/xm/core/xmProject/XmProjectComplex.vue b/src/views/xm/core/xmProject/XmProjectComplex.vue
index d182fa33..ae61e393 100644
--- a/src/views/xm/core/xmProject/XmProjectComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectComplex.vue
@@ -5,7 +5,7 @@
 				<xm-project-select   :xm-iteration="xmIteration" :xm-product="xmProduct"  @row-click="onProjectRowClick" @clear-select="onProjectClearSelect"></xm-project-select>
 			</el-col>  
 			<el-col :span="projectVisible==true?21:24" >  
-				<el-tabs type="border-card"  :v-model="showPanel" activate-name="projectOverview" @tab-click="tabClick">  
+				<el-tabs type="border-card"  :value="showPanel" @tab-click="tabClick">  
 					<el-tab-pane label="项目概览"   name="projectOverview">   
 						<span v-show="projectVisible==true" slot="label" ><i class="el-icon-d-arrow-left" @click.stop="projectVisible=false"></i> 项目概览</span>
 						<span v-show="projectVisible==false" slot="label" ><i class="el-icon-d-arrow-right" @click.stop="projectVisible=true"></i> 项目概览</span> 
@@ -74,7 +74,7 @@ import XmProductProjectForLink from '../xmProduct/XmProductProjectForLink.vue';
 		data() {
 			 return{
 				selProject:null,
-				showPanel:'tasks',//menus,tasks,bugs,iterationStateShow
+				showPanel:'projectOverview',//menus,tasks,bugs,iterationStateShow
 				topModules:
 				[ 
 					{