From bfb55520c243c6c0e367bc2b9457613b0a7f474a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 3 Feb 2023 21:59:14 +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 --- src/views/xm/rpt/product/menuAgeDist.vue | 26 +----------- src/views/xm/rpt/product/menuAttDist.vue | 25 +---------- src/views/xm/rpt/product/menuSort.vue | 1 + src/views/xm/rpt/product/questionAgeDist.vue | 41 +------------------ src/views/xm/rpt/product/questionAttDist.vue | 39 +----------------- .../xm/rpt/product/questionRetestDist.vue | 41 +------------------ src/views/xm/rpt/product/questionSort.vue | 41 +------------------ src/views/xm/rpt/project/taskAgeDist.vue | 25 +---------- src/views/xm/rpt/project/taskAttDist.vue | 25 +---------- 9 files changed, 13 insertions(+), 251 deletions(-) diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue index 99d79ad6..316df126 100644 --- a/src/views/xm/rpt/product/menuAgeDist.vue +++ b/src/views/xm/rpt/product/menuAgeDist.vue @@ -281,30 +281,8 @@ this.xmMenuAgeDists=[] }, searchXmMenuAgeDist(){ - var 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.groupBy - if(this.filters.product){ - params.productId=this.filters.product.id - } - - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } + var params={...this.params} + getXmMenuAgeDist(params).then(res=>{ this.xmMenuAgeDists=res.data.data }) diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue index 80f92515..c6b7a032 100644 --- a/src/views/xm/rpt/product/menuAttDist.vue +++ b/src/views/xm/rpt/product/menuAttDist.vue @@ -342,30 +342,7 @@ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } - var 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.groupBy - if(this.filters.product){ - params.productId=this.filters.product.id - } - - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } + var params={...this.params} getXmMenuAttDist(params).then(res=>{ this.xmMenuAttDists=res.data.data }) diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index 24dbcc60..555741bc 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -278,6 +278,7 @@ pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, + ...this.params }; if(this.filters.dtype){ params.dtype=this.filters.dtype diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue index a330fed4..4e9f39c3 100644 --- a/src/views/xm/rpt/product/questionAgeDist.vue +++ b/src/views/xm/rpt/product/questionAgeDist.vue @@ -310,45 +310,8 @@ this.xmQuestionAgeDists=[] }, searchXmQuestionAgeDist(){ - var params={} - if(this.filters.solution){ - params.solution=this.filters.solution - } - if(this.filters.bugType){ - params.bugType=this.filters.bugType - } - if(this.filters.bugStatus){ - params.bugStatus=this.filters.bugStatus - } - if(this.filters.bugReason){ - params.bugReason=this.filters.bugReason - } - if(this.filters.bugSeverity){ - params.bugSeverity=this.filters.bugSeverity - } - if(this.filters.repRate){ - params.repRate=this.filters.repRate - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - - if(this.filters.project){ - params.projectId=this.filters.project.id - } - if(this.filters.product){ - params.productId=this.filters.product.id - } - if(this.filters.iteration){ - params.linkIterationId=this.filters.iteration.id - } - if(this.filters.testPlan && this.filters.testPlan.id){ - params.planId=this.filters.testPlan.id - } - if(this.filters.testCasedb && this.filters.testCasedb.id){ - params.casedbId=this.filters.testCasedb.id - } - params.groupBy=this.groupBy + var params={...this.params} + getXmQuestionAgeDist(params).then(res=>{ this.xmQuestionAgeDists=res.data.data }) diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index 4d3ab145..6f035de8 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -384,44 +384,7 @@ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } - var params={} - if(this.filters.solution){ - params.solution=this.filters.solution - } - if(this.filters.bugType){ - params.bugType=this.filters.bugType - } - if(this.filters.bugStatus){ - params.bugStatus=this.filters.bugStatus - } - if(this.filters.bugReason){ - params.bugReason=this.filters.bugReason - } - if(this.filters.bugSeverity){ - params.bugSeverity=this.filters.bugSeverity - } - if(this.filters.repRate){ - params.repRate=this.filters.repRate - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - - if(this.filters.project){ - params.projectId=this.filters.project.id - } - if(this.filters.product){ - params.productId=this.filters.product.id - } - if(this.filters.iteration){ - params.linkIterationId=this.filters.iteration.id - } - if(this.filters.testPlan && this.filters.testPlan.id){ - params.planId=this.filters.testPlan.id - } - if(this.filters.testCasedb && this.filters.testCasedb.id){ - params.casedbId=this.filters.testCasedb.id - } + var params={...this.params} params.groupBy=this.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 56db082f..bf451517 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -354,46 +354,9 @@ pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, + ...this.params }; - if(this.filters.solution){ - params.solution=this.filters.solution - } - if(this.filters.bugType){ - params.bugType=this.filters.bugType - } - if(this.filters.bugStatus){ - params.bugStatus=this.filters.bugStatus - } - if(this.filters.bugReason){ - params.bugReason=this.filters.bugReason - } - if(this.filters.bugSeverity){ - params.bugSeverity=this.filters.bugSeverity - } - if(this.filters.repRate){ - params.repRate=this.filters.repRate - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - - if(this.filters.project){ - params.projectId=this.filters.project.id - } - if(this.filters.product){ - params.productId=this.filters.product.id - } - if(this.filters.iteration){ - params.linkIterationId=this.filters.iteration.id - } - - if(this.filters.testPlan && this.filters.testPlan.id){ - params.planId=this.filters.testPlan.id - } - if(this.filters.testCasedb && this.filters.testCasedb.id){ - params.casedbId=this.filters.testCasedb.id - } - + params.groupBy=this.groupBy if ( this.pageInfo.orderFields != null && diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index f958ca91..ed181081 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -320,46 +320,9 @@ pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, + ...this.params }; - if(this.filters.solution){ - params.solution=this.filters.solution - } - if(this.filters.bugType){ - params.bugType=this.filters.bugType - } - if(this.filters.bugStatus){ - params.bugStatus=this.filters.bugStatus - } - if(this.filters.bugReason){ - params.bugReason=this.filters.bugReason - } - if(this.filters.bugSeverity){ - params.bugSeverity=this.filters.bugSeverity - } - if(this.filters.repRate){ - params.repRate=this.filters.repRate - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - - if(this.filters.project){ - params.projectId=this.filters.project.id - } - if(this.filters.product){ - params.productId=this.filters.product.id - } - if(this.filters.iteration){ - params.linkIterationId=this.filters.iteration.id - } - - if(this.filters.testPlan && this.filters.testPlan.id){ - params.planId=this.filters.testPlan.id - } - if(this.filters.testCasedb && this.filters.testCasedb.id){ - params.casedbId=this.filters.testCasedb.id - } - + params.groupBy=this.groupBy if ( diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue index 5a12640c..db0a3103 100644 --- a/src/views/xm/rpt/project/taskAgeDist.vue +++ b/src/views/xm/rpt/project/taskAgeDist.vue @@ -257,30 +257,7 @@ this.xmTaskAgeDists=[] }, searchXmTaskAgeDist(){ - var params={} - if(this.filters.taskType){ - params.taskType=this.filters.taskType - } - if(this.filters.taskState){ - params.taskState=this.filters.taskState - } - if(this.filters.planType){ - params.planType=this.filters.planType - } - if(this.filters.settleSchemel){ - params.settleSchemel=this.filters.settleSchemel - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - params.groupBy=this.groupBy - if(this.filters.project){ - params.projectId=this.filters.project.id - } - - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } + var params={...this.params} params.ntype='0' getXmTaskAgeDist(params).then(res=>{ this.xmTaskAgeDists=res.data.data diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index 6f5b1263..cd07b18e 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -321,30 +321,7 @@ this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) return } - var params={} - if(this.filters.taskType){ - params.taskType=this.filters.taskType - } - if(this.filters.taskState){ - params.taskState=this.filters.taskState - } - if(this.filters.planType){ - params.planType=this.filters.planType - } - if(this.filters.settleSchemel){ - params.settleSchemel=this.filters.settleSchemel - } - if(this.filters.priority){ - params.priority=this.filters.priority - } - params.groupBy=this.groupBy - if(this.filters.project){ - params.projectId=this.filters.project.id - } - - if(this.filters.iteration){ - params.iterationId=this.filters.iteration.id - } + var params={...this.params} params.ntype='0' getXmTaskAttDist(params).then(res=>{ this.xmTaskAttDists=res.data.data