diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue index 0d278f16..89778ec8 100644 --- a/src/views/xm/rpt/reportIndex.vue +++ b/src/views/xm/rpt/reportIndex.vue @@ -6,7 +6,7 @@ - + @@ -21,49 +21,49 @@ - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - + + + + + + - - - - - - + + + + + + - - - + + + - - - - + + + + @@ -131,7 +131,7 @@ xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,xmTestDayTimesCalc,xmTestCaseToPlanCalc }, - props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan'], + props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan','category'], computed: { ...mapGetters([ 'userInfo','roles' @@ -231,6 +231,7 @@ params.xmProject=this.xmProject params.xmIteration=this.xmIteration params.xmTestCasedb=this.xmTestCasedb + params.category=this.filters.category this.$refs[row.ref].open(params); }, @@ -242,15 +243,20 @@ this.dicts=res.data.data; }) */ - if(this.xmIteration && this.xmIteration.id){ - this.filters.category="迭代级" - }else if(this.xmTestCasedb && this.xmTestCasedb.id){ - this.filters.category="测试级" - }else if(this.xmProject && this.xmProject.id){ - this.filters.category="项目级" - }else if(this.xmProduct && this.xmProduct.id){ - this.filters.category="产品级" + if(this.category){ + this.filters.category=this.category + }else{ + if(this.xmIteration && this.xmIteration.id){ + this.filters.category="迭代级" + }else if(this.xmTestCasedb && this.xmTestCasedb.id){ + this.filters.category="测试级" + }else if(this.xmProject && this.xmProject.id){ + this.filters.category="项目级" + }else if(this.xmProduct && this.xmProduct.id){ + this.filters.category="产品级" + } } + this.maxTableHeight = this.source == 'GZT' ? this.maxTableHeight : util.calcTableMaxHeight(this.$refs.table.$el); }//end mounted diff --git a/src/views/xm/rpt/reportIndexForIteration.vue b/src/views/xm/rpt/reportIndexForIteration.vue index 04cf300a..f78952e4 100644 --- a/src/views/xm/rpt/reportIndexForIteration.vue +++ b/src/views/xm/rpt/reportIndexForIteration.vue @@ -1,6 +1,6 @@ diff --git a/src/views/xm/rpt/reportIndexForProduct.vue b/src/views/xm/rpt/reportIndexForProduct.vue index c1e2f1c1..080101bc 100644 --- a/src/views/xm/rpt/reportIndexForProduct.vue +++ b/src/views/xm/rpt/reportIndexForProduct.vue @@ -1,6 +1,6 @@ diff --git a/src/views/xm/rpt/reportIndexForProject.vue b/src/views/xm/rpt/reportIndexForProject.vue index 2e84902b..51a4f58b 100644 --- a/src/views/xm/rpt/reportIndexForProject.vue +++ b/src/views/xm/rpt/reportIndexForProject.vue @@ -1,6 +1,6 @@ diff --git a/src/views/xm/rpt/reportIndexForTest.vue b/src/views/xm/rpt/reportIndexForTest.vue index df1fa807..bb9cc3c4 100644 --- a/src/views/xm/rpt/reportIndexForTest.vue +++ b/src/views/xm/rpt/reportIndexForTest.vue @@ -1,6 +1,6 @@