diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
index 2368f794..7919e25d 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsCard.vue
@@ -67,9 +67,7 @@ export default {
GridLayout: VueGridLayout.GridLayout,
GridItem: VueGridLayout.GridItem,
XmTestPlanMng,
- XmQuestionAgeDist,
- xmQuestionDayTrend,
- xmQuestionDayAccumulate,
+ XmQuestionAgeDist,
xmQuestionAttDist,
xmQuestionSort,
xmTestPlanCaseExecStatusDist,
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
index 3d79b7c6..4ebf0520 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
@@ -87,6 +87,27 @@ export default {
compDesc: '可以直接显示全部产品列表,可新增我的产品',
isChecked: false,
},
+ {
+ compId: 'xmQuestionMenuDist',
+ icon: img4,
+ compName: '缺陷故事分布',
+ compDesc: '可以直接显示全部产品列表,可新增我的产品',
+ isChecked: false,
+ },
+ {
+ compId: 'xmQuestionAskUserSort',
+ icon: img4,
+ compName: '缺陷提出人排行榜',
+ compDesc: '可以直接显示全部产品列表,可新增我的产品',
+ isChecked: false,
+ },
+ {
+ compId: 'xmQuestionHandlerUserSort',
+ icon: img4,
+ compName: '缺陷人员排行榜',
+ compDesc: '可以直接显示全部产品列表,可新增我的产品',
+ isChecked: false,
+ },
{
compId: 'xmQuestionStateDist',
icon: img4,
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue
new file mode 100644
index 00000000..ff46506a
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAskUserSort.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionDayAccumulate.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionDayAccumulate.vue
deleted file mode 100644
index 907ffa6b..00000000
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionDayAccumulate.vue
+++ /dev/null
@@ -1,259 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionDayTrend.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionDayTrend.vue
deleted file mode 100644
index f204887b..00000000
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionDayTrend.vue
+++ /dev/null
@@ -1,257 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- 查询
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue
new file mode 100644
index 00000000..62b133cc
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionFuncSort.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue
new file mode 100644
index 00000000..78e1f2b5
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionHandlerUserSort.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue
new file mode 100644
index 00000000..8d35f47c
--- /dev/null
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionMenuSort.vue
@@ -0,0 +1,44 @@
+
+
+
+
+
+
+
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
index 3f04093b..09cc2731 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionSort.vue
@@ -1,15 +1,10 @@
-
-
-
-
-
-
+
+ {{comp?comp.compName:'缺陷排行榜'}}
+
+
+
@@ -61,7 +56,14 @@
查询
-
+
+
+
+
@@ -81,7 +83,7 @@
components: {
XmIterationSelect,XmProductSelect,
},
- props:['xmProduct','xmIteration','xmProject'],
+ props:['xmTestPlan','xmRptConfig','comp','groupBy'],
computed: {
...mapGetters([
'userInfo','roles'
@@ -94,7 +96,7 @@
}
},
title(){
- return this.groupBys.find(i=>i.id==this.groupBy).name+'排行榜'
+ return this.groupBys.find(i=>i.id==this.filters.groupBy).name+'排行榜'
},
legendCpd(){
if(this.xmQuestionSorts.length==0){
@@ -112,11 +114,9 @@
},
data() {
return {
- filters:{
- product:null,
- iteration:null,
+ filters:{
+ groupBy:'handler_userid',
},
- groupBy:'handler_userid',
groupBys:[
{id:'create_userid', name:'创建人'},
{id:'ask_userid', name:'提出人'},
@@ -174,7 +174,7 @@
this.xmQuestionSorts=[]
},
searchXmQuestionSort(){
- if(!this.groupBy){
+ if(!this.filters.groupBy){
this.$notify({position:'bottom-left',showClose:true,message:'请选中分组属性',type:'warning'})
return
}
@@ -205,7 +205,7 @@
if(this.filters.priority){
params.priority=this.filters.priority
}
- params.groupBy=this.groupBy
+ params.groupBy=this.filters.groupBy
if(this.filters.product){
params.productId=this.filters.product.id
}
@@ -247,12 +247,32 @@
onIterationClear(){
this.filters.iteration=null
+ } ,
+ initData(){
+ if(this.groupBy){
+ this.filters.groupBy=this.groupBy
+ }
+ if(this.xmTestPlan){
+ this.filters.productId=this.xmTestPlan.productId
+ this.filters.projectId=this.xmTestPlan.projectId
+ this.filters.planId=this.xmTestPlan.id
+ }
+ if(this.xmRptConfig && this.xmRptConfig.cfg){
+ var compCfg=this.xmRptConfig.cfg.find(k=>k.id==this.comp.id)
+ if(compCfg && compCfg.params){
+ compCfg.params.forEach(k=>{
+ this.filters[k.id]=k.value
+ })
+ }
+ }
}
},//end method
mounted() {
initSimpleDicts('all',['bugSeverity','bugSolution','bugStatus','bugType','priority','bugRepRate','bugReason'] ).then(res=>{
this.dicts=res.data.data;
})
+ this.initData();
+ this.searchXmQuestionSort();
//this.charts();
//this.drawCharts();