diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index e982f86a..a7f27f63 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -31,6 +31,16 @@
+
+ {{xmTestPlan.id}}
+
{{ xmTestPlan.name }}
+
+
+
+ {{ filters.testPlan.name }}
+ 清除
+ 选择计划
+
@@ -73,7 +83,9 @@
-
+
+
+
@@ -88,11 +100,12 @@
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,XmIterationSelect,XmProductSelect,
+ XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect,
},
props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',],
computed: {
@@ -147,6 +160,7 @@
filters:{
product:null,
iteration:null,
+ testPlan:null,
},
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 },//查询中...
@@ -160,9 +174,11 @@
methods: {
open(params){
this.visible=true;
- this.filters.product=params.xmProduct
- this.filters.project=params.xmProject
- this.filters.iteration=params.xmIteration
+ 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
if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
this.searchXmQuestionAgeDist()
}
@@ -242,6 +258,12 @@
if(this.filters.iteration){
params.linkIterationId=this.filters.iteration.id
}
+ if(this.filters.testPlan && this.filters.testPlan.id){
+ params.planId=this.filters.testPlan.id
+ }
+ if(this.filters.testCasedb && this.filters.testCasedb.id){
+ params.casedbId=this.filters.testCasedb.id
+ }
params.groupBy=this.groupBy
getXmQuestionAgeDist(params).then(res=>{
this.xmQuestionAgeDists=res.data.data
@@ -271,7 +293,15 @@
onIterationClear(){
this.filters.iteration=null
- }
+ },
+
+ onXmTestPlanSelected(xmTestPlan){
+ this.filters.testPlan=xmTestPlan
+ },
+
+ onXmTestPlanClear(){
+ this.filters.testPlan=null
+ },
},//end method
mounted() {
initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index 2342fc80..52c09fec 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -36,6 +36,16 @@
+
+ {{xmTestPlan.id}}
+
{{ xmTestPlan.name }}
+
+
+
+ {{ filters.testPlan.name }}
+ 清除
+ 选择计划
+
@@ -77,7 +87,9 @@
-
+
+
+
@@ -92,11 +104,12 @@
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,XmIterationSelect,XmProductSelect,
+ XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect,
},
props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan',],
computed: {
@@ -183,6 +196,7 @@
filters:{
product:null,
iteration:null,
+ testPlan:null,
},
groupBy:'bug_status',
groupBys:[
@@ -229,9 +243,11 @@
},
open(params){
this.visible=true;
- this.filters.product=params.xmProduct
- this.filters.project=params.xmProject
- this.filters.iteration=params.xmIteration
+ 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
if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
this.searchXmQuestionAttDist()
@@ -315,6 +331,12 @@
if(this.filters.iteration){
params.linkIterationId=this.filters.iteration.id
}
+ if(this.filters.testPlan && this.filters.testPlan.id){
+ params.planId=this.filters.testPlan.id
+ }
+ if(this.filters.testCasedb && this.filters.testCasedb.id){
+ params.casedbId=this.filters.testCasedb.id
+ }
params.groupBy=this.groupBy
getXmQuestionAttDist(params).then(res=>{
this.xmQuestionAttDists=res.data.data
@@ -344,7 +366,15 @@
onIterationClear(){
this.filters.iteration=null
- }
+ },
+
+ onXmTestPlanSelected(xmTestPlan){
+ this.filters.testPlan=xmTestPlan
+ },
+
+ onXmTestPlanClear(){
+ this.filters.testPlan=null
+ },
},//end method
mounted() {
initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index dab7b054..2d599567 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -30,6 +30,16 @@
+
+
+ {{xmTestPlan.id}}
+
{{ xmTestPlan.name }}
+
+
+
+ {{ filters.testPlan.name }}
+ 清除
+ 选择计划
@@ -72,7 +82,9 @@
-
+
+
+
@@ -87,11 +99,12 @@
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,XmIterationSelect,XmProductSelect,
+ XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect,
},
props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan'],
computed: {
@@ -164,6 +177,7 @@
filters:{
product:null,
iteration:null,
+ testPlan:null,
},
groupBy:'handler_userid',
groupBys:[
@@ -194,9 +208,11 @@
methods: {
open(params){
this.visible=true;
- this.filters.product=params.xmProduct
- this.filters.project=params.xmProject
- this.filters.iteration=params.xmIteration
+ 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
if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
this.searchXmQuestionRetestDist()
@@ -285,6 +301,14 @@
if(this.filters.iteration){
params.linkIterationId=this.filters.iteration.id
}
+
+ if(this.filters.testPlan && this.filters.testPlan.id){
+ params.planId=this.filters.testPlan.id
+ }
+ if(this.filters.testCasedb && this.filters.testCasedb.id){
+ params.casedbId=this.filters.testCasedb.id
+ }
+
params.groupBy=this.groupBy
if (
this.pageInfo.orderFields != null &&
@@ -326,7 +350,15 @@
onIterationClear(){
this.filters.iteration=null
- }
+ },
+
+ onXmTestPlanSelected(xmTestPlan){
+ this.filters.testPlan=xmTestPlan
+ },
+
+ onXmTestPlanClear(){
+ this.filters.testPlan=null
+ },
},//end method
mounted() {
initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index f45c78f7..2ca484fc 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -37,6 +37,16 @@
+
+ {{xmTestPlan.id}}
+
{{ xmTestPlan.name }}
+
+
+
+ {{ filters.testPlan.name }}
+ 清除
+ 选择计划
+
@@ -79,6 +89,8 @@
+
+
@@ -93,11 +105,12 @@
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,XmIterationSelect,XmProductSelect,
+ XmProjectSelect,XmIterationSelect,XmProductSelect,xmTestPlanSelect,
},
props:['xmProject','xmProduct','xmIteration','xmTestCasedb','xmTestPlan','initGroupBy'],
computed: {
@@ -150,6 +163,7 @@
filters:{
product:null,
iteration:null,
+ testPlan:null,
},
groupBy:'handler_userid',
groupBys:[
@@ -181,9 +195,11 @@
methods: {
open(params){
this.visible=true;
- this.filters.product=params.xmProduct
- this.filters.project=params.xmProject
- this.filters.iteration=params.xmIteration
+ 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
if(this.initGroupBy){
this.groupBy=this.initGroupBy
}
@@ -257,6 +273,12 @@
params.linkIterationId=this.filters.iteration.id
}
+ if(this.filters.testPlan && this.filters.testPlan.id){
+ params.planId=this.filters.testPlan.id
+ }
+ if(this.filters.testCasedb && this.filters.testCasedb.id){
+ params.casedbId=this.filters.testCasedb.id
+ }
params.groupBy=this.groupBy
@@ -300,7 +322,15 @@
onIterationClear(){
this.filters.iteration=null
- }
+ },
+
+ onXmTestPlanSelected(xmTestPlan){
+ this.filters.testPlan=xmTestPlan
+ },
+
+ onXmTestPlanClear(){
+ this.filters.testPlan=null
+ },
},//end method
mounted() {
initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{