From 4f9ad0f89b139fced245b253860c96e09a98fe6f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 19 Jul 2021 18:29:48 +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

---
 .../xm/core/xmIteration/XmIterationInfo.vue      |  4 ++--
 .../xmProduct/XmProductForProjectComplex.vue     | 16 ++++++++--------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationInfo.vue b/src/views/xm/core/xmIteration/XmIterationInfo.vue
index e1a4c4d1..41d1bbdf 100644
--- a/src/views/xm/core/xmIteration/XmIterationInfo.vue
+++ b/src/views/xm/core/xmIteration/XmIterationInfo.vue
@@ -192,7 +192,7 @@
 	import xmProjectStateMng from '../xmProjectState/XmProjectStateMng';
 	import xmTestCaseExecMng from '../xmTestCaseExec/XmTestCaseExecMng';  
 	import XmIterationForProjectComplex from '../xmIteration/XmIterationForProjectComplex.vue'; 
-	import XmProjectOverviewComplex from '../xmProject/XmProjectOverviewComplex.vue';
+	import XmIterationOverviewComplex from '../xmIteration/XmIterationOverviewComplex.vue';
 	import XmProductForProjectComplex from '../xmProduct/XmProductForProjectComplex.vue';
 	import XmProjectForLink from '../xmProject/XmProjectForLink.vue';
 
@@ -415,7 +415,7 @@
 			xmTestCaseExecMng,
 			xmProjectGroupSelect,
 			XmIterationForProjectComplex, 
-			XmProjectOverviewComplex,
+			XmIterationOverviewComplex,
 			XmProductForProjectComplex,
 			XmProjectForLink,
 			//在下面添加其它组件
diff --git a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
index d7245241..eac33e70 100644
--- a/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForProjectComplex.vue
@@ -2,7 +2,7 @@
 	<section class="page-container border"> 
 		<el-row>
 			<el-col :span="productVisible==true?3:0" >
-				<xm-product-select :sel-project="selProject"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
+				<xm-product-select :sel-project="selProject" :xm-iteration="xmIteration"  @row-click="onProductRowClick" @clear-select="onProductClearSelect"></xm-product-select>
 			</el-col>  
 			<el-col :span="productVisible==true?21:24" >  
 				<el-tabs type="border-card"  :v-model="showPanel" activate-name="productOverview" @tab-click="tabClick">  
@@ -11,20 +11,20 @@
 						<span v-show="productVisible==false" slot="label" ><i class="el-icon-d-arrow-right" @click.stop="productVisible=true"></i> 产品概览</span> 
  						 
 					</el-tab-pane>
-					<el-tab-pane label="迭代"   name="iterations">   
-						 <xm-iteration-mng v-show=" xmProduct && showPanel=='iterations'"   :xm-product="xmProduct" :sel-project="selProject"></xm-iteration-mng>
+					<el-tab-pane label="迭代"   name="iterations" v-if=" !xmIteration" >   
+						 <xm-iteration-mng v-show=" xmProduct && showPanel=='iterations' && !xmIteration"   :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-iteration-mng>
 					</el-tab-pane>
 					<el-tab-pane label="项目" lazy  name="projects"> 
-						<xm-product-project-for-link v-show="xmProduct && showPanel=='projects'"  :xm-product="xmProduct" :sel-project="selProject"></xm-product-project-for-link>
+						<xm-product-project-for-link v-show="xmProduct && showPanel=='projects'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-product-project-for-link>
 					</el-tab-pane>
 					<el-tab-pane label="故事" lazy name="menus" >  
-						<xm-menu-mng v-show="xmProduct && showPanel=='menus'"   :xm-product="xmProduct" :sel-project="selProject"></xm-menu-mng>
+						<xm-menu-mng v-show="xmProduct && 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="xmProduct && showPanel=='tasks'"  :xm-product="xmProduct" :sel-project="selProject"></xm-task-mng>
+						<xm-task-mng v-show="xmProduct && 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="xmProduct && showPanel=='bugs'"  :xm-product="xmProduct" :sel-project="selProject"></xm-question-mng>
+						<xm-question-mng v-show="xmProduct && showPanel=='bugs'"  :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="selProject"></xm-question-mng>
 					</el-tab-pane> 
 				</el-tabs>
 				<el-row>
@@ -61,7 +61,7 @@ import XmProductProjectForLink from './XmProductProjectForLink.vue';
 		      'userInfo','roles'
 			]), 
 		},
-		props:['visible','selProject'],
+		props:['visible','selProject','xmIteration'],
 		watch:{
 			visible:function(visible){
 				if(visible==true){