diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index d6ab05ca..dbb14c97 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -146,7 +146,7 @@ testCasedb:null, }, params:{ - + groupBy:'mm_userid' }, title:'',//报表配置项 remark:'', //报表配置项 @@ -269,53 +269,16 @@ this.xmMenuSorts=[] }, searchXmMenuSort(){ - if(!this.params.groupBy){ - this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) - return - } let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, ...this.params - }; - if(this.filters.dtype){ - params.dtype=this.filters.dtype - } - if(this.filters.status){ - params.status=this.filters.status - } - if(this.filters.source){ - params.source=this.filters.source - } - if(this.filters.dlvl){ - params.dlvl=this.filters.dlvl - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - params.groupBy=this.params.groupBy - if(this.filters.product){ - params.productId=this.filters.product.id - } - - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } - - - if ( - this.pageInfo.orderFields != null && - this.pageInfo.orderFields.length > 0 - ) { - let orderBys = []; - for (var i = 0; i < this.pageInfo.orderFields.length; i++) { - orderBys.push( - this.pageInfo.orderFields[i] + " " + this.pageInfo.orderDirs[i] - ); - } - params.orderBy = orderBys.join(","); + }; + if(!params.groupBy){ + this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) + return } getXmMenuSort(params).then(res=>{ this.xmMenuSorts=res.data.data diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index f5a904ab..b2bb0d90 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -379,13 +379,12 @@ onXmQuestionSomeFieldsChange(fieldName,$event){ this.xmQuestionAttDists=[] }, - searchXmQuestionAttDist(){ - if(!this.params.groupBy){ + searchXmQuestionAttDist(){ + var params={...this.params} + if(!params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return - } - var params={...this.params} - 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 fbd5c0a6..4114426d 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -345,19 +345,18 @@ this.xmQuestionRetestDists=[] }, searchXmQuestionRetestDist(){ - if(!this.params.groupBy){ - this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) - return - } + let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, ...this.params - }; - - params.groupBy=this.params.groupBy + }; + if(!params.groupBy){ + this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) + return + } 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 7d74195a..355d6b83 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -311,19 +311,17 @@ this.xmQuestionSorts=[] }, searchXmQuestionSort(){ - if(!this.params.groupBy){ - this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) - return - } let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, ...this.params - }; - - params.groupBy=this.params.groupBy + }; + if(!params.groupBy){ + this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) + return + } if ( this.pageInfo.orderFields != null && diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index 2169e8ee..1d590ac8 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -317,11 +317,12 @@ this.xmTaskAttDists=[] }, searchXmTaskAttDist(){ - if(!this.params.groupBy){ + + var params={...this.params} + if(!params.groupBy){ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } - var params={...this.params} params.ntype='0' getXmTaskAttDist(params).then(res=>{ this.xmTaskAttDists=res.data.data