From d0368b953e238fd96a37e28e0566dc791c7febd2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Mon, 1 Aug 2022 21:58:46 +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

---
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     |  2 +-
 src/views/xm/core/xmTestPlan/rpt/CompsSet.vue | 53 +++++++++++++++----
 .../xmTestPlan/rpt/biz/questionAgeDist.vue    | 25 +++++----
 3 files changed, 59 insertions(+), 21 deletions(-)

diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 939db21a..e2e78b26 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -26,7 +26,7 @@
                         </span>
                         <span v-if="subPage=='testRpt'">
                         <el-divider direction="vertical"></el-divider>
-                        <el-button @click="showRptConfig">配置报告</el-button>
+                        <el-button @click="showRptConfig" icon="el-icon-s-tools">配置报告</el-button>
                         </span>
                      </span>
                 </el-row> 
diff --git a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
index faf567ba..5e3c07da 100644
--- a/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/CompsSet.vue
@@ -46,33 +46,68 @@ export default {
         return { 
             comps: [
                 {
-                    compId: 'dsp',
+                    compId: 'xmTestRptOverview',
                     icon: img1,
-                    compName: '待审批',
+                    compName: '报告总览',
                     compDesc: '可以直接显示全部待审批列表，也可根据审批分类详细筛选单条待审批事项',
                     isChecked: false,
                 },
                 {
-                    compId: 'wdrw',
+                    compId: 'xmTestRptSummary',
                     icon: img2,
-                    compName: '我的任务',
+                    compName: '报告总结',
                     compDesc: '可以直接显示全部任务列表，也可根据状态、类型详细筛选分类的任务',
                     isChecked: false,
                 },
                 {
-                    compId: 'wdxm',
+                    compId: 'xmTestExecResultDist',
                     icon: img3,
-                    compName: '我的项目',
+                    compName: '执行结果分布',
                     compDesc: '可以直接显示全部项目列表，也可根据项目状态产品筛选单条项目',
                     isChecked: false,
                 },
                 {
-                    compId: 'wdcp',
+                    compId: 'xmTestDayTimesCalc',
                     icon: img4,
-                    compName: '我的产品',
+                    compName: '每日测试次数统计',
                     compDesc: '可以直接显示全部产品列表，可新增我的产品',
                     isChecked: false,
-                }
+                },
+                {
+                    compId: 'xmQuestionFuncDist',
+                    icon: img4,
+                    compName: '缺陷模块分布',
+                    compDesc: '可以直接显示全部产品列表，可新增我的产品',
+                    isChecked: false,
+                },
+                {
+                    compId: 'xmQuestionStateDist',
+                    icon: img4,
+                    compName: '缺陷状态分布',
+                    compDesc: '可以直接显示全部产品列表，可新增我的产品',
+                    isChecked: false,
+                },
+                {
+                    compId: 'xmQuestionReTestingDist',
+                    icon: img4,
+                    compName: '缺陷回归分布',
+                    compDesc: '可以直接显示全部产品列表，可新增我的产品',
+                    isChecked: false,
+                },
+                {
+                    compId: 'xmQuestionAttDist',
+                    icon: img4,
+                    compName: '缺陷属性分布',
+                    compDesc: '可以直接显示全部产品列表，可新增我的产品',
+                    isChecked: false,
+                },
+                {
+                    compId: 'xmQuestionAgeDist',
+                    icon: img4,
+                    compName: '缺陷年龄分布',
+                    compDesc: '可以直接显示全部产品列表，可新增我的产品',
+                    isChecked: false,
+                } 
             ],
             
         }
diff --git a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
index 23b6f01b..d1e9a802 100644
--- a/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
+++ b/src/views/xm/core/xmTestPlan/rpt/biz/questionAgeDist.vue
@@ -1,14 +1,9 @@
 <template>
 	<section> 
-		<el-row :gutter="5">
-				<el-col :span="18"> 
-					<div>
-						<div class="main" id="xmQuestionAgeDist"
-							style="width:100%;height:600px;margin:0 auto;"></div>
-						<div class="progress"></div>
-					</div>
-				</el-col>
-				<el-col :span="6" class="border padding">
+		<el-row class="padding">
+			<span>缺陷年龄分布</span>
+			<el-popover   trigger="manual" v-model="conditionBtnVisible" style="float:right;" width="300">  
+				<el-button slot="reference" icon="el-icon-more" @click="conditionBtnVisible=!conditionBtnVisible"></el-button> 
 					<el-form :model="filters">   
 						<el-form-item label="归属产品"  v-if="!xmProduct && !xmIteration">
 							 <xm-product-select   ref="xmProductSelect" style="display:inline;"  :auto-select="false" :link-project-id="xmProject?xmProject.id:null" @row-click="onProductSelected"  :iterationId="xmIteration?xmIteration.id:null"  @clear="onProductClear"></xm-product-select>
@@ -56,8 +51,15 @@
 					<el-form-item>
 						 <el-button type="primary" icon="el-icon-search" @click="searchXmQuestionAgeDist">查询</el-button>
 					</el-form-item>  
-					</el-form>
-				</el-col>
+					</el-form> 
+			</el-popover>
+		</el-row>
+		<el-row> 
+					<div>
+						<div class="main" id="xmQuestionAgeDist"
+							style="width:100%;height:600px;margin:0 auto;"></div>
+						<div class="progress"></div>
+					</div>  
 			</el-row>
  	</section>
 </template>
@@ -120,6 +122,7 @@
                 maxTableHeight:300, 
                 visible:false,
 				xmQuestionAgeDists:[],
+				conditionBtnVisible:false,
 
 			}//end return
 		},//end data