diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue index ca35ae69..bb15b669 100644 --- a/src/views/xm/rpt/branch/menuDayAccumulate.vue +++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue @@ -122,7 +122,7 @@ testCasedb:null, }, params:{ - + }, title:'',//报表配置项 remark:'', //报表配置项 @@ -138,11 +138,7 @@ methods: { listXmBranchStateHis(){ - var params={orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} listXmBranchStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue index 4ec9193b..2e07d2a5 100644 --- a/src/views/xm/rpt/branch/menuDayTrend.vue +++ b/src/views/xm/rpt/branch/menuDayTrend.vue @@ -127,12 +127,7 @@ },//end data methods: { listXmBranchStateHis(){ - var params={orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} listXmBranchStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue index 981e2581..383d7c88 100644 --- a/src/views/xm/rpt/branch/questionDayAccumulate.vue +++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue @@ -126,11 +126,7 @@ methods: { listXmBranchStateHis(){ - var params={orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} listXmBranchStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue index e21e9799..164170e5 100644 --- a/src/views/xm/rpt/branch/questionDayTrend.vue +++ b/src/views/xm/rpt/branch/questionDayTrend.vue @@ -128,11 +128,7 @@ methods: { listXmBranchStateHis(){ - var params={orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} listXmBranchStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue index aa958a11..4d79bfc3 100644 --- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue +++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue @@ -144,11 +144,7 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} listXmIterationStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue index f5c4cab0..405d863c 100644 --- a/src/views/xm/rpt/iteration/burnout.vue +++ b/src/views/xm/rpt/iteration/burnout.vue @@ -189,7 +189,7 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} + var params={...this.params,orderBy:'biz_date asc'} listXmIterationStateHis(params).then(res=>{ this.xmIterationStateHiss=res.data.tips.isOk?res.data.data:this.xmIterationStateHiss; }) diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue index 72b7ea21..26b5bb1c 100644 --- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue @@ -168,12 +168,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmIterationStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue index a9046559..8eb5bae4 100644 --- a/src/views/xm/rpt/iteration/menuDayTrend.vue +++ b/src/views/xm/rpt/iteration/menuDayTrend.vue @@ -171,12 +171,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmIterationStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue index 06ea06be..4f07ab68 100644 --- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue @@ -166,12 +166,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmIterationStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue index b2137c10..9c8fb502 100644 --- a/src/views/xm/rpt/iteration/questionDayTrend.vue +++ b/src/views/xm/rpt/iteration/questionDayTrend.vue @@ -169,12 +169,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中迭代',type:'warning'}) return; } - var params={productId:this.filters.product.id,iterationId:this.filters.iteration.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmIterationStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue index 4e5e8534..94f214a0 100644 --- a/src/views/xm/rpt/product/menuDayAccumulate.vue +++ b/src/views/xm/rpt/product/menuDayAccumulate.vue @@ -150,12 +150,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'}) return; } - var params={productId:this.filters.product.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProductStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue index 0b54de53..a5875005 100644 --- a/src/views/xm/rpt/product/menuDayTrend.vue +++ b/src/views/xm/rpt/product/menuDayTrend.vue @@ -153,12 +153,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'}) return; } - var params={productId:this.filters.product.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProductStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index aba0b858..cc83014b 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -129,11 +129,8 @@ return; } - var params={productId:this.filters.product.id,orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProductStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue index ac594657..d81e9804 100644 --- a/src/views/xm/rpt/product/questionDayAccumulate.vue +++ b/src/views/xm/rpt/product/questionDayAccumulate.vue @@ -152,12 +152,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'}) return; } - var params={productId:this.filters.product.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProductStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue index 9edeb9d3..7fbb2d2e 100644 --- a/src/views/xm/rpt/product/questionDayTrend.vue +++ b/src/views/xm/rpt/product/questionDayTrend.vue @@ -153,12 +153,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中产品',type:'warning'}) return; } - var params={productId:this.filters.product.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProductStateHis(params).then(res=>{ this.xmProductStateHiss=res.data.tips.isOk?res.data.data:this.xmProductStateHiss; }) diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue index a7da63dd..d05fecaa 100644 --- a/src/views/xm/rpt/project/projectWorkItemDayList.vue +++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue @@ -125,11 +125,8 @@ return; } - var params={projectId: this.filters.project.id,orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProjectStateHis(params).then(res=>{ this.xmProjectStateHiss=res.data.tips.isOk?res.data.data:this.xmProjectStateHiss; }) diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue index b0e53a3e..23db4b2d 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue @@ -139,17 +139,8 @@ return; } - var params={projectId: this.filters.project.id,orderBy:'biz_date asc'} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } - if(this.filters.userid){ - params.userid=this.filters.userid - } - if(this.filters.taskId){ - params.taskId=this.filters.taskId - } + var params={...this.params,orderBy:'biz_date asc'} + listProjectWorkloadSetDay(params).then(res=>{ this.xmProjectWorkloadSetDays=res.data.tips.isOk?res.data.data:this.xmProjectWorkloadSetDays; }) @@ -158,7 +149,7 @@ this.visible=true; this.filters.product=this.xmProduct this.filters.project=this.xmProject - this.filters.iteration=this.xmIteration + this.filters.iteration=this.xmIteration this.xmProjectWorkloadSetDays=[] this.$nextTick(()=>{ if(this.$refs['xmProjectSelect'])this.$refs['xmProjectSelect'].clearSelect(); diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue index 29c815f6..bfb253a1 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue @@ -138,18 +138,8 @@ return; } - var params={projectId: this.filters.project.id} - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } - - if(this.filters.userid){ - params.userid=this.filters.userid - } - if(this.filters.taskId){ - params.taskId=this.filters.taskId - } + var params={...this.params} + listProjectWorkloadSetMonth(params).then(res=>{ this.xmProjectWorkloadSetMonths=res.data.tips.isOk?res.data.data:this.xmProjectWorkloadSetMonths; }) diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue index 6aa0b8fd..39e4c2fc 100644 --- a/src/views/xm/rpt/project/taskDayAccumulate.vue +++ b/src/views/xm/rpt/project/taskDayAccumulate.vue @@ -158,12 +158,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中项目',type:'warning'}) return; } - var params={projectId: this.filters.project.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProjectStateHis(params).then(res=>{ this.xmProjectStateHiss=res.data.tips.isOk?res.data.data:this.xmProjectStateHiss; }) diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index 34a8fbd8..772398df 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -152,12 +152,8 @@ this.$notify({position:'bottom-left',showClose:true,message:'请先选中项目',type:'warning'}) return; } - var params={projectId: this.filters.project.id,orderBy:'biz_date asc'} - - if(this.filters.startBizDate && this.filters.endBizDate){ - params.startBizDate=this.filters.startBizDate; - params.endBizDate=this.filters.endBizDate; - } + var params={...this.params,orderBy:'biz_date asc'} + listXmProjectStateHis(params).then(res=>{ this.xmProjectStateHiss=res.data.tips.isOk?res.data.data:this.xmProjectStateHiss; }) diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index f07cf056..27863bef 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -158,31 +158,11 @@ }//end return },//end data methods: { - getXmTestDayTimesList(){ - - - 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 - } + getXmTestDayTimesList(){ + var params={ ...this.params,} getXmTestDayTimesList(params).then(res=>{ this.xmTestDayTimesList=res.data.tips.isOk?res.data.data:this.xmTestDayTimesList; - }) - - + }) }, open(){ this.visible=true;