diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList copy.vue b/src/views/xm/rpt/branch/branchWorkItemDayList copy.vue deleted file mode 100644 index bf14cc49..00000000 --- a/src/views/xm/rpt/branch/branchWorkItemDayList copy.vue +++ /dev/null @@ -1,375 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/views/xm/rpt/branch/branchWorkItemDayList.vue b/src/views/xm/rpt/branch/branchWorkItemDayList.vue index b83ea9c9..55b008dc 100644 --- a/src/views/xm/rpt/branch/branchWorkItemDayList.vue +++ b/src/views/xm/rpt/branch/branchWorkItemDayList.vue @@ -57,7 +57,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration','cfg','category','showToolBar','showParams','isRptCfg'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -159,6 +159,35 @@ } + 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.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 } diff --git a/src/views/xm/rpt/branch/menuDayAccumulate.vue b/src/views/xm/rpt/branch/menuDayAccumulate.vue index d0259322..ca35ae69 100644 --- a/src/views/xm/rpt/branch/menuDayAccumulate.vue +++ b/src/views/xm/rpt/branch/menuDayAccumulate.vue @@ -47,7 +47,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -121,6 +121,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -148,7 +153,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/branch/menuDayTrend.vue b/src/views/xm/rpt/branch/menuDayTrend.vue index f0e0d1da..4ec9193b 100644 --- a/src/views/xm/rpt/branch/menuDayTrend.vue +++ b/src/views/xm/rpt/branch/menuDayTrend.vue @@ -36,7 +36,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -111,6 +111,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -138,7 +143,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/branch/questionDayAccumulate.vue b/src/views/xm/rpt/branch/questionDayAccumulate.vue index 673555b7..981e2581 100644 --- a/src/views/xm/rpt/branch/questionDayAccumulate.vue +++ b/src/views/xm/rpt/branch/questionDayAccumulate.vue @@ -34,7 +34,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -109,6 +109,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -136,7 +141,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/branch/questionDayTrend.vue b/src/views/xm/rpt/branch/questionDayTrend.vue index ccbcb2f2..e21e9799 100644 --- a/src/views/xm/rpt/branch/questionDayTrend.vue +++ b/src/views/xm/rpt/branch/questionDayTrend.vue @@ -36,7 +36,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -111,6 +111,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -138,7 +143,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); this.$nextTick(()=>{ diff --git a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue index 50df81cd..aa958a11 100644 --- a/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue +++ b/src/views/xm/rpt/iteration/IterationWorkItemDayList.vue @@ -46,7 +46,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -119,6 +119,11 @@ startBizDate:'', endBizDate:'', }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -154,7 +159,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/iteration/burnout.vue b/src/views/xm/rpt/iteration/burnout.vue index 681c1d57..f5c4cab0 100644 --- a/src/views/xm/rpt/iteration/burnout.vue +++ b/src/views/xm/rpt/iteration/burnout.vue @@ -46,7 +46,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles', @@ -149,6 +149,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -195,7 +200,36 @@ 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.$nextTick(()=>{ this.listXmIterationStateHis(); }) diff --git a/src/views/xm/rpt/iteration/menuDayAccumulate.vue b/src/views/xm/rpt/iteration/menuDayAccumulate.vue index ab92870f..72b7ea21 100644 --- a/src/views/xm/rpt/iteration/menuDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/menuDayAccumulate.vue @@ -47,7 +47,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -144,6 +144,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -179,7 +184,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/iteration/menuDayTrend.vue b/src/views/xm/rpt/iteration/menuDayTrend.vue index b59b4768..a9046559 100644 --- a/src/views/xm/rpt/iteration/menuDayTrend.vue +++ b/src/views/xm/rpt/iteration/menuDayTrend.vue @@ -49,7 +49,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -146,6 +146,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -182,7 +187,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/iteration/questionDayAccumulate.vue b/src/views/xm/rpt/iteration/questionDayAccumulate.vue index a0d49e42..06ea06be 100644 --- a/src/views/xm/rpt/iteration/questionDayAccumulate.vue +++ b/src/views/xm/rpt/iteration/questionDayAccumulate.vue @@ -44,7 +44,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -141,6 +141,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -177,7 +182,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); diff --git a/src/views/xm/rpt/iteration/questionDayTrend.vue b/src/views/xm/rpt/iteration/questionDayTrend.vue index ee8551ec..b2137c10 100644 --- a/src/views/xm/rpt/iteration/questionDayTrend.vue +++ b/src/views/xm/rpt/iteration/questionDayTrend.vue @@ -48,7 +48,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmProject','xmIteration'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject','xmIteration'], computed: { ...mapGetters([ 'userInfo','roles' @@ -145,6 +145,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -180,7 +185,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); if(this.$refs['xmIterationSelect'])this.$refs['xmIterationSelect'].clearSelect(); this.$nextTick(()=>{ diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue index 925e3160..99d79ad6 100644 --- a/src/views/xm/rpt/product/menuAgeDist.vue +++ b/src/views/xm/rpt/product/menuAgeDist.vue @@ -71,7 +71,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -155,6 +155,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -171,7 +176,36 @@ 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.searchXmMenuAgeDist() diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue index 5ddebdae..80f92515 100644 --- a/src/views/xm/rpt/product/menuAttDist.vue +++ b/src/views/xm/rpt/product/menuAttDist.vue @@ -75,7 +75,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -180,6 +180,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'status', groupBys:[ {id:'status', name:'需求状态'}, @@ -228,7 +233,36 @@ 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.searchXmMenuAttDist() diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue index 1caaa82d..4e5e8534 100644 --- a/src/views/xm/rpt/product/menuDayAccumulate.vue +++ b/src/views/xm/rpt/product/menuDayAccumulate.vue @@ -38,7 +38,7 @@ components: { XmProductSelect, }, - props:['id','xmProduct','xmProject',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject',], computed: { ...mapGetters([ 'userInfo','roles' @@ -130,6 +130,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -161,7 +166,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue index 818cdf41..0b54de53 100644 --- a/src/views/xm/rpt/product/menuDayTrend.vue +++ b/src/views/xm/rpt/product/menuDayTrend.vue @@ -40,7 +40,7 @@ components: { XmProductSelect, }, - props:['id','xmProduct','xmProject',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject',], computed: { ...mapGetters([ 'userInfo','roles' @@ -133,6 +133,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -164,7 +169,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ this.listXmProductStateHis(); diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue index 69c9e811..24dbcc60 100644 --- a/src/views/xm/rpt/product/menuSort.vue +++ b/src/views/xm/rpt/product/menuSort.vue @@ -75,7 +75,7 @@ components: { XmIterationSelect,XmProductSelect, }, - props:['id','xmProduct','xmIteration','xmProject','initGroupBy',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject','initGroupBy',], computed: { ...mapGetters([ 'userInfo','roles' @@ -145,6 +145,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'proposer_id', groupBys:[ {id:'proposer_id', name:'提出人'}, @@ -181,7 +186,36 @@ 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.searchXmMenuSort() diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue index 15f4f6b6..aba0b858 100644 --- a/src/views/xm/rpt/product/productWorkItemDayList.vue +++ b/src/views/xm/rpt/product/productWorkItemDayList.vue @@ -39,7 +39,7 @@ components: { XmProductSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -108,6 +108,11 @@ startBizDate:'', endBizDate:'', }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -139,7 +144,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue index 98b2ea8d..a330fed4 100644 --- a/src/views/xm/rpt/product/questionAgeDist.vue +++ b/src/views/xm/rpt/product/questionAgeDist.vue @@ -104,7 +104,7 @@ components: { XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -185,6 +185,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -201,7 +206,36 @@ 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.searchXmQuestionAgeDist() }, diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue index d13b35fe..4d3ab145 100644 --- a/src/views/xm/rpt/product/questionAttDist.vue +++ b/src/views/xm/rpt/product/questionAttDist.vue @@ -108,7 +108,7 @@ components: { XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -221,6 +221,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'bug_status', groupBys:[ {id:'bug_status', name:'缺陷状态'}, @@ -272,7 +277,36 @@ 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.searchXmQuestionAttDist() }, drawCharts() { diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue index 6bd6925c..ac594657 100644 --- a/src/views/xm/rpt/product/questionDayAccumulate.vue +++ b/src/views/xm/rpt/product/questionDayAccumulate.vue @@ -38,7 +38,7 @@ components: { XmProductSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -132,6 +132,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -163,7 +168,36 @@ 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.xmProductStateHiss=[] if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue index 79025925..9edeb9d3 100644 --- a/src/views/xm/rpt/product/questionDayTrend.vue +++ b/src/views/xm/rpt/product/questionDayTrend.vue @@ -40,7 +40,7 @@ components: { XmProductSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -133,6 +133,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -164,7 +169,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ this.listXmProductStateHis(); diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue index 68df8950..56db082f 100644 --- a/src/views/xm/rpt/product/questionRetestDist.vue +++ b/src/views/xm/rpt/product/questionRetestDist.vue @@ -103,7 +103,7 @@ components: { XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'], computed: { ...mapGetters([ 'userInfo','roles' @@ -203,6 +203,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'handler_userid', groupBys:[ {id:'create_userid', name:'创建人'}, @@ -236,7 +241,36 @@ 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.searchXmQuestionRetestDist() }, diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue index 3bde877e..f958ca91 100644 --- a/src/views/xm/rpt/product/questionSort.vue +++ b/src/views/xm/rpt/product/questionSort.vue @@ -110,7 +110,7 @@ components: { XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan','initGroupBy'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan','initGroupBy'], computed: { ...mapGetters([ 'userInfo','roles' @@ -185,6 +185,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'handler_userid', groupBys:[ {id:'create_userid', name:'创建人'}, @@ -218,7 +223,36 @@ 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="企业工作项每日趋势图" + } if(this.initGroupBy){ this.groupBy=this.initGroupBy } diff --git a/src/views/xm/rpt/project/projectWorkItemDayList.vue b/src/views/xm/rpt/project/projectWorkItemDayList.vue index c702ab6f..a7da63dd 100644 --- a/src/views/xm/rpt/project/projectWorkItemDayList.vue +++ b/src/views/xm/rpt/project/projectWorkItemDayList.vue @@ -39,7 +39,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -104,6 +104,11 @@ startBizDate:'', endBizDate:'', }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], diff --git a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue index 405cd84f..b0e53a3e 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetDayList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetDayList.vue @@ -49,7 +49,7 @@ XmProjectSelect, "mdp-select-user-xm":()=>import("@/views/xm/core/components/MdpSelectUserXm/index") }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -117,6 +117,11 @@ userid:'', taskId:'' }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... diff --git a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue index d7d7d8f7..29c815f6 100644 --- a/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue +++ b/src/views/xm/rpt/project/projectWorkloadSetMonthList.vue @@ -48,7 +48,7 @@ XmProjectSelect, "mdp-select-user-xm":()=>import("@/views/xm/core/components/MdpSelectUserXm/index"), }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -117,6 +117,11 @@ userid:'', taskId:'' }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], diff --git a/src/views/xm/rpt/project/taskAgeDist.vue b/src/views/xm/rpt/project/taskAgeDist.vue index 5bd52934..37941bec 100644 --- a/src/views/xm/rpt/project/taskAgeDist.vue +++ b/src/views/xm/rpt/project/taskAgeDist.vue @@ -61,7 +61,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -133,6 +133,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], diff --git a/src/views/xm/rpt/project/taskAttDist.vue b/src/views/xm/rpt/project/taskAttDist.vue index a698d320..c6414028 100644 --- a/src/views/xm/rpt/project/taskAttDist.vue +++ b/src/views/xm/rpt/project/taskAttDist.vue @@ -68,7 +68,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -163,6 +163,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'task_state', groupBys:[ {id:'task_state', name:'任务状态'}, diff --git a/src/views/xm/rpt/project/taskDayAccumulate.vue b/src/views/xm/rpt/project/taskDayAccumulate.vue index 8280b966..6aa0b8fd 100644 --- a/src/views/xm/rpt/project/taskDayAccumulate.vue +++ b/src/views/xm/rpt/project/taskDayAccumulate.vue @@ -38,7 +38,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -138,6 +138,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], diff --git a/src/views/xm/rpt/project/taskDayTrend.vue b/src/views/xm/rpt/project/taskDayTrend.vue index f68f9d17..34a8fbd8 100644 --- a/src/views/xm/rpt/project/taskDayTrend.vue +++ b/src/views/xm/rpt/project/taskDayTrend.vue @@ -40,7 +40,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -132,6 +132,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], diff --git a/src/views/xm/rpt/project/taskSort.vue b/src/views/xm/rpt/project/taskSort.vue index 383274a6..43088e45 100644 --- a/src/views/xm/rpt/project/taskSort.vue +++ b/src/views/xm/rpt/project/taskSort.vue @@ -67,7 +67,7 @@ components: { XmProjectSelect, }, - props:['id','xmProduct','xmIteration','xmProject'], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProduct','xmIteration','xmProject'], computed: { ...mapGetters([ 'userInfo','roles' @@ -128,6 +128,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'create_userid', groupBys:[ {id:'create_userid', name:'创建人'}, diff --git a/src/views/xm/rpt/testCase/testCaseSort.vue b/src/views/xm/rpt/testCase/testCaseSort.vue index 8e6173ec..552e9006 100644 --- a/src/views/xm/rpt/testCase/testCaseSort.vue +++ b/src/views/xm/rpt/testCase/testCaseSort.vue @@ -82,7 +82,7 @@ components: { XmProjectSelect,XmProductSelect,XmIterationSelect }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','initGroupBy',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','initGroupBy',], computed: { ...mapGetters([ 'userInfo','roles' @@ -154,6 +154,11 @@ cpriority:'', caseType:'', }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 groupBy:'menu_id', groupBys:[ {id:'menu_id', name:'故事'}, diff --git a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue index cfe59e86..02bfe29f 100644 --- a/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue +++ b/src/views/xm/rpt/testPlan/testCaseToPlanCalc.vue @@ -70,7 +70,7 @@ components: { XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -161,6 +161,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{testStepTcode:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... @@ -323,7 +328,36 @@ 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.searchXmTestCaseToPlanCalcList(); diff --git a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue index 21a009f7..f07cf056 100644 --- a/src/views/xm/rpt/testPlan/testDayTimesCalc.vue +++ b/src/views/xm/rpt/testPlan/testDayTimesCalc.vue @@ -72,7 +72,7 @@ components: { XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -143,6 +143,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... dateRanger:[], @@ -185,7 +190,36 @@ 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="企业工作项每日趋势图" + } if(this.$refs['xmProductSelect'])this.$refs['xmProductSelect'].clearSelect(); this.$nextTick(()=>{ this.getXmTestDayTimesList(); diff --git a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue index 5f7d2deb..74f1f2f7 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseExecStatusDist.vue @@ -70,7 +70,7 @@ components: { XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -153,6 +153,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{testStepTcode:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... @@ -310,7 +315,36 @@ 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.searchXmTestPlanCaseExecStatusDist(); diff --git a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue index 2b29a545..bbc740bd 100644 --- a/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue +++ b/src/views/xm/rpt/testPlan/testPlanCaseUserDist.vue @@ -70,7 +70,7 @@ components: { XmProjectSelect,XmProductSelect,XmIterationSelect,xmTestPlanSelect, }, - props:['id','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], + props:['id','cfg','category','showToolBar','showParams','isRptCfg','xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',], computed: { ...mapGetters([ 'userInfo','roles' @@ -162,6 +162,11 @@ iteration:null, testCasedb:null, }, + params:{ + + }, + title:'',//报表配置项 + remark:'', //报表配置项 dicts:{testPlanTcode:[]},//下拉选择框的所有静态数据 params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} load:{ list: false, edit: false, del: false, add: false },//查询中... @@ -312,7 +317,36 @@ 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.searchXmTestPlanCaseUserDist(); } },//end method