From 964916bd0ba7f00bb6681d347666ce0088e8e004 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=99=88=E8=A3=95=E8=B4=A2?= <cyc58469@163.com>
Date: Sun, 5 Feb 2023 22:14:43 +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/router/routes_xm.js                       |  14 +-
 .../xm/core/xmTestPlan/XmTestPlanInfo.vue     |   6 +-
 .../branch/branchRptOverview.vue}             | 265 ++++-------------
 src/views/xm/rpt/comps.js                     |  67 -----
 src/views/xm/rpt/{ => index}/CompsCard.vue    |   2 +-
 .../xm/rpt/{ => index}/CompsCardHisDetail.vue |   4 +-
 src/views/xm/rpt/{ => index}/CompsSet.vue     |  53 ++--
 src/views/xm/rpt/{ => index}/common.scss      |   0
 src/views/xm/rpt/index/comps.js               |  66 +++++
 src/views/xm/rpt/{ => index}/index.scss       |   0
 src/views/xm/rpt/{ => index}/index.vue        |   0
 src/views/xm/rpt/{ => index}/indexForHis.vue  |   0
 .../xm/rpt/{ => index}/indexForHisDetail.vue  |   0
 .../xm/rpt/{ => index}/indexForIteration.vue  |   0
 .../xm/rpt/{ => index}/indexForProduct.vue    |   0
 .../xm/rpt/{ => index}/indexForProject.vue    |   0
 src/views/xm/rpt/{ => index}/indexForTest.vue |   0
 src/views/xm/rpt/index/overview.scss          | 145 ++++++++++
 .../xm/rpt/iteration/iterationRptOverview.vue | 266 ++++++++++++++++++
 .../xm/rpt/product/productRptOverview.vue     | 266 ++++++++++++++++++
 .../xm/rpt/project/projectRptOverview.vue     | 266 ++++++++++++++++++
 .../xm/rpt/testCase/testCasedbRptOverview.vue | 266 ++++++++++++++++++
 .../xm/rpt/testPlan/testPlanRptOverview.vue   | 147 +---------
 23 files changed, 1379 insertions(+), 454 deletions(-)
 rename src/views/xm/{core/xmTestPlan/xmTestRptOverview.vue => rpt/branch/branchRptOverview.vue} (54%)
 delete mode 100644 src/views/xm/rpt/comps.js
 rename src/views/xm/rpt/{ => index}/CompsCard.vue (99%)
 rename src/views/xm/rpt/{ => index}/CompsCardHisDetail.vue (98%)
 rename src/views/xm/rpt/{ => index}/CompsSet.vue (77%)
 rename src/views/xm/rpt/{ => index}/common.scss (100%)
 create mode 100644 src/views/xm/rpt/index/comps.js
 rename src/views/xm/rpt/{ => index}/index.scss (100%)
 rename src/views/xm/rpt/{ => index}/index.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForHis.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForHisDetail.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForIteration.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForProduct.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForProject.vue (100%)
 rename src/views/xm/rpt/{ => index}/indexForTest.vue (100%)
 create mode 100644 src/views/xm/rpt/index/overview.scss
 create mode 100644 src/views/xm/rpt/iteration/iterationRptOverview.vue
 create mode 100644 src/views/xm/rpt/product/productRptOverview.vue
 create mode 100644 src/views/xm/rpt/project/projectRptOverview.vue
 create mode 100644 src/views/xm/rpt/testCase/testCasedbRptOverview.vue

diff --git a/src/router/routes_xm.js b/src/router/routes_xm.js
index 568b3be5..34e4d7e4 100644
--- a/src/router/routes_xm.js
+++ b/src/router/routes_xm.js
@@ -221,7 +221,7 @@ export default {
         },
         {
           path: 'rpt',
-          component: _import('xm/rpt/indexForProject'),
+          component: _import('xm/rpt/index/indexForProject'),
           name: 'projectRpt',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -423,7 +423,7 @@ export default {
         },
         {
           path: 'rpt',
-          component: _import('xm/rpt/indexForProduct'),
+          component: _import('xm/rpt/index/indexForProduct'),
           name: 'productRpt',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -562,7 +562,7 @@ export default {
         },
         {
           path: 'rpt',
-          component: _import('xm/rpt/indexForIteration'),
+          component: _import('xm/rpt/index/indexForIteration'),
           name: 'iterationRpt',
           iconCls: 'fa el-icon-menu',
           meta: {
@@ -610,7 +610,7 @@ export default {
         { path: 'flow', component: _import('xm/core/xmTestCase/XmTestCaseFlow'), name: 'testFlow', meta: { title: '用例评审',roles:["user"] },hidden:true},
         { path: 'plan', component: _import('xm/core/xmTestPlan/Overview'), name: 'testPlan', meta: { title: '测试计划',roles:["user"] },hidden:true},
         { path: 'group', component: _import('xm/core/xmGroup/XmGroupForTest'), name: 'testGroup', meta: { title: '团队',roles:["user"] },hidden:true},
-        { path: 'rpt', component: _import('xm/rpt/indexForTest'), name: 'testRpt', meta: { title: '统计分析',roles:["user"] },hidden:true},
+        { path: 'rpt', component: _import('xm/rpt/index/indexForTest'), name: 'testRpt', meta: { title: '统计分析',roles:["user"] },hidden:true},
 
       ]
     }, 
@@ -644,9 +644,9 @@ export default {
       
       children: [        
         
-        { path: 'his', component: _import('xm/rpt/indexForHis'), name: 'rptHis', meta: { title: '历史报告',roles:["user"] }},  
-        { path: 'his/detail', component: _import('xm/rpt/indexForHisDetail'), name: 'rptHisDetail', meta: { title: '报告明细',roles:["user"] },hidden:true}, 
-        { path: 'index', component: _import('xm/rpt/index'), name: 'rptIndex', meta: { title: '指标分析',roles:["user"] }}, 
+        { path: 'his', component: _import('xm/rpt/index/indexForHis'), name: 'rptHis', meta: { title: '历史报告',roles:["user"] }},  
+        { path: 'his/detail', component: _import('xm/rpt/index/indexForHisDetail'), name: 'rptHisDetail', meta: { title: '报告明细',roles:["user"] },hidden:true}, 
+        { path: 'index', component: _import('xm/rpt/index/index'), name: 'rptIndex', meta: { title: '指标分析',roles:["user"] }}, 
         { path: 'branch/branchDatavFullScreen',   name: 'branchDatavFullScreen', meta: {   title: '机构效能',openTab:true,outUrl:"${curlDomain}/"+process.env.CONTEXT+"/"+process.env.VERSION+"/#/datav/xm/branch/branchDatavFullScreen" }}, 
       ]
     },
diff --git a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
index 070d020d..a134f74e 100644
--- a/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
+++ b/src/views/xm/core/xmTestPlan/XmTestPlanInfo.vue
@@ -40,11 +40,11 @@
                 </el-row>
                 
                 <el-row v-if="subPage=='testRpt'">
-                     <xm-test-plan-rpt key="rpt"  ref="rpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}" category="测试级"></xm-test-plan-rpt >
+                     <xm-test-plan-rpt key="rpt"  ref="rpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}" category="测试计划级"></xm-test-plan-rpt >
                 </el-row>
                 
                 <el-row v-if="subPage=='xmRpt'">
-                     <xm-rpt key="xmRpt"  ref="xmRpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"  category="测试级"></xm-rpt >
+                     <xm-rpt key="xmRpt"  ref="xmRpt" :xm-test-casedb="xmTestCasedb" :xm-test-plan="xmTestPlan" :xm-product="{id:xmTestCasedb.productId,productName:xmTestCasedb.productName}" :xm-project="{id:xmTestPlan.projectId,name:xmTestPlan.projectName}"  category="测试计划级"></xm-rpt >
                 </el-row>
             </el-row> 
             <xm-test-plan-mng v-else @select="onTestPlanSelect" :xm-test-casedb="xmTestCasedb"> </xm-test-plan-mng>
@@ -66,7 +66,7 @@ export default {
     name:'xmTestCasedbMng',
     components: {
         XmProductSelect,XmQuestionMng,
-        "xm-test-plan-rpt":()=>import("../../rpt/index.vue"), 
+        "xm-test-plan-rpt":()=>import("../../rpt/index/index.vue"), 
         "xm-rpt":()=>import("../../rpt/index"), 
         "xm-test-plan-mng":()=>import("../xmTestPlan/XmTestPlanMng.vue"),
         "xm-test-case-mng":()=>import("../xmTestCase/XmTestCaseMng.vue"),
diff --git a/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue b/src/views/xm/rpt/branch/branchRptOverview.vue
similarity index 54%
rename from src/views/xm/core/xmTestPlan/xmTestRptOverview.vue
rename to src/views/xm/rpt/branch/branchRptOverview.vue
index e3ea34ef..1ec090f8 100644
--- a/src/views/xm/core/xmTestPlan/xmTestRptOverview.vue
+++ b/src/views/xm/rpt/branch/branchRptOverview.vue
@@ -1,13 +1,18 @@
 <template>
 	<section  class="padding"> 
-		<el-row class="padding-bottom">
-			<span>报告概览</span>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="rpt-title">{{ rawDatas.name }}</div>
+			<el-input class="input" v-model="rawDatas.name" placeholder="计划名称"/>
 		</el-row>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="title">{{ title?title:'报告概览' }}</div>
+			<el-input class="input" v-model="title" placeholder="报告概览"/>
+		</el-row>  
 		<el-row ref="table">
 			<el-row class="box">
 				<el-col :span="6" class="box-red">
 					<div class="box-info">  
-							<div class="num">{{xmTestPlan.totalCases?xmTestPlan.totalCases:'0'}}个</div>
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
 							<div class="label">用例数</div>   
 					</div>
 				</el-col>
@@ -25,32 +30,27 @@
 				</el-col>
 				<el-col :span="6" class="box-orange">
 					<div class="box-info">  
-							<div class="num">{{xmTestPlan.bugCnt?xmTestPlan.bugCnt:0}}个</div>
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
 							<div class="label">缺陷数</div>   
 					</div>
 				</el-col>
 			</el-row>
 		<!--编辑界面 XmTestPlan 测试计划--> 
-			<el-form :model="editForm"  label-width="120px" :rules="editFormRules" ref="editFormRef" label-position="left"> 
-				 <el-form-item prop="name" label-width="0px">
-				  <el-row class="padding-bottom">
-					<my-input v-model="editForm.name" placeholder="计划名称" :maxlength="255" @change="editSomeFields(editForm,'name',$event)"></my-input>
- 				  </el-row>
-				  </el-form-item>
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
 				<el-row class="padding">
 					<el-col :span="8">
-						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="editForm" @change="editSomeFields(editForm,'cuserid',$event)"></mdp-select-user-xm>
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
 					</el-col>
 					<el-col :span="8">
-						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="editForm.status"  @change="editSomeFields(editForm,'status',$event)"></mdp-select-dict-x>
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="rawDatas.status"></mdp-select-dict-x>
 					</el-col>
 					
 					<el-col :span="8">
-						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="editForm.tcode"  @change="editSomeFields(editForm,'tcode',$event)"></mdp-select-dict-x>
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="rawDatas.tcode"></mdp-select-dict-x>
 					</el-col>
 				</el-row>   
  				<el-form-item label="归属测试库" prop="casedbName">
-					{{editForm.casedbName}}
+					{{rawDatas.casedbName}}
 				</el-form-item>  
 				<el-form-item label="归属项目" prop="projectId">
 					 
@@ -58,16 +58,16 @@
 					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
 							<span slot="title">选择项目</span>
 						</xm-project-select>
-						<div v-else>{{editForm.projectName}}</div>
+						<div v-else>{{rawDatas.projectName}}</div>
 					</span> 
- 					<div v-else>{{editForm.projectName}}</div>
+ 					<div v-else>{{rawDatas.projectName}}</div>
 				</el-form-item>  
 				<el-form-item label="归属产品" prop="productName">
-					{{editForm.productName}}
+					{{rawDatas.productName}}
 				</el-form-item>  
 				 
 				<el-form-item label="起止时间" prop="stime">
-					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="editForm" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" @change="editSomeFields(editForm,'stime',editForm)"></mdp-date-range>
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="rawDatas" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></mdp-date-range>
 				</el-form-item>   
 			</el-form>
 		</el-row>
@@ -75,11 +75,11 @@
 			<span>报告总结</span>
 		</el-row>
 		<el-row> 
-			<el-input  type="textarea" :rows="8" v-model="editForm.summaryRemark"></el-input>
+			<el-input  type="textarea" :rows="8" v-model="rawDatas.summaryRemark"></el-input>
 		</el-row>
-		<el-row v-if="editForm.summaryRemark!==editFormBak.summaryRemark" >
+		<el-row v-if="rawDatas.summaryRemark!==rawDatasBak.summaryRemark" >
 			<span style="float:right;"> 
-            <el-button type="primary" @click.native="editSomeFields(editForm,'summaryRemark',editForm.summaryRemark)">提交</el-button>
+            <el-button type="primary" @click.native="editSomeFields(rawDatas,'summaryRemark',rawDatas.summaryRemark)">提交</el-button>
 			</span>
 		</el-row>
 	</section>
@@ -101,37 +101,37 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 		computed: {
 		    ...mapGetters([ 'userInfo'  ]),
 			caseFuGaiLv(){
-				if(!this.xmTestPlan.totalCases){
+				if(!this.rawDatas.totalCases){
 					return 0
 				}
-				var okCases=parseInt(this.xmTestPlan.okCases>0?this.xmTestPlan.okCases:0)
-				var errCases=parseInt(this.xmTestPlan.errCases>0?this.xmTestPlan.errCases:0)
-				var igCases=parseInt(this.xmTestPlan.igCases>0?this.xmTestPlan.igCases:0)
-				var blCases=parseInt(this.xmTestPlan.blCases>0?this.xmTestPlan.blCases:0)
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
 				var totalExecs=okCases+errCases+igCases+blCases
-				var rate=parseInt(totalExecs/this.xmTestPlan.totalCases*100)
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
 				return rate;
 			},
 			caseTongGuoLv(){
-				if(!this.xmTestPlan.totalCases){
+				if(!this.rawDatas.totalCases){
 					return 0
 				}
-				var okCases=parseInt(this.xmTestPlan.okCases>0?this.xmTestPlan.okCases:0)
-				var errCases=parseInt(this.xmTestPlan.errCases>0?this.xmTestPlan.errCases:0)
-				var igCases=parseInt(this.xmTestPlan.igCases>0?this.xmTestPlan.igCases:0)
-				var blCases=parseInt(this.xmTestPlan.blCases>0?this.xmTestPlan.blCases:0)
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
 				var totalExecs=okCases+igCases
-				var rate=parseInt(totalExecs/this.xmTestPlan.totalCases*100)
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
 				return rate;
 			}
 
 		},
-		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb'],
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'],
 
 		watch: {
 	      'xmTestPlan':function( xmTestPlan ) {
 	        if(xmTestPlan){
-	            this.editForm = {...xmTestPlan};
+	            this.rawDatas = {...xmTestPlan};
 	        }
 
 	      },
@@ -143,6 +143,8 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 	    },
 		data() {
 			return {
+				title:'',
+				remark:'',
 			    currOpType:'add',//add/edit
  				load:{ list: false, edit: false, del: false, add: false },//查询中...
 				dicts:{
@@ -150,14 +152,14 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 					testPlanTcode:[],
 
 				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
-				editFormRules: {
+				rawDatasRules: {
 					 
 				},
-				editForm: {
+				rawDatas: {
 					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
 				},
 				
-				editFormBak: {
+				rawDatasBak: {
 					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
 				},
                 maxTableHeight:300,
@@ -168,18 +170,18 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 
 		    ...util,
 
-			// 取消按钮点击 父组件监听@cancel="editFormVisible=false" 监听
+			// 取消按钮点击 父组件监听@cancel="rawDatasVisible=false" 监听
 			handleCancel:function(){
-				this.$refs['editFormRef'].resetFields();
+				this.$refs['rawDatasRef'].resetFields();
 				this.$emit('cancel');
 			},
 			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
 			saveSubmit: function () {
-				this.$refs.editFormRef.validate((valid) => {
+				this.$refs.rawDatasRef.validate((valid) => {
 					if (valid) {
 						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
 							this.load.edit=true
-							let params = Object.assign({}, this.editForm);
+							let params = Object.assign({}, this.rawDatas);
 							var func=addXmTestPlan
 							if(this.currOpType=='edit'){
 							    func=editXmTestPlan
@@ -188,7 +190,7 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
                                 this.load.edit=false
                                 var tips=res.data.tips;
                                 if(tips.isOk){
-                                    this.editForm=res.data.data
+                                    this.rawDatas=res.data.data
                                     this.initData()
                                     this.currOpType="edit";
                                     this.$emit('submit');//  @submit="afterAddSubmit"
@@ -201,18 +203,14 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 					}
 				});
 			},
-			initData: function(){
-			    this.currOpType=this.opType
+			initData: function(){ 
 			    if(this.xmTestPlan){
-                    this.editForm = Object.assign({},this.xmTestPlan);
-                }
-
-                if(this.opType=='edit'){
-
-                }else{
-
-                }
-                this.editFormBak={...this.editForm}
+                    this.rawDatas = Object.assign({},this.xmTestPlan);
+                } 
+				if(this.rptDatas){
+					this.rawDatas=Object.assign({},this.rptDatas)
+				}
+                this.rawDatasBak={...this.rawDatas}
             },
 
             editSomeFields(row,fieldName,$event){
@@ -235,18 +233,18 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
                 func(params).then(res=>{
                   let tips = res.data.tips;
                   if(tips.isOk){
-                    this.editFormBak=[...this.editForm]
+                    this.rawDatasBak=[...this.rawDatas]
 					this.$emit('edit-fields',params) 
                   }else{
-                    Object.assign(this.editForm,this.editFormBak)
+                    Object.assign(this.rawDatas,this.rawDatasBak)
                     this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
                   }
-                }).catch((e)=>Object.assign(this.editForm,this.editFormBak))
+                }).catch((e)=>Object.assign(this.rawDatas,this.rawDatasBak))
             },
 			onPorjectConfirm(row){
-				this.editForm.projectId=row.id
-				this.editForm.projectName=row.name
-				this.editForm.name=this.editForm.projectName+'-测试计划-V1.0'
+				this.rawDatas.projectId=row.id
+				this.rawDatas.projectName=row.name
+				this.rawDatas.name=this.rawDatas.projectName+'-测试计划-V1.0'
 			}, 
 			sizeAutoChange(){
 				
@@ -263,149 +261,6 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 
 </script>
 
-<style lang="scss" scoped>
- .box{
-
-
-	.box-red{ 
-
-		background-color: #ff75750d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: red;
-		border-left-style: solid;  
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:red ;
-				font-size: 30px;
-			}
-		}
-		
-	}
-	.box-green{ 
-		
-		background-color: #73d8970d;;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: green;
-		border-left-style: solid; 
-		
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:green ;
-				font-size: 30px;
-			}
-		}
-	}
-	.box-blue{ 
-
-		background-color: #5dcfff0d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: blue;
-		border-left-style: solid; 
-
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:blue ;
-				font-size: 30px;
-			}
-		}
-	}
-
-	.box-orange{ 
-
-		background-color: #ffcd5d0d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: orange;
-		border-left-style: solid; 
-
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:orange ;
-				font-size: 30px;
-			}
-		}
-	}
-	box-font{
-		font-size: 0.875rem;
-	}
- }
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
 </style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/comps.js b/src/views/xm/rpt/comps.js
deleted file mode 100644
index 337426b5..00000000
--- a/src/views/xm/rpt/comps.js
+++ /dev/null
@@ -1,67 +0,0 @@
-
-export default { 
-    xmTestRptOverview:()=>import("../core/xmTestPlan/xmTestRptOverview.vue"),   
-    xmMenuDayTrend:()=>import("./product/menuDayTrend.vue"),   
-    xmMenuDayAccumulate:()=>import("./product/menuDayTrend.vue"),  
-    xmMenuAttDist:()=>import('./product/menuAttDist'),
-    xmMenuAgeDist:()=>import('./product/menuAgeDist.vue'),
-    xmMenuSort:()=>import('./product/menuSort.vue'), 
-    xmMenuFuncSort:()=>import('./product/menuSort.vue'),
-    xmMenuProductSort:()=>import('./product/menuSort.vue'),
-    xmMenuIterationSort:()=>import('./product/menuSort.vue'), 
-    xmProductWorkItemDayList:()=>import('./product/productWorkItemDayList.vue'),
-
-
-    xmTaskDayTrend:()=>import('./project/taskDayTrend.vue'),
-    xmTaskDayAccumulate:()=>import('./project/taskDayAccumulate.vue'),
-    xmTaskAttDist:()=>import('./project/taskAttDist.vue'),
-    xmTaskAgeDist:()=>import('./project/taskAgeDist.vue'),
-    xmTaskSort:()=>import('./project/taskSort.vue'),
-    xmProjectWorkItemDayList:()=>import('./project/projectWorkItemDayList.vue'),
-    xmProjectWorkloadSetDayList:()=>import('./project/projectWorkloadSetDayList.vue'),
-    xmProjectWorkloadSetMonthList:()=>import('./project/projectWorkloadSetMonthList.vue'),
-
-    xmQuestionDayTrend:()=>import('./product/questionDayTrend.vue'),
-    xmQuestionDayAccumulate:()=>import('./product/questionDayAccumulate.vue'),
-    xmQuestionAttDist:()=>import('./product/questionAttDist.vue'),
-    xmQuestionStateDist:()=>import('./product/questionAttDist.vue'),
-    xmQuestionAgeDist:()=>import('./product/questionAgeDist.vue'),
-    xmQuestionBugReasonDist:()=>import('./product/questionAttDist.vue'),
-    xmQuestionBugTypeDist:()=>import('./product/questionAttDist.vue'),
-    xmQuestionPriorityDist:()=>import('./product/questionAttDist.vue'),
-    xmQuestionSort:()=>import('./product/questionSort.vue'),
-    xmQuestionAskUserSort:()=>import('./product/questionSort.vue'),
-    xmQuestionHandlerUserSort:()=>import('./product/questionSort.vue'),
-    xmQuestionFuncSort:()=>import('./product/questionSort.vue'),
-    xmQuestionMenuSort:()=>import('./product/questionSort.vue'),
-    xmQuestionRetestDist:()=>import('./product/questionRetestDist.vue'),
-
-    
-    xmTestPlanRptOverview:()=>import('./testPlan/testPlanRptOverview.vue'),
-    xmTestPlanCaseExecStatusDist:()=>import('./testPlan/testPlanCaseExecStatusDist.vue'),
-    xmTestPlanCaseUserDist:()=>import('./testPlan/testPlanCaseUserDist.vue'),
-    xmTestDayTimesCalc:()=>import('./testPlan/testDayTimesCalc.vue'),
-    xmTestCaseToPlanCalc:()=>import('./testPlan/testCaseToPlanCalc.vue'),
-    xmTestCaseSort:()=>import('./testCase/testCaseSort.vue'),
-    xmTestCaseCuserSort:()=>import('./testCase/testCaseSort.vue'),
-    xmTestCaseFuncSort:()=>import('./testCase/testCaseSort.vue'),
-    xmTestCaseMenuSort:()=>import('./testCase/testCaseSort.vue'),
-
-    
-    xmIterationMenuDayTrend:()=>import('./iteration/menuDayTrend.vue'),
-    xmIterationMenuDayAccumulate:()=>import('./iteration/menuDayAccumulate.vue'),
-    xmIterationBurnout:()=>import('./iteration/burnout.vue'),
-    xmIterationWorkItemDayList:()=>import('./iteration/iterationWorkItemDayList.vue'),
-    xmIterationQuestionDayTrend:()=>import('./iteration/questionDayTrend.vue'),
-    xmIterationQuestionDayAccumulate:()=>import('./iteration/questionDayAccumulate.vue'),
-
-    
-    xmBranchWorkItemDayList:()=>import('./branch/branchWorkItemDayList.vue'),
-    xmBranchQuestionDayTrend:()=>import('./branch/questionDayTrend.vue'),
-    xmBranchQuestionDayAccumulate:()=>import('./branch/questionDayAccumulate.vue'),
-    xmBranchMenuDayTrend:()=>import('./branch/menuDayTrend.vue'),
-    xmBranchMenuDayAccumulate:()=>import('./branch/menuDayAccumulate.vue'),
-};
- 
-
-
diff --git a/src/views/xm/rpt/CompsCard.vue b/src/views/xm/rpt/index/CompsCard.vue
similarity index 99%
rename from src/views/xm/rpt/CompsCard.vue
rename to src/views/xm/rpt/index/CompsCard.vue
index 54e89691..a35d1420 100644
--- a/src/views/xm/rpt/CompsCard.vue
+++ b/src/views/xm/rpt/index/CompsCard.vue
@@ -71,7 +71,7 @@ import util from '@/common/js/util';//全局公共库
 import seq from '@/common/js/sequence';//全局公共库
 import VueGridLayout from 'vue-grid-layout';
 import { mapGetters } from 'vuex' 
-import CompsSet from '@/views/xm/rpt/CompsSet'  
+import CompsSet from '@/views/xm/rpt/index/CompsSet'  
 import rptDataSelect from '@/views/xm/rpt/his/rptDataSelect'  
 import { addXmRptData  } from '@/api/xm/core/xmRptData'; 
 
diff --git a/src/views/xm/rpt/CompsCardHisDetail.vue b/src/views/xm/rpt/index/CompsCardHisDetail.vue
similarity index 98%
rename from src/views/xm/rpt/CompsCardHisDetail.vue
rename to src/views/xm/rpt/index/CompsCardHisDetail.vue
index 9588a518..c21f2168 100644
--- a/src/views/xm/rpt/CompsCardHisDetail.vue
+++ b/src/views/xm/rpt/index/CompsCardHisDetail.vue
@@ -33,7 +33,7 @@
 import util from '@/common/js/util';//全局公共库
 import seq from '@/common/js/sequence';//全局公共库 
 import { mapGetters } from 'vuex' 
-import CompsSet from '@/views/xm/rpt/CompsSet'  
+import CompsSet from '@/views/xm/rpt/index/CompsSet'  
 import rptComps from './comps.js';//组件库
 
  
@@ -71,7 +71,7 @@ export default {
                 return "企业级"
             }
             if(this.xmRptData.bizType=='6'){
-                return "测试级"
+                return "测试计划级"
             }
         }
         
diff --git a/src/views/xm/rpt/CompsSet.vue b/src/views/xm/rpt/index/CompsSet.vue
similarity index 77%
rename from src/views/xm/rpt/CompsSet.vue
rename to src/views/xm/rpt/index/CompsSet.vue
index 886de9bd..2833b3af 100644
--- a/src/views/xm/rpt/CompsSet.vue
+++ b/src/views/xm/rpt/index/CompsSet.vue
@@ -41,12 +41,12 @@
 <script>
 
 import util from '@/common/js/util';//全局公共库
-import pieSimple from './images/pie-simple.png'
-import lineStack from './images/line-stack.png'
-import areaStack from './images/area-stack.png'
-import ranjintu from './images/ranjintu.png'
-import datasetLink from './images/dataset-link.png'
-import bar from './images/bar.png'
+import pieSimple from '../images/pie-simple.png'
+import lineStack from '../images/line-stack.png'
+import areaStack from '../images/area-stack.png'
+import ranjintu from '../images/ranjintu.png'
+import datasetLink from '../images/dataset-link.png'
+import bar from '../images/bar.png'
 
 import { mapGetters } from 'vuex'
 import store from '@/store'
@@ -105,6 +105,7 @@ export default {
                 category:'企业级'
             },
             comps: [
+                {isChecked:false,isCurr:false,rptName:'迭代总结',category:'迭代级',compId:'xmIterationRptOverview',desc:'显示迭代总体情况',img:pieSimple  },
                 {isChecked:false,isCurr:false,rptName:'迭代燃尽图',category:'迭代级',compId:'xmIterationBurnout',desc:'跟踪迭代的剩余工作量按日期变化趋势，识别迭代当前进度情况',img:ranjintu },
                 {isChecked:false,isCurr:false,rptName:'需求每日趋势',category:'迭代级',compId:'xmIterationMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
                 {isChecked:false,isCurr:false,rptName:'需求每日累积',category:'迭代级',compId:'xmIterationMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
@@ -113,8 +114,8 @@ export default {
                 {isChecked:false,isCurr:false,rptName:'迭代缺陷每日累积',category:'迭代级',compId:'xmIterationQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
                 
                 //企业级报表
+                {isChecked:false,isCurr:false,rptName:'企业总结',category:'企业级',compId:'xmBranchRptOverview',desc:'显示企业总体情况',img:pieSimple  },
                 {isChecked:false,isCurr:false,rptName:'企业缺陷每日趋势',category:'企业级',compId:'xmBranchQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
-
                 {isChecked:false,isCurr:false,rptName:'企业工作项每日趋势',category:'企业级',compId:'xmBranchWorkItemDayList',desc:'统计迭代每日工作项数量分布情况',img:datasetLink  },  
                 //{isChecked:false,isCurr:false,rptName:'企业缺陷每日趋势',category:'企业级',compId:'xmBranchQuestionDayTrend',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:lineStack  },
                 {isChecked:false,isCurr:false,rptName:'企业缺陷每日累积',category:'企业级',compId:'xmBranchQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
@@ -122,6 +123,7 @@ export default {
                 {isChecked:false,isCurr:false,rptName:'需求每日累积',category:'企业级',compId:'xmBranchMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
                 
                 //产品报表
+                {isChecked:false,isCurr:false,rptName:'产品总结',category:'产品级',compId:'xmProductRptOverview',desc:'显示产品总体情况',img:pieSimple  },
                 {isChecked:false,isCurr:false,rptName:'产品工作项每日趋势',category:'产品级',compId:'xmProductWorkItemDayList',desc:'统计产品每日工作项数量分布情况',img:datasetLink  },  
                 {isChecked:false,isCurr:false,rptName:'需求每日趋势',category:'产品级',compId:'xmMenuDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期变化趋势，识别需求工作情况',img:lineStack  },
                 {isChecked:false,isCurr:false,rptName:'需求每日累积',category:'产品级',compId:'xmMenuDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的需求数量按日期累积情况，识别需求工作的瓶颈',img:areaStack  },
@@ -135,6 +137,7 @@ export default {
                 {isChecked:false,isCurr:false,rptName:'产品缺陷每日累积',category:'产品级',compId:'xmQuestionDayAccumulate',desc:'跟踪一段时间内，各种程度和类别的缺陷累积情况，监控缺陷的变化趋势',img:areaStack  },
                 
                 //项目报表
+                {isChecked:false,isCurr:false,rptName:'项目总结',category:'项目级',compId:'xmProjectRptOverview',desc:'显示项目总体情况',img:pieSimple  },
                 {isChecked:false,isCurr:false,rptName:'项目工作项每日趋势',category:'项目级',compId:'xmProjectWorkItemDayList',desc:'统计项目每日工作项数量分布情况',img:datasetLink  },
                 {isChecked:false,isCurr:false,rptName:'任务每日趋势',category:'项目级',compId:'xmTaskDayTrend',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期变化趋势，识别任务工作情况',img:lineStack  },
                 {isChecked:false,isCurr:false,rptName:'任务每日累积',category:'项目级',compId:'xmTaskDayAccumulate',desc:'跟踪未开始、执行中、已完成、已关闭状态的任务数量按日期累积情况，识别任务工作的瓶颈',img:areaStack  },
@@ -146,25 +149,27 @@ export default {
 
 
                 //测试级报表  
-                {isChecked:false,isCurr:false,rptName:'测试计划总结',category:'测试计划级,测试级',compId:'xmTestPlanRptOverview',desc:'显示测试计划总体情况',img:pieSimple  },
-                {isChecked:false,isCurr:false,rptName:'测试用例规划分析',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseToPlanCalc',desc:'显示用例被规划到测试计划中的次数统计',img:pieSimple  },
-                {isChecked:false,isCurr:false,rptName:'测试用例需求覆盖分析',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseMenuSort',initGroupBy:'menu_id',desc:'统计测试用例需求覆盖情况',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'测试用例模块覆盖分析',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseFuncSort',initGroupBy:'func_id',desc:'统计测试用例覆盖各个模块的情况',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'测试用例负责人排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseCuserSort',initGroupBy:'cuserid',desc:'统计测试团队每个人负责的测试用例数并进行排序',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'测试计划总结',category:'测试计划级',compId:'xmTestPlanRptOverview',desc:'显示测试计划总体情况',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'测试库总体测试总结',category:'测试级',compId:'xmTestCasedbRptOverview',desc:'显示测试库总体情况',img:pieSimple  },
+
+                {isChecked:false,isCurr:false,rptName:'测试用例规划分析',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseToPlanCalc',desc:'显示用例被规划到测试计划中的次数统计',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'测试用例需求覆盖分析',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseMenuSort',initGroupBy:'menu_id',desc:'统计测试用例需求覆盖情况',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'测试用例模块覆盖分析',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseFuncSort',initGroupBy:'func_id',desc:'统计测试用例覆盖各个模块的情况',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'测试用例负责人排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestCaseCuserSort',initGroupBy:'cuserid',desc:'统计测试团队每个人负责的测试用例数并进行排序',img:bar  },
 
-                {isChecked:false,isCurr:false,rptName:'测试用例执行状态分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestPlanCaseExecStatusDist',desc:'按测试用例执行结果统计，通过、失败、忽略、阻塞',img:pieSimple  },
-                {isChecked:false,isCurr:false,rptName:'测试用例执行用户分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestPlanCaseUserDist',desc:'统计测试用例负责人用例执行情况',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷回归分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionRetestDist',desc:'统计项目中缺陷在回归测试中分布情况，跟踪缺陷的重新打开率；',img:pieSimple  },
-                {isChecked:false,isCurr:false,rptName:'测试次数每日统计',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmTestDayTimesCalc',desc:'统计每日测试用例执行数量',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷状态分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionStateDist',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'测试用例执行状态分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestPlanCaseExecStatusDist',desc:'按测试用例执行结果统计，通过、失败、忽略、阻塞',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'测试用例执行用户分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestPlanCaseUserDist',desc:'统计测试用例负责人用例执行情况',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷回归分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionRetestDist',desc:'统计项目中缺陷在回归测试中分布情况，跟踪缺陷的重新打开率；',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'测试次数每日统计',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmTestDayTimesCalc',desc:'统计每日测试用例执行数量',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷状态分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionStateDist',desc:'跟踪新提出、执行中、已解决、已关闭状态的缺陷数量按日期变化趋势，识别缺陷处理工作情况',img:pieSimple  },
 
-                {isChecked:false,isCurr:false,rptName:'缺陷排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷提出人排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAskUserSort',initGroupBy:'ask_userid',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷负责人排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionHandlerUserSort',initGroupBy:'handler_userid',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷模块排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionFuncSort',initGroupBy:'func_id',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷需求排行榜',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionMenuSort',initGroupBy:'menu_id',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
-                {isChecked:false,isCurr:false,rptName:'缺陷属性分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAttDist',desc:'统计所有缺陷任意属性数量分布情况（实时数据）',img:pieSimple  },
-                {isChecked:false,isCurr:false,rptName:'缺陷年龄分布',category:'测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAgeDist',desc:'统计所有缺陷按照年龄的分布情况，跟踪缺陷的生命周期和响应情况',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'缺陷排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionSort',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷提出人排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAskUserSort',initGroupBy:'ask_userid',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷负责人排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionHandlerUserSort',initGroupBy:'handler_userid',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷模块排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionFuncSort',initGroupBy:'func_id',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷需求排行榜',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionMenuSort',initGroupBy:'menu_id',desc:'从缺陷提出人、创建人、负责人、故事等维度统计缺陷数量排行榜（实时数据）',img:bar  },
+                {isChecked:false,isCurr:false,rptName:'缺陷属性分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAttDist',desc:'统计所有缺陷任意属性数量分布情况（实时数据）',img:pieSimple  },
+                {isChecked:false,isCurr:false,rptName:'缺陷年龄分布',category:'测试计划级,测试级,项目级,产品级,迭代级,企业级',compId:'xmQuestionAgeDist',desc:'统计所有缺陷按照年龄的分布情况，跟踪缺陷的生命周期和响应情况',img:pieSimple  },
                 
             ],
             maxTableHeight:300,
diff --git a/src/views/xm/rpt/common.scss b/src/views/xm/rpt/index/common.scss
similarity index 100%
rename from src/views/xm/rpt/common.scss
rename to src/views/xm/rpt/index/common.scss
diff --git a/src/views/xm/rpt/index/comps.js b/src/views/xm/rpt/index/comps.js
new file mode 100644
index 00000000..5e548277
--- /dev/null
+++ b/src/views/xm/rpt/index/comps.js
@@ -0,0 +1,66 @@
+
+export default { 
+    xmMenuDayTrend:()=>import("../product/menuDayTrend.vue"),   
+    xmMenuDayAccumulate:()=>import("../product/menuDayTrend.vue"),  
+    xmMenuAttDist:()=>import("../product/menuAttDist"),
+    xmMenuAgeDist:()=>import("../product/menuAgeDist.vue"),
+    xmMenuSort:()=>import("../product/menuSort.vue"), 
+    xmMenuFuncSort:()=>import("../product/menuSort.vue"),
+    xmMenuProductSort:()=>import("../product/menuSort.vue"),
+    xmMenuIterationSort:()=>import("../product/menuSort.vue"), 
+    xmProductWorkItemDayList:()=>import("../product/productWorkItemDayList.vue"),
+
+
+    xmTaskDayTrend:()=>import("../project/taskDayTrend.vue"),
+    xmTaskDayAccumulate:()=>import("../project/taskDayAccumulate.vue"),
+    xmTaskAttDist:()=>import("../project/taskAttDist.vue"),
+    xmTaskAgeDist:()=>import("../project/taskAgeDist.vue"),
+    xmTaskSort:()=>import("../project/taskSort.vue"),
+    xmProjectWorkItemDayList:()=>import("../project/projectWorkItemDayList.vue"),
+    xmProjectWorkloadSetDayList:()=>import("../project/projectWorkloadSetDayList.vue"),
+    xmProjectWorkloadSetMonthList:()=>import("../project/projectWorkloadSetMonthList.vue"),
+
+    xmQuestionDayTrend:()=>import("../product/questionDayTrend.vue"),
+    xmQuestionDayAccumulate:()=>import("../product/questionDayAccumulate.vue"),
+    xmQuestionAttDist:()=>import("../product/questionAttDist.vue"),
+    xmQuestionStateDist:()=>import("../product/questionAttDist.vue"),
+    xmQuestionAgeDist:()=>import("../product/questionAgeDist.vue"),
+    xmQuestionBugReasonDist:()=>import("../product/questionAttDist.vue"),
+    xmQuestionBugTypeDist:()=>import("../product/questionAttDist.vue"),
+    xmQuestionPriorityDist:()=>import("../product/questionAttDist.vue"),
+    xmQuestionSort:()=>import("../product/questionSort.vue"),
+    xmQuestionAskUserSort:()=>import("../product/questionSort.vue"),
+    xmQuestionHandlerUserSort:()=>import("../product/questionSort.vue"),
+    xmQuestionFuncSort:()=>import("../product/questionSort.vue"),
+    xmQuestionMenuSort:()=>import("../product/questionSort.vue"),
+    xmQuestionRetestDist:()=>import("../product/questionRetestDist.vue"),
+
+    
+    xmTestPlanRptOverview:()=>import("../testPlan/testPlanRptOverview.vue"),
+    xmTestPlanCaseExecStatusDist:()=>import("../testPlan/testPlanCaseExecStatusDist.vue"),
+    xmTestPlanCaseUserDist:()=>import("../testPlan/testPlanCaseUserDist.vue"),
+    xmTestDayTimesCalc:()=>import("../testPlan/testDayTimesCalc.vue"),
+    xmTestCaseToPlanCalc:()=>import("../testPlan/testCaseToPlanCalc.vue"),
+    xmTestCaseSort:()=>import("../testCase/testCaseSort.vue"),
+    xmTestCaseCuserSort:()=>import("../testCase/testCaseSort.vue"),
+    xmTestCaseFuncSort:()=>import("../testCase/testCaseSort.vue"),
+    xmTestCaseMenuSort:()=>import("../testCase/testCaseSort.vue"),
+
+    
+    xmIterationMenuDayTrend:()=>import("../iteration/menuDayTrend.vue"),
+    xmIterationMenuDayAccumulate:()=>import("../iteration/menuDayAccumulate.vue"),
+    xmIterationBurnout:()=>import("../iteration/burnout.vue"),
+    xmIterationWorkItemDayList:()=>import("../iteration/iterationWorkItemDayList.vue"),
+    xmIterationQuestionDayTrend:()=>import("../iteration/questionDayTrend.vue"),
+    xmIterationQuestionDayAccumulate:()=>import("../iteration/questionDayAccumulate.vue"),
+
+    
+    xmBranchWorkItemDayList:()=>import("../branch/branchWorkItemDayList.vue"),
+    xmBranchQuestionDayTrend:()=>import("../branch/questionDayTrend.vue"),
+    xmBranchQuestionDayAccumulate:()=>import("../branch/questionDayAccumulate.vue"),
+    xmBranchMenuDayTrend:()=>import("../branch/menuDayTrend.vue"),
+    xmBranchMenuDayAccumulate:()=>import("../branch/menuDayAccumulate.vue"),
+};
+ 
+
+
diff --git a/src/views/xm/rpt/index.scss b/src/views/xm/rpt/index/index.scss
similarity index 100%
rename from src/views/xm/rpt/index.scss
rename to src/views/xm/rpt/index/index.scss
diff --git a/src/views/xm/rpt/index.vue b/src/views/xm/rpt/index/index.vue
similarity index 100%
rename from src/views/xm/rpt/index.vue
rename to src/views/xm/rpt/index/index.vue
diff --git a/src/views/xm/rpt/indexForHis.vue b/src/views/xm/rpt/index/indexForHis.vue
similarity index 100%
rename from src/views/xm/rpt/indexForHis.vue
rename to src/views/xm/rpt/index/indexForHis.vue
diff --git a/src/views/xm/rpt/indexForHisDetail.vue b/src/views/xm/rpt/index/indexForHisDetail.vue
similarity index 100%
rename from src/views/xm/rpt/indexForHisDetail.vue
rename to src/views/xm/rpt/index/indexForHisDetail.vue
diff --git a/src/views/xm/rpt/indexForIteration.vue b/src/views/xm/rpt/index/indexForIteration.vue
similarity index 100%
rename from src/views/xm/rpt/indexForIteration.vue
rename to src/views/xm/rpt/index/indexForIteration.vue
diff --git a/src/views/xm/rpt/indexForProduct.vue b/src/views/xm/rpt/index/indexForProduct.vue
similarity index 100%
rename from src/views/xm/rpt/indexForProduct.vue
rename to src/views/xm/rpt/index/indexForProduct.vue
diff --git a/src/views/xm/rpt/indexForProject.vue b/src/views/xm/rpt/index/indexForProject.vue
similarity index 100%
rename from src/views/xm/rpt/indexForProject.vue
rename to src/views/xm/rpt/index/indexForProject.vue
diff --git a/src/views/xm/rpt/indexForTest.vue b/src/views/xm/rpt/index/indexForTest.vue
similarity index 100%
rename from src/views/xm/rpt/indexForTest.vue
rename to src/views/xm/rpt/index/indexForTest.vue
diff --git a/src/views/xm/rpt/index/overview.scss b/src/views/xm/rpt/index/overview.scss
new file mode 100644
index 00000000..3acc514b
--- /dev/null
+++ b/src/views/xm/rpt/index/overview.scss
@@ -0,0 +1,145 @@
+
+ .box{
+
+
+	.box-red{ 
+
+		background-color: #ff75750d;
+		height: 100px;
+		border-left-width: 2px;
+		border-left-color: red;
+		border-left-style: solid;  
+		align-items: center; 
+		line-height: 100px; 
+		text-align: center;
+		display:flex; 
+    	flex-direction: column;
+		.box-info{ 
+			display:flex; 
+			flex-direction: column;
+			margin-top: 20px;
+			height: 100px; 
+			line-height: 100px; 
+			.label{
+				color: #999;
+				height: 30px;
+				line-height: 30px;
+				font-size: 0.875rem;
+			}
+			.num{
+				
+				height: 30px;
+				line-height: 30px;
+				color:red ;
+				font-size: 30px;
+			}
+		}
+		
+	}
+	.box-green{ 
+		
+		background-color: #73d8970d;;
+		height: 100px;
+		border-left-width: 2px;
+		border-left-color: green;
+		border-left-style: solid; 
+		
+		align-items: center; 
+		line-height: 100px; 
+		text-align: center;
+		display:flex; 
+    	flex-direction: column;
+		.box-info{ 
+			display:flex; 
+			flex-direction: column;
+			margin-top: 20px;
+			height: 100px; 
+			line-height: 100px; 
+			.label{
+				color: #999;
+				height: 30px;
+				line-height: 30px;
+				font-size: 0.875rem;
+			}
+			.num{
+				
+				height: 30px;
+				line-height: 30px;
+				color:green ;
+				font-size: 30px;
+			}
+		}
+	}
+	.box-blue{ 
+
+		background-color: #5dcfff0d;
+		height: 100px;
+		border-left-width: 2px;
+		border-left-color: blue;
+		border-left-style: solid; 
+
+		align-items: center; 
+		line-height: 100px; 
+		text-align: center;
+		display:flex; 
+    	flex-direction: column;
+		.box-info{ 
+			display:flex; 
+			flex-direction: column;
+			margin-top: 20px;
+			height: 100px; 
+			line-height: 100px; 
+			.label{
+				color: #999;
+				height: 30px;
+				line-height: 30px;
+				font-size: 0.875rem;
+			}
+			.num{
+				
+				height: 30px;
+				line-height: 30px;
+				color:blue ;
+				font-size: 30px;
+			}
+		}
+	}
+
+	.box-orange{ 
+
+		background-color: #ffcd5d0d;
+		height: 100px;
+		border-left-width: 2px;
+		border-left-color: orange;
+		border-left-style: solid; 
+
+		align-items: center; 
+		line-height: 100px; 
+		text-align: center;
+		display:flex; 
+    	flex-direction: column;
+		.box-info{ 
+			display:flex; 
+			flex-direction: column;
+			margin-top: 20px;
+			height: 100px; 
+			line-height: 100px; 
+			.label{
+				color: #999;
+				height: 30px;
+				line-height: 30px;
+				font-size: 0.875rem;
+			}
+			.num{
+				
+				height: 30px;
+				line-height: 30px;
+				color:orange ;
+				font-size: 30px;
+			}
+		}
+	}
+	box-font{
+		font-size: 0.875rem;
+	}
+ }
\ No newline at end of file
diff --git a/src/views/xm/rpt/iteration/iterationRptOverview.vue b/src/views/xm/rpt/iteration/iterationRptOverview.vue
new file mode 100644
index 00000000..1ec090f8
--- /dev/null
+++ b/src/views/xm/rpt/iteration/iterationRptOverview.vue
@@ -0,0 +1,266 @@
+<template>
+	<section  class="padding"> 
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="rpt-title">{{ rawDatas.name }}</div>
+			<el-input class="input" v-model="rawDatas.name" placeholder="计划名称"/>
+		</el-row>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="title">{{ title?title:'报告概览' }}</div>
+			<el-input class="input" v-model="title" placeholder="报告概览"/>
+		</el-row>  
+		<el-row ref="table">
+			<el-row class="box">
+				<el-col :span="6" class="box-red">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
+							<div class="label">用例数</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-blue">
+					<div class="box-info">  
+							<div class="num">{{caseFuGaiLv}}%</div>
+							<div class="label">用例覆盖率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-green">
+					<div class="box-info">  
+							<div class="num">{{caseTongGuoLv}}%</div>
+							<div class="label">用例通过率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-orange">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
+							<div class="label">缺陷数</div>   
+					</div>
+				</el-col>
+			</el-row>
+		<!--编辑界面 XmTestPlan 测试计划--> 
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
+				<el-row class="padding">
+					<el-col :span="8">
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
+					</el-col>
+					<el-col :span="8">
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="rawDatas.status"></mdp-select-dict-x>
+					</el-col>
+					
+					<el-col :span="8">
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="rawDatas.tcode"></mdp-select-dict-x>
+					</el-col>
+				</el-row>   
+ 				<el-form-item label="归属测试库" prop="casedbName">
+					{{rawDatas.casedbName}}
+				</el-form-item>  
+				<el-form-item label="归属项目" prop="projectId">
+					 
+					<span v-if="opType=='add'">
+					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
+							<span slot="title">选择项目</span>
+						</xm-project-select>
+						<div v-else>{{rawDatas.projectName}}</div>
+					</span> 
+ 					<div v-else>{{rawDatas.projectName}}</div>
+				</el-form-item>  
+				<el-form-item label="归属产品" prop="productName">
+					{{rawDatas.productName}}
+				</el-form-item>  
+				 
+				<el-form-item label="起止时间" prop="stime">
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="rawDatas" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></mdp-date-range>
+				</el-form-item>   
+			</el-form>
+		</el-row>
+		<el-row class="padding-bottom">
+			<span>报告总结</span>
+		</el-row>
+		<el-row> 
+			<el-input  type="textarea" :rows="8" v-model="rawDatas.summaryRemark"></el-input>
+		</el-row>
+		<el-row v-if="rawDatas.summaryRemark!==rawDatasBak.summaryRemark" >
+			<span style="float:right;"> 
+            <el-button type="primary" @click.native="editSomeFields(rawDatas,'summaryRemark',rawDatas.summaryRemark)">提交</el-button>
+			</span>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
+	import { mapGetters } from 'vuex'
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+	
+import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
+	export default {
+	    name:'xmTestPlanEdit',
+	    components: {
+			XmProjectSelect,MdpSelectUserXm,
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+			caseFuGaiLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+errCases+igCases+blCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			},
+			caseTongGuoLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+igCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			}
+
+		},
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'],
+
+		watch: {
+	      'xmTestPlan':function( xmTestPlan ) {
+	        if(xmTestPlan){
+	            this.rawDatas = {...xmTestPlan};
+	        }
+
+	      },
+	      'visible':function(visible) { 
+	      	if(visible==true){
+ 	      		this.initData()
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+				title:'',
+				remark:'',
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{
+					testPlanStatus:[],
+					testPlanTcode:[],
+
+				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				rawDatasRules: {
+					 
+				},
+				rawDatas: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+				
+				rawDatasBak: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+                maxTableHeight:300,
+				summaryRemarkEditVisible:false,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+
+			// 取消按钮点击 父组件监听@cancel="rawDatasVisible=false" 监听
+			handleCancel:function(){
+				this.$refs['rawDatasRef'].resetFields();
+				this.$emit('cancel');
+			},
+			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
+			saveSubmit: function () {
+				this.$refs.rawDatasRef.validate((valid) => {
+					if (valid) {
+						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
+							this.load.edit=true
+							let params = Object.assign({}, this.rawDatas);
+							var func=addXmTestPlan
+							if(this.currOpType=='edit'){
+							    func=editXmTestPlan
+							}
+							func(params).then((res) => {
+                                this.load.edit=false
+                                var tips=res.data.tips;
+                                if(tips.isOk){
+                                    this.rawDatas=res.data.data
+                                    this.initData()
+                                    this.currOpType="edit";
+                                    this.$emit('submit');//  @submit="afterAddSubmit"
+                                }
+                                this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
+                            }).catch( err =>this.load.edit=false);
+						});
+					}else{
+					    this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' });
+					}
+				});
+			},
+			initData: function(){ 
+			    if(this.xmTestPlan){
+                    this.rawDatas = Object.assign({},this.xmTestPlan);
+                } 
+				if(this.rptDatas){
+					this.rawDatas=Object.assign({},this.rptDatas)
+				}
+                this.rawDatasBak={...this.rawDatas}
+            },
+
+            editSomeFields(row,fieldName,$event){
+                if(this.opType=='add'){
+                    return;
+                }
+                let params={};
+                params['ids']=[row].map(i=>i.id)
+                
+				if(fieldName=='stime'){
+					params[fieldName]=$event.stime
+					params.etime=$event.etime
+				}else if(fieldName=='cuserid'){
+					params[fieldName]=$event[0].userid
+					params.cusername=$event[0].username
+				}else{
+					params[fieldName]=$event
+				}
+                var func = editSomeFieldsXmTestPlan
+                func(params).then(res=>{
+                  let tips = res.data.tips;
+                  if(tips.isOk){
+                    this.rawDatasBak=[...this.rawDatas]
+					this.$emit('edit-fields',params) 
+                  }else{
+                    Object.assign(this.rawDatas,this.rawDatasBak)
+                    this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
+                  }
+                }).catch((e)=>Object.assign(this.rawDatas,this.rawDatasBak))
+            },
+			onPorjectConfirm(row){
+				this.rawDatas.projectId=row.id
+				this.rawDatas.projectName=row.name
+				this.rawDatas.name=this.rawDatas.projectName+'-测试计划-V1.0'
+			}, 
+			sizeAutoChange(){
+				
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {
+                initDicts(this);
+                this.initData()
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
+            });
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
+</style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/product/productRptOverview.vue b/src/views/xm/rpt/product/productRptOverview.vue
new file mode 100644
index 00000000..1ec090f8
--- /dev/null
+++ b/src/views/xm/rpt/product/productRptOverview.vue
@@ -0,0 +1,266 @@
+<template>
+	<section  class="padding"> 
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="rpt-title">{{ rawDatas.name }}</div>
+			<el-input class="input" v-model="rawDatas.name" placeholder="计划名称"/>
+		</el-row>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="title">{{ title?title:'报告概览' }}</div>
+			<el-input class="input" v-model="title" placeholder="报告概览"/>
+		</el-row>  
+		<el-row ref="table">
+			<el-row class="box">
+				<el-col :span="6" class="box-red">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
+							<div class="label">用例数</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-blue">
+					<div class="box-info">  
+							<div class="num">{{caseFuGaiLv}}%</div>
+							<div class="label">用例覆盖率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-green">
+					<div class="box-info">  
+							<div class="num">{{caseTongGuoLv}}%</div>
+							<div class="label">用例通过率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-orange">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
+							<div class="label">缺陷数</div>   
+					</div>
+				</el-col>
+			</el-row>
+		<!--编辑界面 XmTestPlan 测试计划--> 
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
+				<el-row class="padding">
+					<el-col :span="8">
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
+					</el-col>
+					<el-col :span="8">
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="rawDatas.status"></mdp-select-dict-x>
+					</el-col>
+					
+					<el-col :span="8">
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="rawDatas.tcode"></mdp-select-dict-x>
+					</el-col>
+				</el-row>   
+ 				<el-form-item label="归属测试库" prop="casedbName">
+					{{rawDatas.casedbName}}
+				</el-form-item>  
+				<el-form-item label="归属项目" prop="projectId">
+					 
+					<span v-if="opType=='add'">
+					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
+							<span slot="title">选择项目</span>
+						</xm-project-select>
+						<div v-else>{{rawDatas.projectName}}</div>
+					</span> 
+ 					<div v-else>{{rawDatas.projectName}}</div>
+				</el-form-item>  
+				<el-form-item label="归属产品" prop="productName">
+					{{rawDatas.productName}}
+				</el-form-item>  
+				 
+				<el-form-item label="起止时间" prop="stime">
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="rawDatas" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></mdp-date-range>
+				</el-form-item>   
+			</el-form>
+		</el-row>
+		<el-row class="padding-bottom">
+			<span>报告总结</span>
+		</el-row>
+		<el-row> 
+			<el-input  type="textarea" :rows="8" v-model="rawDatas.summaryRemark"></el-input>
+		</el-row>
+		<el-row v-if="rawDatas.summaryRemark!==rawDatasBak.summaryRemark" >
+			<span style="float:right;"> 
+            <el-button type="primary" @click.native="editSomeFields(rawDatas,'summaryRemark',rawDatas.summaryRemark)">提交</el-button>
+			</span>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
+	import { mapGetters } from 'vuex'
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+	
+import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
+	export default {
+	    name:'xmTestPlanEdit',
+	    components: {
+			XmProjectSelect,MdpSelectUserXm,
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+			caseFuGaiLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+errCases+igCases+blCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			},
+			caseTongGuoLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+igCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			}
+
+		},
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'],
+
+		watch: {
+	      'xmTestPlan':function( xmTestPlan ) {
+	        if(xmTestPlan){
+	            this.rawDatas = {...xmTestPlan};
+	        }
+
+	      },
+	      'visible':function(visible) { 
+	      	if(visible==true){
+ 	      		this.initData()
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+				title:'',
+				remark:'',
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{
+					testPlanStatus:[],
+					testPlanTcode:[],
+
+				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				rawDatasRules: {
+					 
+				},
+				rawDatas: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+				
+				rawDatasBak: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+                maxTableHeight:300,
+				summaryRemarkEditVisible:false,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+
+			// 取消按钮点击 父组件监听@cancel="rawDatasVisible=false" 监听
+			handleCancel:function(){
+				this.$refs['rawDatasRef'].resetFields();
+				this.$emit('cancel');
+			},
+			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
+			saveSubmit: function () {
+				this.$refs.rawDatasRef.validate((valid) => {
+					if (valid) {
+						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
+							this.load.edit=true
+							let params = Object.assign({}, this.rawDatas);
+							var func=addXmTestPlan
+							if(this.currOpType=='edit'){
+							    func=editXmTestPlan
+							}
+							func(params).then((res) => {
+                                this.load.edit=false
+                                var tips=res.data.tips;
+                                if(tips.isOk){
+                                    this.rawDatas=res.data.data
+                                    this.initData()
+                                    this.currOpType="edit";
+                                    this.$emit('submit');//  @submit="afterAddSubmit"
+                                }
+                                this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
+                            }).catch( err =>this.load.edit=false);
+						});
+					}else{
+					    this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' });
+					}
+				});
+			},
+			initData: function(){ 
+			    if(this.xmTestPlan){
+                    this.rawDatas = Object.assign({},this.xmTestPlan);
+                } 
+				if(this.rptDatas){
+					this.rawDatas=Object.assign({},this.rptDatas)
+				}
+                this.rawDatasBak={...this.rawDatas}
+            },
+
+            editSomeFields(row,fieldName,$event){
+                if(this.opType=='add'){
+                    return;
+                }
+                let params={};
+                params['ids']=[row].map(i=>i.id)
+                
+				if(fieldName=='stime'){
+					params[fieldName]=$event.stime
+					params.etime=$event.etime
+				}else if(fieldName=='cuserid'){
+					params[fieldName]=$event[0].userid
+					params.cusername=$event[0].username
+				}else{
+					params[fieldName]=$event
+				}
+                var func = editSomeFieldsXmTestPlan
+                func(params).then(res=>{
+                  let tips = res.data.tips;
+                  if(tips.isOk){
+                    this.rawDatasBak=[...this.rawDatas]
+					this.$emit('edit-fields',params) 
+                  }else{
+                    Object.assign(this.rawDatas,this.rawDatasBak)
+                    this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
+                  }
+                }).catch((e)=>Object.assign(this.rawDatas,this.rawDatasBak))
+            },
+			onPorjectConfirm(row){
+				this.rawDatas.projectId=row.id
+				this.rawDatas.projectName=row.name
+				this.rawDatas.name=this.rawDatas.projectName+'-测试计划-V1.0'
+			}, 
+			sizeAutoChange(){
+				
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {
+                initDicts(this);
+                this.initData()
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
+            });
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
+</style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/project/projectRptOverview.vue b/src/views/xm/rpt/project/projectRptOverview.vue
new file mode 100644
index 00000000..1ec090f8
--- /dev/null
+++ b/src/views/xm/rpt/project/projectRptOverview.vue
@@ -0,0 +1,266 @@
+<template>
+	<section  class="padding"> 
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="rpt-title">{{ rawDatas.name }}</div>
+			<el-input class="input" v-model="rawDatas.name" placeholder="计划名称"/>
+		</el-row>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="title">{{ title?title:'报告概览' }}</div>
+			<el-input class="input" v-model="title" placeholder="报告概览"/>
+		</el-row>  
+		<el-row ref="table">
+			<el-row class="box">
+				<el-col :span="6" class="box-red">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
+							<div class="label">用例数</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-blue">
+					<div class="box-info">  
+							<div class="num">{{caseFuGaiLv}}%</div>
+							<div class="label">用例覆盖率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-green">
+					<div class="box-info">  
+							<div class="num">{{caseTongGuoLv}}%</div>
+							<div class="label">用例通过率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-orange">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
+							<div class="label">缺陷数</div>   
+					</div>
+				</el-col>
+			</el-row>
+		<!--编辑界面 XmTestPlan 测试计划--> 
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
+				<el-row class="padding">
+					<el-col :span="8">
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
+					</el-col>
+					<el-col :span="8">
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="rawDatas.status"></mdp-select-dict-x>
+					</el-col>
+					
+					<el-col :span="8">
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="rawDatas.tcode"></mdp-select-dict-x>
+					</el-col>
+				</el-row>   
+ 				<el-form-item label="归属测试库" prop="casedbName">
+					{{rawDatas.casedbName}}
+				</el-form-item>  
+				<el-form-item label="归属项目" prop="projectId">
+					 
+					<span v-if="opType=='add'">
+					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
+							<span slot="title">选择项目</span>
+						</xm-project-select>
+						<div v-else>{{rawDatas.projectName}}</div>
+					</span> 
+ 					<div v-else>{{rawDatas.projectName}}</div>
+				</el-form-item>  
+				<el-form-item label="归属产品" prop="productName">
+					{{rawDatas.productName}}
+				</el-form-item>  
+				 
+				<el-form-item label="起止时间" prop="stime">
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="rawDatas" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></mdp-date-range>
+				</el-form-item>   
+			</el-form>
+		</el-row>
+		<el-row class="padding-bottom">
+			<span>报告总结</span>
+		</el-row>
+		<el-row> 
+			<el-input  type="textarea" :rows="8" v-model="rawDatas.summaryRemark"></el-input>
+		</el-row>
+		<el-row v-if="rawDatas.summaryRemark!==rawDatasBak.summaryRemark" >
+			<span style="float:right;"> 
+            <el-button type="primary" @click.native="editSomeFields(rawDatas,'summaryRemark',rawDatas.summaryRemark)">提交</el-button>
+			</span>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
+	import { mapGetters } from 'vuex'
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+	
+import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
+	export default {
+	    name:'xmTestPlanEdit',
+	    components: {
+			XmProjectSelect,MdpSelectUserXm,
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+			caseFuGaiLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+errCases+igCases+blCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			},
+			caseTongGuoLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+igCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			}
+
+		},
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'],
+
+		watch: {
+	      'xmTestPlan':function( xmTestPlan ) {
+	        if(xmTestPlan){
+	            this.rawDatas = {...xmTestPlan};
+	        }
+
+	      },
+	      'visible':function(visible) { 
+	      	if(visible==true){
+ 	      		this.initData()
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+				title:'',
+				remark:'',
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{
+					testPlanStatus:[],
+					testPlanTcode:[],
+
+				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				rawDatasRules: {
+					 
+				},
+				rawDatas: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+				
+				rawDatasBak: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+                maxTableHeight:300,
+				summaryRemarkEditVisible:false,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+
+			// 取消按钮点击 父组件监听@cancel="rawDatasVisible=false" 监听
+			handleCancel:function(){
+				this.$refs['rawDatasRef'].resetFields();
+				this.$emit('cancel');
+			},
+			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
+			saveSubmit: function () {
+				this.$refs.rawDatasRef.validate((valid) => {
+					if (valid) {
+						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
+							this.load.edit=true
+							let params = Object.assign({}, this.rawDatas);
+							var func=addXmTestPlan
+							if(this.currOpType=='edit'){
+							    func=editXmTestPlan
+							}
+							func(params).then((res) => {
+                                this.load.edit=false
+                                var tips=res.data.tips;
+                                if(tips.isOk){
+                                    this.rawDatas=res.data.data
+                                    this.initData()
+                                    this.currOpType="edit";
+                                    this.$emit('submit');//  @submit="afterAddSubmit"
+                                }
+                                this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
+                            }).catch( err =>this.load.edit=false);
+						});
+					}else{
+					    this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' });
+					}
+				});
+			},
+			initData: function(){ 
+			    if(this.xmTestPlan){
+                    this.rawDatas = Object.assign({},this.xmTestPlan);
+                } 
+				if(this.rptDatas){
+					this.rawDatas=Object.assign({},this.rptDatas)
+				}
+                this.rawDatasBak={...this.rawDatas}
+            },
+
+            editSomeFields(row,fieldName,$event){
+                if(this.opType=='add'){
+                    return;
+                }
+                let params={};
+                params['ids']=[row].map(i=>i.id)
+                
+				if(fieldName=='stime'){
+					params[fieldName]=$event.stime
+					params.etime=$event.etime
+				}else if(fieldName=='cuserid'){
+					params[fieldName]=$event[0].userid
+					params.cusername=$event[0].username
+				}else{
+					params[fieldName]=$event
+				}
+                var func = editSomeFieldsXmTestPlan
+                func(params).then(res=>{
+                  let tips = res.data.tips;
+                  if(tips.isOk){
+                    this.rawDatasBak=[...this.rawDatas]
+					this.$emit('edit-fields',params) 
+                  }else{
+                    Object.assign(this.rawDatas,this.rawDatasBak)
+                    this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
+                  }
+                }).catch((e)=>Object.assign(this.rawDatas,this.rawDatasBak))
+            },
+			onPorjectConfirm(row){
+				this.rawDatas.projectId=row.id
+				this.rawDatas.projectName=row.name
+				this.rawDatas.name=this.rawDatas.projectName+'-测试计划-V1.0'
+			}, 
+			sizeAutoChange(){
+				
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {
+                initDicts(this);
+                this.initData()
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
+            });
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
+</style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/testCase/testCasedbRptOverview.vue b/src/views/xm/rpt/testCase/testCasedbRptOverview.vue
new file mode 100644
index 00000000..1ec090f8
--- /dev/null
+++ b/src/views/xm/rpt/testCase/testCasedbRptOverview.vue
@@ -0,0 +1,266 @@
+<template>
+	<section  class="padding"> 
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="rpt-title">{{ rawDatas.name }}</div>
+			<el-input class="input" v-model="rawDatas.name" placeholder="计划名称"/>
+		</el-row>
+		<el-row :class="{'row-box':true,'cfg':isRptCfg}">
+			<div class="title">{{ title?title:'报告概览' }}</div>
+			<el-input class="input" v-model="title" placeholder="报告概览"/>
+		</el-row>  
+		<el-row ref="table">
+			<el-row class="box">
+				<el-col :span="6" class="box-red">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.totalCases?rawDatas.totalCases:'0'}}个</div>
+							<div class="label">用例数</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-blue">
+					<div class="box-info">  
+							<div class="num">{{caseFuGaiLv}}%</div>
+							<div class="label">用例覆盖率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-green">
+					<div class="box-info">  
+							<div class="num">{{caseTongGuoLv}}%</div>
+							<div class="label">用例通过率</div>   
+					</div>
+				</el-col>
+				<el-col :span="6" class="box-orange">
+					<div class="box-info">  
+							<div class="num">{{rawDatas.bugCnt?rawDatas.bugCnt:0}}个</div>
+							<div class="label">缺陷数</div>   
+					</div>
+				</el-col>
+			</el-row>
+		<!--编辑界面 XmTestPlan 测试计划--> 
+			<el-form :model="rawDatas"  label-width="120px" :rules="rawDatasRules" ref="rawDatasRef" label-position="left">  
+				<el-row class="padding">
+					<el-col :span="8">
+						<mdp-select-user-xm label="负责人" userid-key="cuserid" username-key="cusername" v-model="rawDatas"></mdp-select-user-xm>
+					</el-col>
+					<el-col :span="8">
+						<mdp-select-dict-x label="状态" :dict="dicts['testPlanStatus']" v-model="rawDatas.status"></mdp-select-dict-x>
+					</el-col>
+					
+					<el-col :span="8">
+						<mdp-select-dict-x label="测试结果" :dict="dicts['testPlanTcode']" v-model="rawDatas.tcode"></mdp-select-dict-x>
+					</el-col>
+				</el-row>   
+ 				<el-form-item label="归属测试库" prop="casedbName">
+					{{rawDatas.casedbName}}
+				</el-form-item>  
+				<el-form-item label="归属项目" prop="projectId">
+					 
+					<span v-if="opType=='add'">
+					 	<xm-project-select v-if="!selProject || !selProject.id" ref="xmProjectSelect" :link-product-id="xmTestCasedb? xmTestCasedb.productId:null"  @row-click="onPorjectConfirm" :auto-select="false">
+							<span slot="title">选择项目</span>
+						</xm-project-select>
+						<div v-else>{{rawDatas.projectName}}</div>
+					</span> 
+ 					<div v-else>{{rawDatas.projectName}}</div>
+				</el-form-item>  
+				<el-form-item label="归属产品" prop="productName">
+					{{rawDatas.productName}}
+				</el-form-item>  
+				 
+				<el-form-item label="起止时间" prop="stime">
+					<mdp-date-range :auto-default="false" placeholder="选择日期" v-model="rawDatas" start-key="stime" end-key="etime"  value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd" ></mdp-date-range>
+				</el-form-item>   
+			</el-form>
+		</el-row>
+		<el-row class="padding-bottom">
+			<span>报告总结</span>
+		</el-row>
+		<el-row> 
+			<el-input  type="textarea" :rows="8" v-model="rawDatas.summaryRemark"></el-input>
+		</el-row>
+		<el-row v-if="rawDatas.summaryRemark!==rawDatasBak.summaryRemark" >
+			<span style="float:right;"> 
+            <el-button type="primary" @click.native="editSomeFields(rawDatas,'summaryRemark',rawDatas.summaryRemark)">提交</el-button>
+			</span>
+		</el-row>
+	</section>
+</template>
+
+<script>
+	import util from '@/common/js/util';//全局公共库
+	import config from "@/common/config"; //全局公共库import
+ 	import { initDicts, addXmTestPlan,editXmTestPlan,editSomeFieldsXmTestPlan } from '@/api/xm/core/xmTestPlan';
+	import { mapGetters } from 'vuex'
+	import XmProjectSelect from '@/views/xm/core/components/XmProjectSelect';
+	
+import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修改界面
+	export default {
+	    name:'xmTestPlanEdit',
+	    components: {
+			XmProjectSelect,MdpSelectUserXm,
+        },
+		computed: {
+		    ...mapGetters([ 'userInfo'  ]),
+			caseFuGaiLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+errCases+igCases+blCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			},
+			caseTongGuoLv(){
+				if(!this.rawDatas.totalCases){
+					return 0
+				}
+				var okCases=parseInt(this.rawDatas.okCases>0?this.rawDatas.okCases:0)
+				var errCases=parseInt(this.rawDatas.errCases>0?this.rawDatas.errCases:0)
+				var igCases=parseInt(this.rawDatas.igCases>0?this.rawDatas.igCases:0)
+				var blCases=parseInt(this.rawDatas.blCases>0?this.rawDatas.blCases:0)
+				var totalExecs=okCases+igCases
+				var rate=parseInt(totalExecs/this.rawDatas.totalCases*100)
+				return rate;
+			}
+
+		},
+		props:['xmTestPlan','visible','opType','selProject','xmTestCasedb','rptDatas','isRptCfg'],
+
+		watch: {
+	      'xmTestPlan':function( xmTestPlan ) {
+	        if(xmTestPlan){
+	            this.rawDatas = {...xmTestPlan};
+	        }
+
+	      },
+	      'visible':function(visible) { 
+	      	if(visible==true){
+ 	      		this.initData()
+	      	}
+	      } 
+	    },
+		data() {
+			return {
+				title:'',
+				remark:'',
+			    currOpType:'add',//add/edit
+ 				load:{ list: false, edit: false, del: false, add: false },//查询中...
+				dicts:{
+					testPlanStatus:[],
+					testPlanTcode:[],
+
+				},//下拉选择框的所有静态数据 params={categoryId:'all',itemCodes:['sex']} 返回结果 {sex: [{id:'1',name:'男'},{id:'2',name:'女'}]}
+				rawDatasRules: {
+					 
+				},
+				rawDatas: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+				
+				rawDatasBak: {
+					id:'',name:'',casedbId:'',casedbName:'',projectId:'',projectName:'',cuserid:'',cusername:'',ctime:'',stime:'',etime:'',status:'',tcode:'',totalCases:'',okCases:'',errCases:'',igCases:'',blCases:'',productId:'',productName:'',flowState:'',summaryRemark:''
+				},
+                maxTableHeight:300,
+				summaryRemarkEditVisible:false,
+			}//end return
+		},//end data
+		methods: {
+
+		    ...util,
+
+			// 取消按钮点击 父组件监听@cancel="rawDatasVisible=false" 监听
+			handleCancel:function(){
+				this.$refs['rawDatasRef'].resetFields();
+				this.$emit('cancel');
+			},
+			//新增、编辑提交XmTestPlan 测试计划父组件监听@submit="afterEditSubmit"
+			saveSubmit: function () {
+				this.$refs.rawDatasRef.validate((valid) => {
+					if (valid) {
+						this.$confirm('确认提交吗？', '提示', {}).then(() => { 
+							this.load.edit=true
+							let params = Object.assign({}, this.rawDatas);
+							var func=addXmTestPlan
+							if(this.currOpType=='edit'){
+							    func=editXmTestPlan
+							}
+							func(params).then((res) => {
+                                this.load.edit=false
+                                var tips=res.data.tips;
+                                if(tips.isOk){
+                                    this.rawDatas=res.data.data
+                                    this.initData()
+                                    this.currOpType="edit";
+                                    this.$emit('submit');//  @submit="afterAddSubmit"
+                                }
+                                this.$notify({ position:'bottom-left',showClose:true, message: tips.msg, type: tips.isOk?'success':'error' });
+                            }).catch( err =>this.load.edit=false);
+						});
+					}else{
+					    this.$notify({ showClose:true, message: "表单验证不通过，请修改表单数据再提交", type: 'error' });
+					}
+				});
+			},
+			initData: function(){ 
+			    if(this.xmTestPlan){
+                    this.rawDatas = Object.assign({},this.xmTestPlan);
+                } 
+				if(this.rptDatas){
+					this.rawDatas=Object.assign({},this.rptDatas)
+				}
+                this.rawDatasBak={...this.rawDatas}
+            },
+
+            editSomeFields(row,fieldName,$event){
+                if(this.opType=='add'){
+                    return;
+                }
+                let params={};
+                params['ids']=[row].map(i=>i.id)
+                
+				if(fieldName=='stime'){
+					params[fieldName]=$event.stime
+					params.etime=$event.etime
+				}else if(fieldName=='cuserid'){
+					params[fieldName]=$event[0].userid
+					params.cusername=$event[0].username
+				}else{
+					params[fieldName]=$event
+				}
+                var func = editSomeFieldsXmTestPlan
+                func(params).then(res=>{
+                  let tips = res.data.tips;
+                  if(tips.isOk){
+                    this.rawDatasBak=[...this.rawDatas]
+					this.$emit('edit-fields',params) 
+                  }else{
+                    Object.assign(this.rawDatas,this.rawDatasBak)
+                    this.$notify({position:'bottom-left',showClose:true,message:tips.msg,type:tips.isOk?'success':'error'})
+                  }
+                }).catch((e)=>Object.assign(this.rawDatas,this.rawDatasBak))
+            },
+			onPorjectConfirm(row){
+				this.rawDatas.projectId=row.id
+				this.rawDatas.projectName=row.name
+				this.rawDatas.name=this.rawDatas.projectName+'-测试计划-V1.0'
+			}, 
+			sizeAutoChange(){
+				
+			}
+		},//end method
+		mounted() {
+		    this.$nextTick(() => {
+                initDicts(this);
+                this.initData()
+                this.maxTableHeight = util.calcTableMaxHeight(this.$refs.table.$el)
+            });
+		}
+	}
+
+</script>
+
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
+</style>
\ No newline at end of file
diff --git a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
index f47da10f..1ec090f8 100644
--- a/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
+++ b/src/views/xm/rpt/testPlan/testPlanRptOverview.vue
@@ -261,149 +261,6 @@ import  MdpSelectUserXm from '@/views/xm/core/components/MdpSelectUserXm';//修
 
 </script>
 
-<style lang="scss" scoped>
- .box{
-
-
-	.box-red{ 
-
-		background-color: #ff75750d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: red;
-		border-left-style: solid;  
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:red ;
-				font-size: 30px;
-			}
-		}
-		
-	}
-	.box-green{ 
-		
-		background-color: #73d8970d;;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: green;
-		border-left-style: solid; 
-		
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:green ;
-				font-size: 30px;
-			}
-		}
-	}
-	.box-blue{ 
-
-		background-color: #5dcfff0d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: blue;
-		border-left-style: solid; 
-
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:blue ;
-				font-size: 30px;
-			}
-		}
-	}
-
-	.box-orange{ 
-
-		background-color: #ffcd5d0d;
-		height: 100px;
-		border-left-width: 2px;
-		border-left-color: orange;
-		border-left-style: solid; 
-
-		align-items: center; 
-		line-height: 100px; 
-		text-align: center;
-		display:flex; 
-    	flex-direction: column;
-		.box-info{ 
-			display:flex; 
-			flex-direction: column;
-			margin-top: 20px;
-			height: 100px; 
-			line-height: 100px; 
-			.label{
-				color: #999;
-				height: 30px;
-				line-height: 30px;
-				font-size: 0.875rem;
-			}
-			.num{
-				
-				height: 30px;
-				line-height: 30px;
-				color:orange ;
-				font-size: 30px;
-			}
-		}
-	}
-	box-font{
-		font-size: 0.875rem;
-	}
- }
+<style lang="scss" scoped>  
+@import url('../index/overview.scss');
 </style>
\ No newline at end of file