From 0dba12a85b39ebcadf3a0f23908b2609e4285b0f 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:52:08 +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 --- .../iteration/IterationWorkItemDayList.vue | 8 +- src/views/xm/rpt/iteration/burnout.vue | 12 +-- .../xm/rpt/iteration/menuDayAccumulate.vue | 12 +-- src/views/xm/rpt/iteration/menuDayTrend.vue | 12 +-- .../rpt/iteration/questionDayAccumulate.vue | 13 +--- .../xm/rpt/iteration/questionDayTrend.vue | 12 +-- .../xm/rpt/product/menuDayAccumulate.vue | 7 +- src/views/xm/rpt/product/menuDayTrend.vue | 8 +- .../xm/rpt/product/productWorkItemDayList.vue | 7 +- .../xm/rpt/product/questionDayAccumulate.vue | 8 +- src/views/xm/rpt/product/questionDayTrend.vue | 8 +- .../xm/rpt/project/projectWorkItemDayList.vue | 41 ++++++++-- .../rpt/project/projectWorkloadSetDayList.vue | 41 ++++++++-- .../project/projectWorkloadSetMonthList.vue | 41 ++++++++-- src/views/xm/rpt/project/taskAgeDist.vue | 33 +++++++- src/views/xm/rpt/project/taskAttDist.vue | 33 +++++++- .../xm/rpt/project/taskDayAccumulate.vue | 41 ++++++++-- src/views/xm/rpt/project/taskDayTrend.vue | 41 ++++++++-- src/views/xm/rpt/project/taskSort.vue | 76 ++++++++----------- src/views/xm/rpt/testCase/testCaseSort.vue | 60 ++++++++------- .../xm/rpt/testPlan/testCaseToPlanCalc.vue | 18 +---- .../testPlan/testPlanCaseExecStatusDist.vue | 18 +---- .../xm/rpt/testPlan/testPlanCaseUserDist.vue | 18 +---- 23 files changed, 333 insertions(+), 235 deletions(-) diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue index 4d79bfc3..fe5103a4 100644 --- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue +++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue @@ -313,15 +313,11 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; - + this.filters.product=null }, onIterationSelected(iteration){ diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue index 405d863c..848fce46 100644 --- a/src/views/xm/rpt/iteration/burnout.vue +++ b/src/views/xm/rpt/iteration/burnout.vue @@ -327,24 +327,20 @@ onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - this.xmProductStateHiss=[]; + this.filters.product=null }, onIterationSelected(iteration){ - this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.filters.iteration=iteration }, onIterationClear(){ - this.filters.iteration=null - this.xmProductStateHiss=[]; + this.filters.iteration=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue index 26b5bb1c..2c9856cb 100644 --- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue @@ -315,23 +315,19 @@ onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - this.xmProductStateHiss=[]; + this.filters.product=null }, onIterationSelected(iteration){ - this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.filters.iteration=iteration }, onIterationClear(){ - this.filters.iteration=null - this.xmProductStateHiss=[]; + this.filters.iteration=null } },//end method mounted() { diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue index 8eb5bae4..be139e45 100644 --- a/src/views/xm/rpt/iteration/menuDayTrend.vue +++ b/src/views/xm/rpt/iteration/menuDayTrend.vue @@ -330,24 +330,20 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - this.xmProductStateHiss=[]; + this.filters.product=null }, onIterationSelected(iteration){ - this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.filters.iteration=iteration }, onIterationClear(){ - this.filters.iteration=null - this.xmProductStateHiss=[]; + this.filters.iteration=null } },//end method mounted() { diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue index 4f07ab68..958bb38f 100644 --- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue @@ -313,25 +313,20 @@ onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; + this.filters.product=null }, onIterationSelected(iteration){ - this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.filters.iteration=iteration }, onIterationClear(){ - this.filters.iteration=null - this.xmProductStateHiss=[]; + this.filters.iteration=null } },//end method mounted() { diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue index 9c8fb502..7b26d116 100644 --- a/src/views/xm/rpt/iteration/questionDayTrend.vue +++ b/src/views/xm/rpt/iteration/questionDayTrend.vue @@ -329,24 +329,20 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - this.xmProductStateHiss=[]; + this.filters.product=null }, onIterationSelected(iteration){ - this.filters.iteration=iteration - this.xmProductStateHiss=[]; + this.filters.iteration=iteration }, onIterationClear(){ - this.filters.iteration=null - this.xmProductStateHiss=[]; + this.filters.iteration=null } },//end method mounted() { diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue index 94f214a0..fed7ac56 100644 --- a/src/views/xm/rpt/product/menuDayAccumulate.vue +++ b/src/views/xm/rpt/product/menuDayAccumulate.vue @@ -297,14 +297,11 @@ onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; + this.filters.product=null }, },//end method diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue index a5875005..84e00be1 100644 --- a/src/views/xm/rpt/product/menuDayTrend.vue +++ b/src/views/xm/rpt/product/menuDayTrend.vue @@ -312,15 +312,11 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; - + this.filters.product=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index cc83014b..c7c8b779 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -298,14 +298,11 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; + this.filters.product=null }, },//end method diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue index d81e9804..657fd65e 100644 --- a/src/views/xm/rpt/product/questionDayAccumulate.vue +++ b/src/views/xm/rpt/product/questionDayAccumulate.vue @@ -293,15 +293,11 @@ onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; - + this.filters.product=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue index 7fbb2d2e..b3b4dc91 100644 --- a/src/views/xm/rpt/product/questionDayTrend.vue +++ b/src/views/xm/rpt/product/questionDayTrend.vue @@ -311,15 +311,11 @@ }, onProductSelected(product){ - this.filters.product=product - this.xmProductStateHiss=[]; + this.filters.product=product }, onProductClear(){ - this.filters.product=null - - this.xmProductStateHiss=[]; - + this.filters.product=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue index d05fecaa..feb94aa6 100644 --- a/src/views/xm/rpt/project/projectWorkItemDayList.vue +++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue @@ -133,9 +133,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.xmProjectStateHiss=[] this.$nextTick(()=>{ @@ -263,15 +294,11 @@ }, onProjectSelected(project){ - this.filters.project=project - this.xmProjectStateHiss=[]; + this.filters.project=project }, onProjectClear(){ - this.filters.project=null - - this.xmProjectStateHiss=[]; - + this.filters.project=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue index 23db4b2d..7ec29354 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue @@ -147,9 +147,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.xmProjectWorkloadSetDays=[] this.$nextTick(()=>{ if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect(); @@ -287,15 +318,11 @@ }, onProjectSelected(project){ - this.filters.project=project - this.xmProjectWorkloadSetDays=[]; + this.filters.project=project }, onProjectClear(){ - this.filters.project=null - - this.xmProjectWorkloadSetDays=[]; - + this.filters.project=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue index bfb253a1..e2245e96 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue @@ -146,9 +146,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.xmProjectWorkloadSetMonths=[] this.$nextTick(()=>{ @@ -287,15 +318,11 @@ }, onProjectSelected(project){ - this.filters.project=project - this.xmProjectWorkloadSetMonths=[]; + this.filters.project=project }, onProjectClear(){ - this.filters.project=null - - this.xmProjectWorkloadSetMonths=[]; - + this.filters.project=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue index 37941bec..5a12640c 100644 --- a/src/views/xm/rpt/project/taskAgeDist.vue +++ b/src/views/xm/rpt/project/taskAgeDist.vue @@ -150,9 +150,40 @@ methods: { open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.searchXmTaskAgeDist(); }, drawCharts() { diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index c6414028..6f5b1263 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -210,9 +210,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.searchXmTaskAttDist() }, drawCharts() { diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue index 39e4c2fc..45b05208 100644 --- a/src/views/xm/rpt/project/taskDayAccumulate.vue +++ b/src/views/xm/rpt/project/taskDayAccumulate.vue @@ -166,9 +166,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.xmProjectStateHiss=[] if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect(); this.$nextTick(()=>{ @@ -279,15 +310,11 @@ onProjectSelected(project){ - this.filters.project=project - this.xmProjectStateHiss=[]; + this.filters.project=project }, onProjectClear(){ - this.filters.project=null - - this.xmProjectStateHiss=[]; - + this.filters.project=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index 772398df..38e16905 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -160,9 +160,40 @@ }, open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect(); this.$nextTick(()=>{ this.listXmProjectStateHis(); @@ -245,15 +276,11 @@ }, onProjectSelected(project){ - this.filters.project=project - this.xmProjectStateHiss=[]; + this.filters.project=project }, onProjectClear(){ - this.filters.project=null - - this.xmProjectStateHiss=[]; - + this.filters.project=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue index 43088e45..834a73ce 100644 --- a/src/views/xm/rpt/project/taskSort.vue +++ b/src/views/xm/rpt/project/taskSort.vue @@ -160,9 +160,38 @@ methods: { open(){ this.visible=true; + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.searchXmTaskSort() }, drawCharts() { @@ -213,54 +242,15 @@ onXmTaskSomeFieldsChange(fieldName,$event){ this.xmTaskSorts=[] }, - searchXmTaskSort(){ - if(!this.groupBy){ - this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'}) - return - } + searchXmTaskSort(){ let params = { pageSize: this.pageInfo.pageSize, pageNum: this.pageInfo.pageNum, total: this.pageInfo.total, count: this.pageInfo.count, + ...this.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 - } - - - 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(","); - } + params.ntype='0' getXmTaskSort(params).then(res=>{ this.xmTaskSorts=res.data.data diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue index 552e9006..0b0716f8 100644 --- a/src/views/xm/rpt/testCase/testCaseSort.vue +++ b/src/views/xm/rpt/testCase/testCaseSort.vue @@ -237,34 +237,7 @@ ) }, searchXmTestCaseSort(){ - var params={ } - if(this.filters.product && this.filters.product.id){ - params.productId=this.filters.product.id - } - - if(this.filters.project && this.filters.project.id){ - params.projectId=this.filters.project.id - } - if(this.filters.iteration && this.filters.iteration.id){ - params.iterationId=this.filters.iteration.id - } - if(this.filters.testCasedb && this.filters.testCasedb.id){ - params.casedbId=this.filters.testCasedb.id - } - - if(this.filters.testType){ - params.testType=this.filters.testType - } - if(this.filters.caseType){ - params.caseType=this.filters.caseType - } - if(this.filters.caseStatus){ - params.caseStatus=this.filters.caseStatus - } - if(this.filters.cpriority){ - params.cpriority=this.filters.cpriority - } - params.groupBy=this.groupBy; + var params={ ...this.params} getXmTestCaseSort(params).then(res=>{ var data=res.data.data if(data){ @@ -318,10 +291,39 @@ if(this.initGroupBy){ this.groupBy=this.initGroupBy } + this.filters.testPlan=this.xmTestPlan this.filters.product=this.xmProduct this.filters.project=this.xmProject this.filters.iteration=this.xmIteration - this.filters.testCasedb=this.xmTestCasedb + this.filters.testCasedb=this.xmTestCasedb + + if( this.filters.testPlan && this.filters.testPlan.id){ + this.params.planId= this.filters.testPlan.id + } + + if( this.filters.product && this.filters.product.id){ + this.params.productId= this.filters.product.id + } + + if( this.filters.project && this.filters.project.id){ + this.params.projectId= this.filters.project.id + } + + if( this.filters.iteration && this.filters.iteration.id){ + this.params.iterationId= this.filters.iteration.id + } + + if( this.filters.testCasedb && this.filters.testCasedb.id){ + this.params.casedbId= this.filters.testCasedb.id + } + if(this.cfg && this.cfg.id){ + this.params=this.cfg.params + this.title=this.cfg.title + this.remark=this.cfg.remark + } + if(this.showToolBar && !this.title){ + this.title="企业工作项每日趋势图" + } this.searchXmTestCaseSort(); } },//end method diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue index 02bfe29f..4352ea85 100644 --- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue +++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue @@ -259,23 +259,7 @@ }, searchXmTestCaseToPlanCalcList(){ - var params={ } - if(this.filters.product && this.filters.product.id){ - params.productId=this.filters.product.id - } - - if(this.filters.project && this.filters.project.id){ - params.projectId=this.filters.project.id - } - if(this.filters.iteration && this.filters.iteration.id){ - 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 } getXmTestCaseToPlanCalcList(params).then(res=>{ this.xmTestCaseToPlanCalcList=res.data.data }) diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue index 74f1f2f7..2fb62c8b 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue @@ -249,23 +249,7 @@ this.xmTestPlanCaseExecStatusDists=[] }, searchXmTestPlanCaseExecStatusDist(){ - var params={ } - if(this.filters.product && this.filters.product.id){ - params.productId=this.filters.product.id - } - - if(this.filters.project && this.filters.project.id){ - params.projectId=this.filters.project.id - } - if(this.filters.iteration && this.filters.iteration.id){ - 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 } getXmTestPlanCaseExecStatusDist(params).then(res=>{ this.xmTestPlanCaseExecStatusDists=res.data.data }) diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue index bbc740bd..84fed25a 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue @@ -249,23 +249,7 @@ ) }, searchXmTestPlanCaseUserDist(){ - var params={ } - if(this.filters.product && this.filters.product.id){ - params.productId=this.filters.product.id - } - - if(this.filters.project && this.filters.project.id){ - params.projectId=this.filters.project.id - } - if(this.filters.iteration && this.filters.iteration.id){ - 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 } getXmTestPlanCaseUserDist(params).then(res=>{ this.xmTestPlanCaseUserDists=res.data.data })