From 811d8c137f10cad1de8ccc4fbeef5f2ae1d1a105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= Date: Fri, 27 Jan 2023 20:56:39 +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 --- .../xm/rpt/testPlan/testCaseToPlanCalc.vue | 56 ++++++++---- .../xm/rpt/testPlan/testDayTimesCalc.vue | 91 +++++++++++++++---- .../testPlan/testPlanCaseExecStatusDist.vue | 59 +++++++----- .../xm/rpt/testPlan/testPlanCaseUserDist.vue | 66 ++++++++------ 4 files changed, 186 insertions(+), 86 deletions(-) diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue index 458a65ad..b201303e 100644 --- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue +++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue @@ -19,14 +19,24 @@ {{xmProductCpd.id}}
{{ xmProductCpd.productName }}
-
+ + + {{xmIteration.id}} +
{{ xmIteration.iterationName }}
+
+
+ + + {{xmTestPlan.id}}
{{ xmTestPlan.name }}
- {{ filters.testPlan.name }}选择计划 + {{ filters.testPlan.name }} + 清除 + 选择计划 查询 @@ -50,12 +60,13 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品 + import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面 import xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器 export default { components: { - XmProjectSelect,XmProductSelect,xmTestPlanSelect, + XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'], computed: { @@ -187,27 +198,32 @@ if(this.filters.project && this.filters.project.id){ params.projectId=this.filters.project.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 } - if(params.productId || params.projectId || params.planId || params.casedbId){ + if(params.productId || params.projectId || params.planId || params.casedbId || params.linkIterationId){ getXmTestCaseToPlanCalcList(params).then(res=>{ this.xmTestCaseToPlanCalcList=res.data.data }) }else{ - this.$message.error("请选择查询条件,产品、项目、测试计划最少选择一个") + this.$message.error("请选择查询条件,项目、产品、迭代、测试计划最少选择一个") } + }, + + onProjectSelected(project){ + this.filters.project=project + }, + + onProjectClear(){ + this.filters.project=null + }, onProductSelected(product){ this.filters.product=product @@ -217,15 +233,15 @@ this.filters.product=null }, - - onProjectSelected(project){ - this.filters.project=project + + onIterationSelected(iteration){ + this.filters.iteration=iteration }, - - onProjectClear(){ - this.filters.project=null - + + onIterationClear(){ + this.filters.iteration=null }, + onXmTestPlanSelected(xmTestPlan){ this.filters.testPlan=xmTestPlan }, diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index f7d49144..582990c3 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -12,15 +12,32 @@ - {{xmProject.id}}
{{ xmProject.name }}
- + {{xmProductCpd.id}}
{{ xmProductCpd.productName }}
-
+
+ + {{xmIteration.id}} +
{{ xmIteration.iterationName }}
+
+
+ + + + + {{xmTestPlan.id}} +
{{ xmTestPlan.name }}
+
+
+ + {{ filters.testPlan.name }} + 清除 + 选择计划 +
@@ -31,6 +48,8 @@ + + @@ -40,11 +59,17 @@ import { initSimpleDicts } from '@/api/mdp/meta/item';//下拉框数据查询 import { mapGetters } from 'vuex' import { getXmTestDayTimesList } from '@/api/xm/core/xmTestPlanCase'; - import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面 + + + import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 + import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品 + import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面 + import xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器 + export default { components: { - XmProductSelect, + XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, props:['xmProduct','xmProject'], computed: { @@ -116,19 +141,33 @@ },//end data methods: { getXmTestDayTimesList(){ - if(!this.filters.product){ - this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'}) - return; + + + var params={ } + if(this.filters.product && this.filters.product.id){ + params.productId=this.filters.product.id } - var params={productId:this.filters.product.id} - if(this.filters.startExecDate && this.filters.endExecDate){ - params.startExecDate=this.filters.startExecDate; - params.endExecDate=this.filters.endExecDate; + 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 } - getXmTestDayTimesList(params).then(res=>{ + if(this.filters.testCasedb && this.filters.testCasedb.id){ + params.casedbId=this.filters.testCasedb.id + } + if(params.productId || params.projectId || params.planId || params.casedbId || params.linkIterationId){ + getXmTestDayTimesList(params).then(res=>{ this.xmTestDayTimesList=res.data.tips.isOk?res.data.data:this.xmTestDayTimesList; }) + }else{ + this.$message.error("请选择查询条件,项目、产品、迭代、测试计划最少选择一个") + } + }, open(params){ this.visible=true; @@ -167,17 +206,37 @@ } ) }, + onProjectSelected(project){ + this.filters.project=project + }, + onProjectClear(){ + this.filters.project=null + + }, onProductSelected(product){ this.filters.product=product - this.xmTestDayTimesList=[]; }, onProductClear(){ this.filters.product=null - this.xmTestDayTimesList=[]; - + }, + + onIterationSelected(iteration){ + this.filters.iteration=iteration + }, + + onIterationClear(){ + this.filters.iteration=null + }, + + onXmTestPlanSelected(xmTestPlan){ + this.filters.testPlan=xmTestPlan + }, + + onXmTestPlanClear(){ + this.filters.testPlan=null }, },//end method mounted() { diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue index 33d3cc86..c8c3bc8b 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue @@ -19,14 +19,24 @@ {{xmProductCpd.id}}
{{ xmProductCpd.productName }}
-
+
+ + {{xmIteration.id}} +
{{ xmIteration.iterationName }}
+
+
+ + + {{xmTestPlan.id}}
{{ xmTestPlan.name }}
- {{ filters.testPlan.name }}选择计划 + {{ filters.testPlan.name }} + 清除 + 选择计划 查询 @@ -50,12 +60,13 @@ import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品 + import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面 import xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器 export default { components: { - XmProjectSelect,XmProductSelect,xmTestPlanSelect, + XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'], computed: { @@ -171,8 +182,7 @@ onXmQuestionSomeFieldsChange(fieldName,$event){ this.xmTestPlanCaseExecStatusDists=[] }, - searchXmTestPlanCaseExecStatusDist(){ - + searchXmTestPlanCaseExecStatusDist(){ var params={ } if(this.filters.product && this.filters.product.id){ params.productId=this.filters.product.id @@ -180,27 +190,31 @@ if(this.filters.project && this.filters.project.id){ params.projectId=this.filters.project.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 } - if(params.productId || params.projectId || params.planId || params.casedbId){ + if(params.productId || params.projectId || params.planId || params.casedbId || params.linkIterationId){ getXmTestPlanCaseExecStatusDist(params).then(res=>{ this.xmTestPlanCaseExecStatusDists=res.data.data }) }else{ - this.$message.error("请选择查询条件,产品、项目、测试计划最少选择一个") - } + this.$message.error("请选择查询条件,项目、产品、迭代、测试计划最少选择一个") + } + }, + onProjectSelected(project){ + this.filters.project=project + }, + + onProjectClear(){ + this.filters.project=null + }, onProductSelected(product){ this.filters.product=product @@ -210,14 +224,13 @@ this.filters.product=null }, - - onProjectSelected(project){ - this.filters.project=project + + onIterationSelected(iteration){ + this.filters.iteration=iteration }, - - onProjectClear(){ - this.filters.project=null - + + onIterationClear(){ + this.filters.iteration=null }, onXmTestPlanSelected(xmTestPlan){ this.filters.testPlan=xmTestPlan diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue index e92f8f7b..b5e8e1e1 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue @@ -19,14 +19,24 @@ {{xmProductCpd.id}}
{{ xmProductCpd.productName }}
-
+
+ + {{xmIteration.id}} +
{{ xmIteration.iterationName }}
+
+
+ + + {{xmTestPlan.id}}
{{ xmTestPlan.name }}
- {{ filters.testPlan.name }}选择计划 + {{ filters.testPlan.name }} + 清除 + 选择计划 查询 @@ -47,15 +57,16 @@ import { mapGetters } from 'vuex' import { getXmTestPlanCaseUserDist } from '@/api/xm/core/xmTestPlanCase'; - - import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 - import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//新增界面 + + import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';//项目 + import XmProductSelect from '@/views/xm/core/components/XmProductSelect';//产品 + import XmIterationSelect from '@/views/xm/core/components/XmIterationSelect';//迭代选择界面 import xmTestPlanSelect from '@/views/xm/core/xmTestPlan/XmTestPlanSelect';//计划选择器 export default { components: { - XmProjectSelect,XmProductSelect,xmTestPlanSelect, + XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, props:['xmProject','xmProduct','xmTestCasedb','xmTestPlan'], computed: { @@ -182,7 +193,6 @@ ) }, searchXmTestPlanCaseUserDist(){ - var params={ } if(this.filters.product && this.filters.product.id){ params.productId=this.filters.product.id @@ -190,30 +200,32 @@ if(this.filters.project && this.filters.project.id){ params.projectId=this.filters.project.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 } - - - if(params.productId || params.projectId || params.planId || params.casedbId){ + if(params.productId || params.projectId || params.planId || params.casedbId || params.linkIterationId){ getXmTestPlanCaseUserDist(params).then(res=>{ this.xmTestPlanCaseUserDists=res.data.data }) }else{ - this.$message.error("请选择查询条件,产品、项目、测试计划最少选择一个") - } + this.$message.error("请选择查询条件,项目、产品、迭代、测试计划最少选择一个") + } + }, + onProjectSelected(project){ + this.filters.project=project + }, + + onProjectClear(){ + this.filters.project=null + }, onProductSelected(product){ this.filters.product=product @@ -222,14 +234,14 @@ onProductClear(){ this.filters.product=null - }, - onProjectSelected(project){ - this.filters.project=project }, - - onProjectClear(){ - this.filters.project=null - + + onIterationSelected(iteration){ + this.filters.iteration=iteration + }, + + onIterationClear(){ + this.filters.iteration=null }, onXmTestPlanSelected(xmTestPlan){ this.filters.testPlan=xmTestPlan