From a2011d893ae685c0d0f1f65a28db9bbaa494e458 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Fri, 27 Jan 2023 00:13:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/xm/rpt/product/menuAgeDist.vue      |  2 +-
 src/views/xm/rpt/product/menuAttDist.vue      |  2 +-
 .../xm/rpt/product/menuDayAccumulate.vue      |  2 +-
 src/views/xm/rpt/product/menuDayTrend.vue     |  2 +-
 src/views/xm/rpt/product/menuSort.vue         |  2 +-
 .../xm/rpt/product/productWorkItemDayList.vue |  2 +-
 src/views/xm/rpt/product/questionAgeDist.vue  |  2 +-
 src/views/xm/rpt/product/questionAttDist.vue  |  3 ++-
 .../xm/rpt/product/questionDayAccumulate.vue  |  2 +-
 src/views/xm/rpt/product/questionDayTrend.vue |  2 +-
 .../xm/rpt/product/questionRetestDist.vue     |  2 +-
 src/views/xm/rpt/product/questionSort.vue     |  9 ++++++---
 src/views/xm/rpt/reportIndex.vue              | 19 ++++++++++++++++---
 13 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/src/views/xm/rpt/product/menuAgeDist.vue b/src/views/xm/rpt/product/menuAgeDist.vue
index bed65861..ddf54562 100644
--- a/src/views/xm/rpt/product/menuAgeDist.vue
+++ b/src/views/xm/rpt/product/menuAgeDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuAgeDist"
diff --git a/src/views/xm/rpt/product/menuAttDist.vue b/src/views/xm/rpt/product/menuAttDist.vue
index aa3e2c81..4702672f 100644
--- a/src/views/xm/rpt/product/menuAttDist.vue
+++ b/src/views/xm/rpt/product/menuAttDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuAttDist"
diff --git a/src/views/xm/rpt/product/menuDayAccumulate.vue b/src/views/xm/rpt/product/menuDayAccumulate.vue
index 46131811..f033673a 100644
--- a/src/views/xm/rpt/product/menuDayAccumulate.vue
+++ b/src/views/xm/rpt/product/menuDayAccumulate.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> <div>
 					<div class="main" id="menuDayAccumulate"
 							style="width:100%;height:600px;margin:0 auto;"></div> 
diff --git a/src/views/xm/rpt/product/menuDayTrend.vue b/src/views/xm/rpt/product/menuDayTrend.vue
index b12e7d73..a793d387 100644
--- a/src/views/xm/rpt/product/menuDayTrend.vue
+++ b/src/views/xm/rpt/product/menuDayTrend.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="menuDayTrend"
diff --git a/src/views/xm/rpt/product/menuSort.vue b/src/views/xm/rpt/product/menuSort.vue
index 0dfee259..d4179943 100644
--- a/src/views/xm/rpt/product/menuSort.vue
+++ b/src/views/xm/rpt/product/menuSort.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmMenuSort"
diff --git a/src/views/xm/rpt/product/productWorkItemDayList.vue b/src/views/xm/rpt/product/productWorkItemDayList.vue
index 9e9c12c3..6d3b4590 100644
--- a/src/views/xm/rpt/product/productWorkItemDayList.vue
+++ b/src/views/xm/rpt/product/productWorkItemDayList.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
  
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div> 
 						<div class="main" id="productWorkItemDayList" style="width:100%;height:600px;margin:0 auto;"></div> 
diff --git a/src/views/xm/rpt/product/questionAgeDist.vue b/src/views/xm/rpt/product/questionAgeDist.vue
index 776feff0..8f5b0e84 100644
--- a/src/views/xm/rpt/product/questionAgeDist.vue
+++ b/src/views/xm/rpt/product/questionAgeDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionAgeDist"
diff --git a/src/views/xm/rpt/product/questionAttDist.vue b/src/views/xm/rpt/product/questionAttDist.vue
index ef931177..75bdc5f9 100644
--- a/src/views/xm/rpt/product/questionAttDist.vue
+++ b/src/views/xm/rpt/product/questionAttDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionAttDist"
@@ -171,6 +171,7 @@
 	    },
 		data() {
 			return {
+				id:Math.floor(Math.random() * 10000000),
                 filters:{
                     product:null,  
 					iteration:null,
diff --git a/src/views/xm/rpt/product/questionDayAccumulate.vue b/src/views/xm/rpt/product/questionDayAccumulate.vue
index 2454f967..67ec5c08 100644
--- a/src/views/xm/rpt/product/questionDayAccumulate.vue
+++ b/src/views/xm/rpt/product/questionDayAccumulate.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> <div>
 					<div class="main" id="questionDayAccumulate"
 							style="width:100%;height:600px;margin:0 auto;"></div> 
diff --git a/src/views/xm/rpt/product/questionDayTrend.vue b/src/views/xm/rpt/product/questionDayTrend.vue
index 5bec1c30..18c21d20 100644
--- a/src/views/xm/rpt/product/questionDayTrend.vue
+++ b/src/views/xm/rpt/product/questionDayTrend.vue
@@ -2,7 +2,7 @@
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
 			
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="questionDayTrend"
diff --git a/src/views/xm/rpt/product/questionRetestDist.vue b/src/views/xm/rpt/product/questionRetestDist.vue
index 2aaa72fd..166bb478 100644
--- a/src/views/xm/rpt/product/questionRetestDist.vue
+++ b/src/views/xm/rpt/product/questionRetestDist.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionRetestDist"
diff --git a/src/views/xm/rpt/product/questionSort.vue b/src/views/xm/rpt/product/questionSort.vue
index f620ee22..816be197 100644
--- a/src/views/xm/rpt/product/questionSort.vue
+++ b/src/views/xm/rpt/product/questionSort.vue
@@ -1,7 +1,7 @@
 <template>
 	<section>
         <el-dialog fullscreen :title="dialogTitle" append-to-body modal-append-to-body width="80%" top="20px" :visible.sync="visible">
-			<el-row :gutter="5">
+			<el-row :gutter="5" v-if="visible">
 				<el-col :span="18"> 
 					<div>
 						<div class="main" id="xmQuestionSort"
@@ -90,7 +90,7 @@
 		components: {   
 			XmIterationSelect,XmProductSelect,
 		},
-        props:['xmProduct','xmIteration','xmProject'],
+        props:['xmProduct','xmIteration','xmProject','initGroupBy'],
 		computed: {
 		    ...mapGetters([
 		      'userInfo','roles'
@@ -148,6 +148,7 @@
 					{id:'ask_userid', name:'提出人'},
 					{id:'handler_userid', name:'负责人'},
 					{id:'menu_id', name:'故事'}, 
+					{id:'func_id', name:'模块'}, 
 					
 				],
 				dicts:{},//下拉选择框的所有静态数据  params=[{categoryId:'0001',itemCode:'sex'}] 返回结果 {'sex':[{optionValue:'1',optionName:'男',seqOrder:'1',fp:'',isDefault:'0'},{optionValue:'2',optionName:'女',seqOrder:'2',fp:'',isDefault:'0'}]} 
@@ -174,7 +175,9 @@
 				this.filters.product=params.xmProduct
 				this.filters.project=params.xmProject
 				this.filters.iteration=params.xmIteration 
-				
+				if(this.initGroupBy){
+					this.groupBy=this.initGroupBy
+				}
 				if((this.filters.product && this.filters.product.id) || ( this.filters.iteration && this.filters.iteration.id)){
 					this.searchXmQuestionSort()
 				}
diff --git a/src/views/xm/rpt/reportIndex.vue b/src/views/xm/rpt/reportIndex.vue
index 3a161d21..2226304e 100644
--- a/src/views/xm/rpt/reportIndex.vue
+++ b/src/views/xm/rpt/reportIndex.vue
@@ -46,8 +46,15 @@
         <xm-question-day-trend ref="xmQuestionDayTrend" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-day-trend>
         <xm-question-day-accumulate ref="xmQuestionDayAccumulate" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-day-accumulate>
         <xm-question-att-dist ref="xmQuestionAttDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-att-dist>
+        <xm-question-state-dist ref="xmQuestionStateDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-state-dist>
+
         <xm-question-age-dist ref="xmQuestionAgeDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-age-dist>
         <xm-question-sort ref="xmQuestionSort" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-sort>
+        <xm-question-ask-user-sort ref="xmQuestionAskUserSort" init-group-by="ask_userid" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-ask-user-sort>
+        <xm-question-handler-user-sort ref="xmQuestionHandlerUserSort" init-group-by="handler_userid"  :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-handler-user-sort>
+        <xm-question-func-sort ref="xmQuestionFuncSort" init-group-by="func_id"  :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-func-sort>
+        <xm-question-menu-sort ref="xmQuestionMenuSort" init-group-by="menu_id"  :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-menu-sort>
+        
         <xm-question-retest-dist ref="xmQuestionRetestDist" :xm-product="xmProduct" :xm-project="xmProject"  :xm-iteration="xmIteration"></xm-question-retest-dist>
         <xm-product-work-item-day-list ref="xmProductWorkItemDayList" :xm-product="xmProduct" :xm-project="xmProject"></xm-product-work-item-day-list>
         <xm-iteration-work-item-day-list ref="xmIterationWorkItemDayList" :xm-product="xmProduct" :xm-project="xmProject" :xm-iteration="xmIteration"></xm-iteration-work-item-day-list>
@@ -90,8 +97,13 @@
     import xmIterationXmQuestionDayTrend from './iteration/questionDayTrend'
     import xmIterationXmQuestionDayAccumulate from './iteration/questionDayAccumulate'
 	import xmQuestionAttDist from './product/questionAttDist'
+	import xmQuestionStateDist from './product/questionAttDist'
 	import xmQuestionAgeDist from './product/questionAgeDist'
 	import xmQuestionSort from './product/questionSort'
+	import xmQuestionAskUserSort from './product/questionSort'
+	import xmQuestionHandlerUserSort from './product/questionSort' 
+	import xmQuestionFuncSort from './product/questionSort'
+	import xmQuestionMenuSort from './product/questionSort' 
 	import xmQuestionRetestDist from './product/questionRetestDist'
 
     
@@ -111,7 +123,8 @@
             xmIterationBurnout,xmMenuDayTrend,xmMenuDayAccumulate,xmMenuAttDist,xmMenuAgeDist,xmMenuSort,xmProductWorkItemDayList,xmTaskDayTrend,xmTaskDayAccumulate,xmTaskAttDist,xmTaskAgeDist,xmTaskSort,xmProjectWorkItemDayList,xmProjectWorkloadSetDayList,xmProjectWorkloadSetMonthList,xmQuestionDayTrend,xmQuestionDayAccumulate,xmQuestionAttDist,xmQuestionAgeDist,xmQuestionSort,
             xmIterationXmMenuDayTrend,xmIterationXmMenuDayAccumulate,xmIterationWorkItemDayList,xmIterationXmQuestionDayTrend,xmIterationXmQuestionDayAccumulate,
             
-            xmTestPlanCaseExecStatusDist,xmTestPlanCaseUserDist,xmQuestionRetestDist
+            xmTestPlanCaseExecStatusDist,xmTestPlanCaseUserDist,xmQuestionRetestDist,xmQuestionStateDist,
+            xmQuestionAskUserSort,xmQuestionHandlerUserSort,xmQuestionFuncSort,xmQuestionMenuSort,
         
         },
         props:['xmProduct','xmIteration','xmProject','xmTestCasedb','xmTestPlan'],
@@ -206,8 +219,8 @@
                     {rptName:'缺陷年龄分布',category:'测试计划级',ref:'xmQuestionAgeDist',desc:'统计所有缺陷按照年龄的分布情况，跟踪缺陷的生命周期和响应情况',img:pieSimple  },
                     {rptName:'缺陷提出人排行榜',category:'测试计划级',ref:'xmQuestionAskUserSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
                     {rptName:'缺陷负责人排行榜',category:'测试计划级',ref:'xmQuestionHandlerUserSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                    {rptName:'缺陷模块排行榜',category:'测试计划级',ref:'xmQuestionSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                    {rptName:'缺陷需求排行榜',category:'测试计划级',ref:'xmQuestionSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                    {rptName:'缺陷模块排行榜',category:'测试计划级',ref:'xmQuestionFuncSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                    {rptName:'缺陷需求排行榜',category:'测试计划级',ref:'xmQuestionMenuSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
 
                     
                 ],