From e28a1232dc2fe158c293ebc6f9b0abba3fb446d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 29 Jan 2023 00:03: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

---
 .../xmIteration/XmIterationForLinkComplex.vue | 20 +++++++++++++------
 .../xmProduct/XmProductForLinkComplex.vue     |  6 ++++++
 .../xmProject/XmProjectForLinkComplex.vue     |  6 ++++++
 3 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
index 2c28bb58..2a1b108c 100644
--- a/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
+++ b/src/views/xm/core/xmIteration/XmIterationForLinkComplex.vue
@@ -298,22 +298,22 @@
 					</el-tab-pane>
 					
 					<el-tab-pane label="迭代详情" lazy name="detail" v-if="xmIteration&&xmIteration.id">
-						<xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields"></xm-iteration-edit>
+						<xm-iteration-edit v-if="showPanel=='detail'" :xm-iteration="xmIteration" @edit-fields="onEditFields" :xm-product="xmProductCpd"></xm-iteration-edit>
 					</el-tab-pane> 
 					<el-tab-pane label="需求列表" lazy name="menus" v-if="xmIteration&&xmIteration.id">
-						<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProduct"  :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-menu-mng>
+						<xm-menu-mng v-if="xmIteration && showPanel=='menus'" :xm-product="xmProductCpd"  :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="配置需求范围" lazy name="iterationMenuMng" v-if="xmIteration&&xmIteration.id">
-      					<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration"></xm-iteration-menu-mng>
+      					<xm-iteration-menu-mng v-if="showPanel=='iterationMenuMng'" :xm-iteration="xmIteration" :xm-product="xmProductCpd"></xm-iteration-menu-mng>
 					</el-tab-pane>
 					<el-tab-pane label="任务列表" lazy name="tasks" v-if="xmIteration&&xmIteration.id">
-						<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-task-mng>
+						<xm-task-mng v-if="xmIteration && showPanel=='tasks'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-task-mng>
 					</el-tab-pane>  
 					<el-tab-pane label="缺陷列表" lazy name="bugs" v-if="xmIteration&&xmIteration.id">
-						<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProduct" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-question-mng>
+						<xm-question-mng v-if="xmIteration && showPanel=='bugs'" :xm-product="xmProductCpd" :xm-iteration="xmIteration" :sel-project="projectInfo"></xm-question-mng>
 					</el-tab-pane> 
 					<el-tab-pane label="效能分析" lazy name="效能" v-if="xmIteration&&xmIteration.id"> 
-						<xm-report v-if="xmIteration && showPanel=='效能'" :xm-iteration="xmIteration" ></xm-report>
+						<xm-report v-if="xmIteration && showPanel=='效能'" :xm-project="projectInfo" :xm-iteration="xmIteration" :xm-product="xmProductCpd" category="迭代级"></xm-report>
  					</el-tab-pane> 
 				</el-tabs>
 				<el-row>
@@ -373,6 +373,14 @@
 				return 0;
 			}
 			},
+			xmProductCpd(){
+				if(this.xmProduct && this.xmProduct.id){
+					return this.xmProduct
+				}
+				if(this.xmIteration && this.xmIteration.id && this.xmIteration.productId){
+					return {id:this.xmIteration.productId,productName:this.xmIteration.productName}
+				}
+			}
 		},
 		props:['visible'],
 		watch:{
diff --git a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
index f2ae7bea..a8da2788 100644
--- a/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
+++ b/src/views/xm/core/xmProduct/XmProductForLinkComplex.vue
@@ -274,6 +274,10 @@
               </el-row>
             </div>
           </el-tab-pane>
+          
+					<el-tab-pane label="效能分析" name="效能"  v-if="xmProduct && xmProduct.id"> 
+						<xm-report v-if="xmProduct && showPanel=='效能'" :xm-project="projectInfo" :xm-iteration="xmIteration" :xm-product="xmProduct" category="产品级"></xm-report>
+ 					</el-tab-pane> 
         </el-tabs>
         <el-row> </el-row>
       </el-col>
@@ -318,6 +322,7 @@ import XmProductEdit from "./XmProductEdit.vue";
 import XmProductAdd from "./XmProductEdit"; //新增界面
 import XmGroupMng from '../xmGroup/XmGroupMng.vue'
 
+import XmReport from "@/views/xm/rpt/reportIndex";
 export default {
   computed: {
     ...mapGetters(["userInfo", "roles","projectInfo","xmIteration"]),
@@ -550,6 +555,7 @@ export default {
     XmProductProjectLinkMng,
     XmProductEdit,
     XmGroupMng,
+    XmReport
   },
   mounted() {
     this.$nextTick(() => {
diff --git a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
index e6db17ea..334e80a9 100644
--- a/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
+++ b/src/views/xm/core/xmProject/XmProjectForLinkComplex.vue
@@ -253,6 +253,10 @@
               </el-row>
             </div>
           </el-tab-pane>
+          
+					<el-tab-pane label="效能分析" name="效能" v-if="selProject && selProject.id"> 
+						<xm-report v-if="selProject && showPanel=='效能'" :xm-project="selProject" :xm-iteration="xmIteration" :xm-product="xmProduct" category="项目级"></xm-report>
+ 					</el-tab-pane> 
         </el-tabs> 
       </el-col>
     </el-row>
@@ -298,6 +302,7 @@ import XmProductProjectLinkMng from "../xmProductProjectLink/XmProductProjectLin
 import XmPlan from "../xmTask/XmPlan.vue";
 import xmGroupMng from "../xmGroup/XmGroupMng";
  
+import XmReport from "@/views/xm/rpt/reportIndex";
 import {
 	initDicts,
   getDefOptions,
@@ -455,6 +460,7 @@ export default {
     XmProjectOverview,
     XmProductProjectLinkMng, 
     XmPlan,
+    XmReport,
 	xmGroupMng,
   },
   mounted() {