diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue index b5931f96..58203836 100644 --- a/src/views/xm/rpt/product/menuAttDist.vue +++ b/src/views/xm/rpt/product/menuAttDist.vue @@ -85,15 +85,15 @@ return [] }else{ var itemId=""; - if(this.groupBy=='status'){ + if(this.params.groupBy=='status'){ itemId="menuStatus" - }else if(this.groupBy=='dlvl'){ + }else if(this.params.groupBy=='dlvl'){ itemId="demandLvl" - }else if(this.groupBy=='dtype'){ + }else if(this.params.groupBy=='dtype'){ itemId="demandType" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - }else if(this.groupBy=='source'){ + }else if(this.params.groupBy=='source'){ itemId="demandSource" } return this.xmMenuAttDists.map(i=>{ @@ -105,15 +105,15 @@ }, legendCpd(){ var itemId=""; - if(this.groupBy=='status'){ + if(this.params.groupBy=='status'){ itemId="menuStatus" - }else if(this.groupBy=='dlvl'){ + }else if(this.params.groupBy=='dlvl'){ itemId="demandLvl" - }else if(this.groupBy=='dtype'){ + }else if(this.params.groupBy=='dtype'){ itemId="demandType" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - }else if(this.groupBy=='source'){ + }else if(this.params.groupBy=='source'){ itemId="demandSource" } @@ -184,8 +184,7 @@ groupBy:'status', }, title:'',//报表配置项 - remark:'', //报表配置项 - + remark:'', //报表配置项 groupBys:[ {id:'status', name:'需求状态'}, {id:'dtype', name:'需求类型'}, @@ -336,11 +335,12 @@ this.xmMenuAttDists=[] }, searchXmMenuAttDist(){ - if(!this.groupBy){ + + var params={...this.params} + if(!params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } - var params={...this.params} getXmMenuAttDist(params).then(res=>{ this.xmMenuAttDists=res.data.data }) @@ -367,7 +367,7 @@ initSimpleDicts('all',['demandSource','demandLvl','demandType','priority','menuStatus'] ).then(res=>{ this.dicts=res.data.data; }) - this.maxTableHeight = util.calcTableMaxHeight(this.$refs.filtersRef.$el) + this.maxTableHeight = util.calcTableMaxHeight(this.$refs.filtersRef.$el) //this.charts(); this.open(); diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index e3cc99e4..d6ab05ca 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -110,7 +110,7 @@ preName=`项目【${this.filters.project.id}】` } } - return preName+this.groupBys.find(i=>i.id==this.groupBy).name+'需求数量排行榜' + return preName+this.groupBys.find(i=>i.id==this.params.groupBy).name+'需求数量排行榜' }, legendCpd(){ if(this.xmMenuSorts.length==0){ @@ -180,7 +180,7 @@ open(){ this.visible=true; if(this.initGroupBy){ - this.groupBy=this.initGroupBy + this.params.groupBy=this.initGroupBy } this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct @@ -269,7 +269,7 @@ this.xmMenuSorts=[] }, searchXmMenuSort(){ - if(!this.groupBy){ + if(!this.params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } @@ -295,7 +295,7 @@ if(this.filters.priority){ params.priority=this.filters.priority } - params.groupBy=this.groupBy + params.groupBy=this.params.groupBy if(this.filters.product){ params.productId=this.filters.product.id } diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index 88aa723b..f5a904ab 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -118,19 +118,19 @@ return [] }else{ var itemId=""; - if(this.groupBy=='bug_status'){ + if(this.params.groupBy=='bug_status'){ itemId="bugStatus" - }else if(this.groupBy=='bug_type'){ + }else if(this.params.groupBy=='bug_type'){ itemId="bugType" - }else if(this.groupBy=='bug_reason'){ + }else if(this.params.groupBy=='bug_reason'){ itemId="bugReason" - }else if(this.groupBy=='bug_severity'){ + }else if(this.params.groupBy=='bug_severity'){ itemId="bugSeverity" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - } else if(this.groupBy=='solution'){ + } else if(this.params.groupBy=='solution'){ itemId="bugSolution" - } else if(this.groupBy=='rep_rate'){ + } else if(this.params.groupBy=='rep_rate'){ itemId="bugRepRate" } return this.xmQuestionAttDists.map(i=>{ @@ -152,19 +152,19 @@ }, legendCpd(){ var itemId=""; - if(this.groupBy=='bug_status'){ + if(this.params.groupBy=='bug_status'){ itemId="bugStatus" - }else if(this.groupBy=='bug_type'){ + }else if(this.params.groupBy=='bug_type'){ itemId="bugType" - }else if(this.groupBy=='bug_reason'){ + }else if(this.params.groupBy=='bug_reason'){ itemId="bugReason" - }else if(this.groupBy=='bug_severity'){ + }else if(this.params.groupBy=='bug_severity'){ itemId="bugSeverity" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - } else if(this.groupBy=='solution'){ + } else if(this.params.groupBy=='solution'){ itemId="bugSolution" - } else if(this.groupBy=='rep_rate'){ + } else if(this.params.groupBy=='rep_rate'){ itemId="bugRepRate" } @@ -380,12 +380,12 @@ this.xmQuestionAttDists=[] }, searchXmQuestionAttDist(){ - if(!this.groupBy){ + if(!this.params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } var params={...this.params} - params.groupBy=this.groupBy + params.groupBy=this.params.groupBy getXmQuestionAttDist(params).then(res=>{ this.xmQuestionAttDists=res.data.data }) diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue index a835d48c..fbd5c0a6 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -345,7 +345,7 @@ this.xmQuestionRetestDists=[] }, searchXmQuestionRetestDist(){ - if(!this.groupBy){ + if(!this.params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } @@ -357,7 +357,7 @@ ...this.params }; - params.groupBy=this.groupBy + params.groupBy=this.params.groupBy if ( this.pageInfo.orderFields != null && this.pageInfo.orderFields.length > 0 diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index 3a1718d8..7d74195a 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -254,7 +254,7 @@ this.title="企业工作项每日趋势图" } if(this.initGroupBy){ - this.groupBy=this.initGroupBy + this.params.groupBy=this.initGroupBy } this.searchXmQuestionSort() }, @@ -311,7 +311,7 @@ this.xmQuestionSorts=[] }, searchXmQuestionSort(){ - if(!this.groupBy){ + if(!this.params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } @@ -323,7 +323,7 @@ ...this.params }; - params.groupBy=this.groupBy + params.groupBy=this.params.groupBy if ( this.pageInfo.orderFields != null && diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index a3264f0e..2169e8ee 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -78,15 +78,15 @@ return [] }else{ var itemId=""; - if(this.groupBy=='task_state'){ + if(this.params.groupBy=='task_state'){ itemId="taskState" - }else if(this.groupBy=='settle_schemel'){ + }else if(this.params.groupBy=='settle_schemel'){ itemId="xmTaskSettleSchemel" - }else if(this.groupBy=='task_type'){ + }else if(this.params.groupBy=='task_type'){ itemId="taskType" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - }else if(this.groupBy=='plan_type'){ + }else if(this.params.groupBy=='plan_type'){ itemId="planType" } return this.xmTaskAttDists.map(i=>{ @@ -129,19 +129,19 @@ } } - return preName+this.groupBys.find(i=>i.id==this.groupBy).name+'数量分布' + return preName+this.groupBys.find(i=>i.id==this.params.groupBy).name+'数量分布' }, legendCpd(){ var itemId=""; - if(this.groupBy=='task_state'){ + if(this.params.groupBy=='task_state'){ itemId="taskState" - }else if(this.groupBy=='settle_schemel'){ + }else if(this.params.groupBy=='settle_schemel'){ itemId="xmTaskSettleSchemel" - }else if(this.groupBy=='task_type'){ + }else if(this.params.groupBy=='task_type'){ itemId="taskType" - }else if(this.groupBy=='priority'){ + }else if(this.params.groupBy=='priority'){ itemId="priority" - }else if(this.groupBy=='plan_type'){ + }else if(this.params.groupBy=='plan_type'){ itemId="planType" } @@ -317,7 +317,7 @@ this.xmTaskAttDists=[] }, searchXmTaskAttDist(){ - if(!this.groupBy){ + if(!this.params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue index 9d3ba465..72eaa954 100644 --- a/src/views/xm/rpt/project/taskSort.vue +++ b/src/views/xm/rpt/project/taskSort.vue @@ -102,7 +102,7 @@ } } - return preName+this.groupBys.find(i=>i.id==this.groupBy).name+'任务数量排行榜' + return preName+this.groupBys.find(i=>i.id==this.params.groupBy).name+'任务数量排行榜' }, legendCpd(){ if(this.xmTaskSorts.length==0){ diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue index 0c3bafeb..03fea29e 100644 --- a/src/views/xm/rpt/testCase/testCaseSort.vue +++ b/src/views/xm/rpt/testCase/testCaseSort.vue @@ -122,7 +122,7 @@ preName=`项目【${this.filters.project.id}】` } } - return preName+ this.groupBys.find(i=>i.id==this.groupBy).name+'测试用例数量排行榜' + return preName+ this.groupBys.find(i=>i.id==this.params.groupBy).name+'测试用例数量排行榜' }, xmProductCpd(){ if(this.xmIteration && this.xmIteration.id && this.xmIteration.productId){ @@ -289,7 +289,7 @@ open(){ this.visible=true; if(this.initGroupBy){ - this.groupBy=this.initGroupBy + this.params.groupBy=this.initGroupBy } this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct